Back out revision 1.13 (addition of ipfilter includes).  A proper fix for the relevant world breakage was later committed in revision 1.20, and this now breaks -DNO_IPFILTER world.
Back out revision 1.13 (addition of ipfilter includes).  A proper
fix for the relevant world breakage was later committed in revision
1.20, and this now breaks -DNO_IPFILTER world.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase