feat: Remove unneeded header includes

2025-11-06 18:52:58 +01:00 · 2018-09-12 20:21:12 +02:00 · 2018-09-12 20:21:12 +02:00 · ea85cab17b
commit ea85cab17b
parent 91cd514744
527 changed files with 1 additions and 726 deletions
--- a/.gitignore
+++ b/.gitignore
@ -26,7 +26,6 @@ ltmain.sh
 configure
 libtool
 qmake.inc
-config.h
 .obj
 .moc
 .ui
@ -56,7 +55,6 @@ src/unit_tests/generatedScriptTestsSecuwall/secuwall-2/
 src/libfwbuilder/etc/fwbuilder.dtd
 src/res/objects_init.xml
 src/res/templates.xml
-VERSION.h
 default/
 debug/
 release/
--- a/34
+++ b/34
@ -1,34 +0,0 @@
-#-*- mode: shell-script; tab-width: 4; -*-
-
-# Data format version
-FWBUILDER_XML_VERSION=24
-
-# Static version number
-FWB_MAJOR_VERSION=5
-FWB_MINOR_VERSION=99
-FWB_MICRO_VERSION=0
-FWB_QUALIFIER_VERSION=
-
-VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION"
-if [ -n "${FWB_QUALIFIER_VERSION}" ]; then
-    VERSION="$VERSION-$FWB_QUALIFIER_VERSION"
-fi
-
-GENERATION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION"
-
-# Git may generate version info for us
-# May be overridden by setting NO_GIT_VER environment variable
-if [ ! -n "${NO_GIT_VER}" ]; then
-    GIT_DIRTY_FLAG="--dirty"
-    if [ -n "${NO_GIT_DIRTY}" ]; then
-        GIT_DIRTY_FLAG=""
-    fi
-    GIT_VERSION=`git describe --tags ${GIT_DIRTY_FLAG} --always`
-    if [ -n "${GIT_VERSION}" ]; then
-        VERSION=${GIT_VERSION#v}
-        GENERATION=${VERSION%.*}
-    fi
-fi
-
-
-
--- a/src/cisco_lib/ASA8ObjectGroup.cpp
+++ b/src/cisco_lib/ASA8ObjectGroup.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "ASA8ObjectGroup.h"
 #include "NamedObjectsAndGroupsSupport.h"
--- a/src/cisco_lib/BaseObjectGroup.cpp
+++ b/src/cisco_lib/BaseObjectGroup.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "BaseObjectGroup.h"
 #include "NamedObjectsAndGroupsSupport.h"
--- a/src/cisco_lib/CompilerDriver_iosacl.cpp
+++ b/src/cisco_lib/CompilerDriver_iosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/cisco_lib/CompilerDriver_iosacl_run.cpp
+++ b/src/cisco_lib/CompilerDriver_iosacl_run.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/cisco_lib/CompilerDriver_nxosacl.cpp
+++ b/src/cisco_lib/CompilerDriver_nxosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/cisco_lib/CompilerDriver_nxosacl_run.cpp
+++ b/src/cisco_lib/CompilerDriver_nxosacl_run.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/cisco_lib/CompilerDriver_pix.cpp
+++ b/src/cisco_lib/CompilerDriver_pix.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/cisco_lib/CompilerDriver_pix_run.cpp
+++ b/src/cisco_lib/CompilerDriver_pix_run.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/cisco_lib/CompilerDriver_procurve_acl.cpp
+++ b/src/cisco_lib/CompilerDriver_procurve_acl.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <assert.h>
 #include <string>
--- a/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp
+++ b/src/cisco_lib/CompilerDriver_procurve_acl_run.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/cisco_lib/IOSObjectGroup.cpp
+++ b/src/cisco_lib/IOSObjectGroup.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "IOSObjectGroup.h"

--- a/src/cisco_lib/NATCompiler_asa8.cpp
+++ b/src/cisco_lib/NATCompiler_asa8.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NATCompiler_asa8.h"
 #include "NamedObject.h"
--- a/src/cisco_lib/NATCompiler_asa8_writers.cpp
+++ b/src/cisco_lib/NATCompiler_asa8_writers.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NATCompiler_asa8.h"
 #include "NamedObject.h"
--- a/src/cisco_lib/NATCompiler_pix.cpp
+++ b/src/cisco_lib/NATCompiler_pix.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "NATCompiler_pix.h"
 #include "NamedObjectsAndGroupsSupport.h"
--- a/src/cisco_lib/NATCompiler_pix_optimizers.cpp
+++ b/src/cisco_lib/NATCompiler_pix_optimizers.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NATCompiler_pix.h"
 #include "NamedObjectsAndGroupsSupport.h"
--- a/src/cisco_lib/NATCompiler_pix_writers.cpp
+++ b/src/cisco_lib/NATCompiler_pix_writers.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "NATCompiler_pix.h"
 #include "PortRangeConverter.h"
--- a/src/cisco_lib/NXOSObjectGroup.cpp
+++ b/src/cisco_lib/NXOSObjectGroup.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "NXOSObjectGroup.h"

--- a/src/cisco_lib/NamedObject.cpp
+++ b/src/cisco_lib/NamedObject.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NamedObject.h"

--- a/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp
+++ b/src/cisco_lib/NamedObjectsAndGroupsSupport.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NamedObjectsAndGroupsSupport.h"
 #include "NamedObjectsManager.h"
--- a/src/cisco_lib/NamedObjectsAndGroupsSupport.h
+++ b/src/cisco_lib/NamedObjectsAndGroupsSupport.h
@ -24,7 +24,6 @@
 #ifndef _OBJECT_GROUPS_SUPPORT_HH
 #define _OBJECT_GROUPS_SUPPORT_HH

-#include "config.h"

 #include "BaseObjectGroup.h"
 #include "NamedObject.h"
--- a/src/cisco_lib/NamedObjectsManager.cpp
+++ b/src/cisco_lib/NamedObjectsManager.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NamedObjectsManager.h"
 #include "NamedObject.h"
--- a/src/cisco_lib/NamedObjectsManager.h
+++ b/src/cisco_lib/NamedObjectsManager.h
@ -24,7 +24,6 @@
 #ifndef _NAMED_OBJECTS_MANAGER_HH
 #define _NAMED_OBJECTS_MANAGER_HH

-#include "config.h"

 #include "BaseObjectGroup.h"

--- a/src/cisco_lib/NamedObjectsManagerASA8.h
+++ b/src/cisco_lib/NamedObjectsManagerASA8.h
@ -24,7 +24,6 @@
 #ifndef _NAMED_OBJECTS_MANAGER_ASA8_HH
 #define _NAMED_OBJECTS_MANAGER_ASA8_HH

-#include "config.h"

 #include "NamedObjectsManagerPIX.h"

--- a/src/cisco_lib/NamedObjectsManagerIOS.cpp
+++ b/src/cisco_lib/NamedObjectsManagerIOS.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NamedObjectsManagerIOS.h"
 #include "NamedObject.h"
--- a/src/cisco_lib/NamedObjectsManagerIOS.h
+++ b/src/cisco_lib/NamedObjectsManagerIOS.h
@ -24,7 +24,6 @@
 #ifndef _NAMED_OBJECTS_MANAGER_IOS_HH
 #define _NAMED_OBJECTS_MANAGER_IOS_HH

-#include "config.h"

 #include "NamedObjectsManager.h"

--- a/src/cisco_lib/NamedObjectsManagerNXOS.cpp
+++ b/src/cisco_lib/NamedObjectsManagerNXOS.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NamedObjectsManagerNXOS.h"
 #include "NamedObject.h"
--- a/src/cisco_lib/NamedObjectsManagerNXOS.h
+++ b/src/cisco_lib/NamedObjectsManagerNXOS.h
@ -24,7 +24,6 @@
 #ifndef _NAMED_OBJECTS_MANAGER_NXOS_HH
 #define _NAMED_OBJECTS_MANAGER_NXOS_HH

-#include "config.h"

 #include "NamedObjectsManager.h"

--- a/src/cisco_lib/NamedObjectsManagerPIX.cpp
+++ b/src/cisco_lib/NamedObjectsManagerPIX.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "NamedObjectsManagerPIX.h"
 #include "PIXObjectGroup.h"
--- a/src/cisco_lib/NamedObjectsManagerPIX.h
+++ b/src/cisco_lib/NamedObjectsManagerPIX.h
@ -24,7 +24,6 @@
 #ifndef _NAMED_OBJECTS_MANAGER_PIX_HH
 #define _NAMED_OBJECTS_MANAGER_PIX_HH

-#include "config.h"

 #include "NamedObjectsManager.h"

--- a/src/cisco_lib/OSConfigurator_ios.h
+++ b/src/cisco_lib/OSConfigurator_ios.h
@ -27,7 +27,6 @@
 #ifndef _OSNETWORKCONFIGURATOR_IOS_HH
 #define _OSNETWORKCONFIGURATOR_IOS_HH

-#include "config.h"

 #include "fwcompiler/OSConfigurator.h"

--- a/src/cisco_lib/OSConfigurator_nxos.h
+++ b/src/cisco_lib/OSConfigurator_nxos.h
@ -27,7 +27,6 @@
 #ifndef _OSNETWORKCONFIGURATOR_NXOS_HH
 #define _OSNETWORKCONFIGURATOR_NXOS_HH

-#include "config.h"

 #include "fwcompiler/OSConfigurator.h"

--- a/src/cisco_lib/OSConfigurator_pix_os.h
+++ b/src/cisco_lib/OSConfigurator_pix_os.h
@ -27,7 +27,6 @@
 #ifndef _OSNETWORKCONFIGURATOR_PIX_OS_HH
 #define _OSNETWORKCONFIGURATOR_PIX_OS_HH

-#include "config.h"

 #include "fwcompiler/OSConfigurator.h"

--- a/src/cisco_lib/OSConfigurator_procurve.h
+++ b/src/cisco_lib/OSConfigurator_procurve.h
@ -27,7 +27,6 @@
 #ifndef _OSNETWORKCONFIGURATOR_PROCURVE_HH
 #define _OSNETWORKCONFIGURATOR_PROCURVE_HH

-#include "config.h"

 #include "OSConfigurator_ios.h"

--- a/src/cisco_lib/PIXObjectGroup.cpp
+++ b/src/cisco_lib/PIXObjectGroup.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "PIXObjectGroup.h"

--- a/src/cisco_lib/PolicyCompiler_cisco.cpp
+++ b/src/cisco_lib/PolicyCompiler_cisco.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "PolicyCompiler_cisco.h"
 #include "NamedObjectsManager.h"
--- a/src/cisco_lib/PolicyCompiler_cisco.h
+++ b/src/cisco_lib/PolicyCompiler_cisco.h
@ -26,7 +26,6 @@
 #ifndef __POLICYCOMPILER_CISCO_HH
 #define __POLICYCOMPILER_CISCO_HH

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/PolicyCompiler.h"
 #include "fwbuilder/RuleElement.h"
--- a/src/cisco_lib/PolicyCompiler_cisco_acls.cpp
+++ b/src/cisco_lib/PolicyCompiler_cisco_acls.cpp
@ -24,7 +24,6 @@

 */

-#include "config.h"

 #include "PolicyCompiler_cisco.h"
 #include "NamedObjectsManager.h"
--- a/src/cisco_lib/PolicyCompiler_iosacl.cpp
+++ b/src/cisco_lib/PolicyCompiler_iosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "PolicyCompiler_iosacl.h"
 #include "NamedObjectsAndGroupsSupport.h"
--- a/src/cisco_lib/PolicyCompiler_iosacl.h
+++ b/src/cisco_lib/PolicyCompiler_iosacl.h
@ -26,7 +26,6 @@
 #ifndef __POLICYCOMPILER_IOSACL_HH
 #define __POLICYCOMPILER_IOSACL_HH

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/PolicyCompiler.h"
 #include "fwbuilder/RuleElement.h"
--- a/src/cisco_lib/PolicyCompiler_nxosacl.cpp
+++ b/src/cisco_lib/PolicyCompiler_nxosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "PolicyCompiler_nxosacl.h"
 #include "NamedObjectsAndGroupsSupport.h"
--- a/src/cisco_lib/PolicyCompiler_nxosacl.h
+++ b/src/cisco_lib/PolicyCompiler_nxosacl.h
@ -26,7 +26,6 @@
 #ifndef __POLICYCOMPILER_NXOSACL_HH
 #define __POLICYCOMPILER_NXOSACL_HH

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/PolicyCompiler.h"
 #include "fwbuilder/RuleElement.h"
--- a/src/cisco_lib/PolicyCompiler_pix.cpp
+++ b/src/cisco_lib/PolicyCompiler_pix.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "Helper.h"

--- a/src/cisco_lib/PolicyCompiler_pix.h
+++ b/src/cisco_lib/PolicyCompiler_pix.h
@ -26,7 +26,6 @@
 #ifndef __POLICYCOMPILER_PIX_HH
 #define __POLICYCOMPILER_PIX_HH

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/PolicyCompiler.h"
 #include "fwbuilder/RuleElement.h"
--- a/src/cisco_lib/PolicyCompiler_pix_replace_translations.cpp
+++ b/src/cisco_lib/PolicyCompiler_pix_replace_translations.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "Helper.h"

--- a/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp
+++ b/src/cisco_lib/PolicyCompiler_pix_v6_acls.cpp
@ -27,7 +27,6 @@
  they employ number of assumptions that are only valid for PIX <7.0
 */

-#include "config.h"

 #include "PolicyCompiler_pix.h"
 #include "NATCompiler_pix.h"
--- a/src/cisco_lib/PolicyCompiler_procurve_acl.cpp
+++ b/src/cisco_lib/PolicyCompiler_procurve_acl.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "PolicyCompiler_procurve_acl.h"

--- a/src/cisco_lib/PolicyCompiler_procurve_acl.h
+++ b/src/cisco_lib/PolicyCompiler_procurve_acl.h
@ -26,7 +26,6 @@
 #ifndef __POLICYCOMPILER_PROCURVE_ACL_HH
 #define __POLICYCOMPILER_PROCURVE_ACL_HH

-#include <fwbuilder/libfwbuilder-config.h>

 #include "PolicyCompiler_iosacl.h"

--- a/src/cisco_lib/RoutingCompiler_cisco.h
+++ b/src/cisco_lib/RoutingCompiler_cisco.h
@ -17,11 +17,9 @@
 #ifndef __ROUTINGCOMPILER_CISCO_HH__
 #define __ROUTINGCOMPILER_CISCO_HH__

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/RoutingCompiler.h"
 #include "fwbuilder/RuleElement.h"
-#include "config.h"

 #include "NamedObjectsAndGroupsSupport.h"

--- a/src/cisco_lib/RoutingCompiler_iosacl.cpp
+++ b/src/cisco_lib/RoutingCompiler_iosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "RoutingCompiler_iosacl.h"

--- a/src/cisco_lib/RoutingCompiler_iosacl.h
+++ b/src/cisco_lib/RoutingCompiler_iosacl.h
@ -27,11 +27,9 @@
 #ifndef __ROUTINGCOMPILER_IOSACL_HH__
 #define __ROUTINGCOMPILER_IOSACL_HH__

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/RoutingCompiler.h"
 #include "fwbuilder/RuleElement.h"
-#include "config.h"

 #include "RoutingCompiler_cisco.h"

--- a/src/cisco_lib/RoutingCompiler_nxosacl.cpp
+++ b/src/cisco_lib/RoutingCompiler_nxosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "RoutingCompiler_nxosacl.h"

--- a/src/cisco_lib/RoutingCompiler_nxosacl.h
+++ b/src/cisco_lib/RoutingCompiler_nxosacl.h
@ -27,11 +27,9 @@
 #ifndef __ROUTINGCOMPILER_NXOSACL_HH__
 #define __ROUTINGCOMPILER_NXOSACL_HH__

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/RoutingCompiler.h"
 #include "fwbuilder/RuleElement.h"
-#include "config.h"

 #include "RoutingCompiler_cisco.h"

--- a/src/cisco_lib/RoutingCompiler_pix.h
+++ b/src/cisco_lib/RoutingCompiler_pix.h
@ -17,11 +17,9 @@
 #ifndef __ROUTINGCOMPILER_PIX_HH__
 #define __ROUTINGCOMPILER_PIX_HH__

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/RoutingCompiler.h"
 #include "fwbuilder/RuleElement.h"
-#include "config.h"

 #include "RoutingCompiler_cisco.h"

--- a/src/cisco_lib/RoutingCompiler_procurve_acl.cpp
+++ b/src/cisco_lib/RoutingCompiler_procurve_acl.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "RoutingCompiler_procurve_acl.h"

--- a/src/cisco_lib/RoutingCompiler_procurve_acl.h
+++ b/src/cisco_lib/RoutingCompiler_procurve_acl.h
@ -27,8 +27,6 @@
 #ifndef __ROUTINGCOMPILER_PROCURVE_ACL_HH__
 #define __ROUTINGCOMPILER_PROCURVE_ACL_HH__

-#include <fwbuilder/libfwbuilder-config.h>
-#include "config.h"

 #include "RoutingCompiler_iosacl.h"

--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@ -1,6 +1,5 @@


-#include "../../config.h"

 #include <string>
 #include <assert.h>
@ -9,7 +8,6 @@
 #include <QString>
 #include <QtDebug>

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Tools.h"
 #include "fwbuilder/Resources.h"
 #include "fwbuilder/Constants.h"
--- a/src/common/init2.cpp
+++ b/src/common/init2.cpp
@ -1,5 +1,4 @@

-#include "../../config.h"

 #include <qglobal.h>

@ -25,7 +24,6 @@

 #include <string>

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Tools.h"
 #include "fwbuilder/Resources.h"
 #include "fwbuilder/Constants.h"
--- a/src/compiler_lib/CompilerDriver.cpp
+++ b/src/compiler_lib/CompilerDriver.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/compiler_lib/CompilerDriver_compile.cpp
+++ b/src/compiler_lib/CompilerDriver_compile.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/compiler_lib/CompilerDriver_files.cpp
+++ b/src/compiler_lib/CompilerDriver_files.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 #include "CompilerDriver.h"

--- a/src/compiler_lib/CompilerDriver_generators.cpp
+++ b/src/compiler_lib/CompilerDriver_generators.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/compiler_lib/Configlet.cpp
+++ b/src/compiler_lib/Configlet.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include "Configlet.h"

--- a/src/compiler_lib/interfaceProperties.cpp
+++ b/src/compiler_lib/interfaceProperties.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include "interfaceProperties.h"

--- a/src/compiler_lib/linux24Interfaces.cpp
+++ b/src/compiler_lib/linux24Interfaces.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include "interfaceProperties.h"
 #include "linux24Interfaces.h"
--- a/src/fwbedit/fwbedit.cpp
+++ b/src/fwbedit/fwbedit.cpp
@ -21,9 +21,7 @@

 */

-#include "../../config.h"

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Constants.h"

 #include <qsettings.h>
--- a/src/fwbedit/fwbedit.h
+++ b/src/fwbedit/fwbedit.h
@ -23,8 +23,6 @@

 */

-#include "../../config.h"
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Constants.h"
 #include "fwbuilder/FWObject.h"
 #include "fwbuilder/FWObjectDatabase.h"
--- a/src/fwbedit/import.cpp
+++ b/src/fwbedit/import.cpp
@ -21,8 +21,6 @@

 */

-#include "../../config.h"
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Library.h"

 #include "fwbedit.h"
--- a/src/fwbedit/list_object.cpp
+++ b/src/fwbedit/list_object.cpp
@ -23,8 +23,6 @@

 */

-#include "../../config.h"
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Constants.h"

 #include <qsettings.h>
--- a/src/fwbedit/merge.cpp
+++ b/src/fwbedit/merge.cpp
@ -23,8 +23,6 @@

 */

-#include "../../config.h"
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Constants.h"
 #include "fwbuilder/ObjectGroup.h"
 #include "fwbuilder/ServiceGroup.h"
--- a/src/fwbedit/new_object.cpp
+++ b/src/fwbedit/new_object.cpp
@ -23,8 +23,6 @@

 */

-#include "../../config.h"
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Constants.h"

 #include <qsettings.h>
--- a/src/fwbedit/repair_tree.cpp
+++ b/src/fwbedit/repair_tree.cpp
@ -23,8 +23,6 @@

 */

-#include "../../config.h"
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Constants.h"
 #include "fwbuilder/ObjectGroup.h"
 #include "fwbuilder/ServiceGroup.h"
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@ -25,9 +25,7 @@
 */


-#include "../../config.h"
 #include "global.h"
-#include "VERSION.h"
 #include "../common/commoninit.h"

 #include <getopt.h>
--- a/src/gui/main_mac.cpp
+++ b/src/gui/main_mac.cpp
@ -25,9 +25,7 @@
 */


-#include "../../config.h"
 #include "global.h"
-#include "VERSION.h"

 #include <QDir>
 #include <QString>
--- a/src/import/IOSImporter.cpp
+++ b/src/import/IOSImporter.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 // #include "global.h"
 // #include "utils_no_qt.h"
--- a/src/import/IOSImporter.h
+++ b/src/import/IOSImporter.h
@ -35,7 +35,6 @@

 #include "Importer.h"

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Logger.h"
 #include "fwbuilder/Policy.h"

--- a/src/import/IOSImporterRun.cpp
+++ b/src/import/IOSImporterRun.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 // #include "global.h"

--- a/src/import/IPTImporter.cpp
+++ b/src/import/IPTImporter.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 #include "IPTImporter.h"
 #include "getProtoByName.h"
--- a/src/import/IPTImporter.h
+++ b/src/import/IPTImporter.h
@ -33,7 +33,6 @@

 #include "Importer.h"

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Logger.h"
 #include "fwbuilder/Policy.h"
 #include "fwbuilder/NAT.h"
--- a/src/import/IPTImporterRun.cpp
+++ b/src/import/IPTImporterRun.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include "IPTImporter.h"

--- a/src/import/Importer.cpp
+++ b/src/import/Importer.cpp
@ -26,7 +26,6 @@
 * will be refactored into some other common module in the future).
 */

-#include "../../config.h"

 #include "Importer.h"

--- a/src/import/PFImporter.cpp
+++ b/src/import/PFImporter.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 #include "PFImporter.h"

--- a/src/import/PFImporter.h
+++ b/src/import/PFImporter.h
@ -38,7 +38,6 @@
 #include "IcmpSpec.h"
 #include "RouteSpec.h"

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Logger.h"
 #include "fwbuilder/Rule.h"
 #include "fwbuilder/NAT.h"
--- a/src/import/PFImporterRun.cpp
+++ b/src/import/PFImporterRun.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 #include "fwbuilder/InetAddr.h"

--- a/src/import/PIXImporter.cpp
+++ b/src/import/PIXImporter.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 #include "PIXImporter.h"

--- a/src/import/PIXImporter.h
+++ b/src/import/PIXImporter.h
@ -33,7 +33,6 @@

 #include "IOSImporter.h"

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Logger.h"
 #include "fwbuilder/Rule.h"
 #include "fwbuilder/NAT.h"
--- a/src/import/PIXImporterNat.cpp
+++ b/src/import/PIXImporterNat.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 #include "PIXImporter.h"

--- a/src/import/PIXImporterRun.cpp
+++ b/src/import/PIXImporterRun.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include "PIXImporter.h"

--- a/src/import/getProtoByName.cpp
+++ b/src/import/getProtoByName.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 #include "getProtoByName.h"

--- a/src/import/getServByName.cpp
+++ b/src/import/getServByName.cpp
@ -21,7 +21,6 @@

 */

-#include "../../config.h"

 #include "getServByName.h"

--- a/src/iosacl/iosacl.cpp
+++ b/src/iosacl/iosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/ipf/ipf.cpp
+++ b/src/ipf/ipf.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
--- a/src/ipfw/ipfw.cpp
+++ b/src/ipfw/ipfw.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
--- a/src/ipt/ipt.cpp
+++ b/src/ipt/ipt.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/iptlib/CompilerDriver_ipt.cpp
+++ b/src/iptlib/CompilerDriver_ipt.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include "Configlet.h"
 #include "CompilerDriver_ipt.h"
--- a/src/iptlib/CompilerDriver_ipt_nat.cpp
+++ b/src/iptlib/CompilerDriver_ipt_nat.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include "CompilerDriver_ipt.h"
 #include "NATCompiler_ipt.h"
--- a/src/iptlib/CompilerDriver_ipt_policy.cpp
+++ b/src/iptlib/CompilerDriver_ipt_policy.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include "CompilerDriver_ipt.h"
 #include "MangleTableCompiler_ipt.h"
--- a/src/iptlib/CompilerDriver_ipt_run.cpp
+++ b/src/iptlib/CompilerDriver_ipt_run.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/iptlib/MangleTableCompiler_ipt.cpp
+++ b/src/iptlib/MangleTableCompiler_ipt.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "MangleTableCompiler_ipt.h"
 #include "OSConfigurator_linux24.h"
--- a/src/iptlib/MangleTableCompiler_ipt.h
+++ b/src/iptlib/MangleTableCompiler_ipt.h
@ -26,7 +26,6 @@
 #ifndef __MANGLETABLECOMPILER_IPT_HH
 #define __MANGLETABLECOMPILER_IPT_HH

-#include <fwbuilder/libfwbuilder-config.h>
 #include "PolicyCompiler_ipt.h"

 namespace fwcompiler {
--- a/src/iptlib/NATCompiler_ipt.cpp
+++ b/src/iptlib/NATCompiler_ipt.cpp
@ -54,7 +54,6 @@
 #include "fwbuilder/TagService.h"
 #include "fwbuilder/UDPService.h"

-#include "config.h"

 #include <QString>
 #include <QRegExp>
--- a/src/iptlib/NATCompiler_ipt.h
+++ b/src/iptlib/NATCompiler_ipt.h
@ -26,7 +26,6 @@
 #ifndef __NATCOMPILER_IPT_HH__
 #define __NATCOMPILER_IPT_HH__

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/NATCompiler.h"
 #include "fwbuilder/RuleElement.h"
--- a/src/iptlib/OSConfigurator_ipcop.cpp
+++ b/src/iptlib/OSConfigurator_ipcop.cpp
@ -24,7 +24,6 @@
 */


-#include "config.h"

 #include "OSConfigurator_ipcop.h"

--- a/src/iptlib/OSConfigurator_ipcop.h
+++ b/src/iptlib/OSConfigurator_ipcop.h
@ -26,7 +26,6 @@
 #ifndef _OSNETWORKCONFIGURATOR_IPCOP_HH
 #define _OSNETWORKCONFIGURATOR_IPCOP_HH

-#include "config.h"

 #include "OSConfigurator_linux24.h"

--- a/src/iptlib/OSConfigurator_linux24.cpp
+++ b/src/iptlib/OSConfigurator_linux24.cpp
@ -24,7 +24,6 @@
 */


-#include "config.h"

 #include "OSConfigurator_linux24.h"

--- a/src/iptlib/OSConfigurator_linux24.h
+++ b/src/iptlib/OSConfigurator_linux24.h
@ -26,7 +26,6 @@
 #ifndef _OSCONFIGURATOR_LINUX24_HH
 #define _OSCONFIGURATOR_LINUX24_HH

-#include "config.h"

 #include "fwcompiler/OSConfigurator.h"

--- a/src/iptlib/OSConfigurator_linux24_interfaces.cpp
+++ b/src/iptlib/OSConfigurator_linux24_interfaces.cpp
@ -24,7 +24,6 @@
 */


-#include "config.h"

 #include "OSConfigurator_linux24.h"

--- a/src/iptlib/OSConfigurator_secuwall.cpp
+++ b/src/iptlib/OSConfigurator_secuwall.cpp
@ -14,7 +14,6 @@
 * o The terms of NetCitadel End User License Agreement
 */

-#include "config.h"

 #include "OSConfigurator_secuwall.h"

--- a/src/iptlib/OSData.h
+++ b/src/iptlib/OSData.h
@ -26,7 +26,6 @@
 #ifndef __OSDATA_HH
 #define __OSDATA_HH

-#include "config.h"

 #include <string>
 #include <map>
--- a/src/iptlib/PolicyCompiler_ipt.cpp
+++ b/src/iptlib/PolicyCompiler_ipt.cpp
@ -21,7 +21,6 @@

 */

-#include "config.h"

 #include "PolicyCompiler_ipt.h"
 #include "OSConfigurator_linux24.h"
--- a/src/iptlib/PolicyCompiler_ipt.h
+++ b/src/iptlib/PolicyCompiler_ipt.h
@ -26,11 +26,9 @@
 #ifndef __POLICYCOMPILER_IPT_HH__
 #define __POLICYCOMPILER_IPT_HH__

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/PolicyCompiler.h"
 #include "fwbuilder/RuleElement.h"
-#include "config.h"
 #include "Configlet.h"

 #include <QMap>
--- a/src/iptlib/Preprocessor_ipt.h
+++ b/src/iptlib/Preprocessor_ipt.h
@ -24,7 +24,6 @@
 #ifndef __PREPROCESSOR_IPT_HH
 #define __PREPROCESSOR_IPT_HH

-#include <fwbuilder/libfwbuilder-config.h>
 #include "fwcompiler/Preprocessor.h"

 namespace libfwbuilder {
--- a/src/iptlib/RoutingCompiler_ipt.h
+++ b/src/iptlib/RoutingCompiler_ipt.h
@ -31,11 +31,9 @@
 #ifndef __ROUTINGCOMPILER_IPT_HH__
 #define __ROUTINGCOMPILER_IPT_HH__

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/RoutingCompiler.h"
 #include "fwbuilder/RuleElement.h"
-#include "config.h"

 namespace libfwbuilder {
    class RuleElementRDst;
--- a/src/iptlib/combinedAddress.cpp
+++ b/src/iptlib/combinedAddress.cpp
@ -26,7 +26,6 @@
 #include <assert.h>
 #include <iostream>

-#include <fwbuilder/libfwbuilder-config.h>

 #include "combinedAddress.h"

--- a/src/juniper_lib/CompilerDriver_junosacl.cpp
+++ b/src/juniper_lib/CompilerDriver_junosacl.cpp
@ -1,4 +1,3 @@
-#include "../../config.h"

 #include <string>

--- a/src/juniper_lib/CompilerDriver_junosacl_run.cpp
+++ b/src/juniper_lib/CompilerDriver_junosacl_run.cpp
@ -1,4 +1,3 @@
-#include "../../config.h"

 #include "CompilerDriver_junosacl.h"
 #include "OSConfigurator_junos.h"
--- a/src/juniper_lib/OSConfigurator_junos.h
+++ b/src/juniper_lib/OSConfigurator_junos.h
@ -27,7 +27,6 @@
 #ifndef _OSNETWORKCONFIGURATOR_JUNOS_HH
 #define _OSNETWORKCONFIGURATOR_JUNOS_HH

-#include "config.h"

 #include "fwcompiler/OSConfigurator.h"

--- a/src/juniper_lib/PolicyCompiler_junosacl.cpp
+++ b/src/juniper_lib/PolicyCompiler_junosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "config.h"

 #include "PolicyCompiler_junosacl.h"
 // #include "NamedObjectsAndGroupsSupport.h"
--- a/src/juniper_lib/PolicyCompiler_junosacl.h
+++ b/src/juniper_lib/PolicyCompiler_junosacl.h
@ -26,7 +26,6 @@
 #ifndef __POLICYCOMPILER_JUNOSACL_HH
 #define __POLICYCOMPILER_JUNOSACL_HH

-#include <fwbuilder/libfwbuilder-config.h>

 #include "fwcompiler/PolicyCompiler.h"
 #include "fwbuilder/RuleElement.h"
--- a/src/junosacl/junosacl.cpp
+++ b/src/junosacl/junosacl.cpp
@ -23,7 +23,6 @@

 */

-#include "../../config.h"

 #include <fstream>
 #include <iostream>
--- a/src/libfwbuilder/.gitignore
+++ b/src/libfwbuilder/.gitignore
@ -1 +0,0 @@
-libfwbuilder-config.h
--- a/src/libfwbuilder/src/fwbuilder/Address.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Address.cpp
@ -27,8 +27,6 @@
 #include <assert.h>
 #include <iostream>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/Address.h"
 #include "fwbuilder/Interface.h"
--- a/src/libfwbuilder/src/fwbuilder/AddressRange.cpp
+++ b/src/libfwbuilder/src/fwbuilder/AddressRange.cpp
@ -27,8 +27,6 @@
 #include <iostream>
 #include <sstream>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/AddressRange.h"
--- a/src/libfwbuilder/src/fwbuilder/AddressTable.cpp
+++ b/src/libfwbuilder/src/fwbuilder/AddressTable.cpp
@ -25,8 +25,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/AddressTable.h"
--- a/src/libfwbuilder/src/fwbuilder/AttachedNetworks.cpp
+++ b/src/libfwbuilder/src/fwbuilder/AttachedNetworks.cpp
@ -23,8 +23,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/AttachedNetworks.h"
--- a/src/libfwbuilder/src/fwbuilder/BackgroundOp.cpp
+++ b/src/libfwbuilder/src/fwbuilder/BackgroundOp.cpp
@ -25,8 +25,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include <stdlib.h>
--- a/src/libfwbuilder/src/fwbuilder/Cluster.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Cluster.cpp
@ -17,8 +17,6 @@
 #include <time.h>
 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/Cluster.h"
--- a/src/libfwbuilder/src/fwbuilder/ClusterGroup.cpp
+++ b/src/libfwbuilder/src/fwbuilder/ClusterGroup.cpp
@ -14,8 +14,6 @@
 * o The terms of NetCitadel End User License Agreement
 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/ClusterGroup.h"
--- a/src/libfwbuilder/src/fwbuilder/Constants.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Constants.cpp
@ -21,12 +21,10 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/Constants.h"

-#if defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__MINGW64__) || defined (__MINGW32__)
+#if defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__MINGW64__) || defined (__MINGW32__) || defined (__APPLE__)
 #   include <sys/stat.h>
 #endif

--- a/src/libfwbuilder/src/fwbuilder/CustomService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/CustomService.cpp
@ -27,8 +27,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/FWObjectDatabase.h"
 #include "fwbuilder/CustomService.h"
--- a/src/libfwbuilder/src/fwbuilder/DNSName.cpp
+++ b/src/libfwbuilder/src/fwbuilder/DNSName.cpp
@ -25,8 +25,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/DNSName.h"
--- a/src/libfwbuilder/src/fwbuilder/Dispatch.h
+++ b/src/libfwbuilder/src/fwbuilder/Dispatch.h
@ -31,7 +31,6 @@
 #include <list>
 #include <assert.h>

-#include "fwbuilder/libfwbuilder-config.h"

 namespace libfwbuilder {
    class InetAddr;
--- a/src/libfwbuilder/src/fwbuilder/DynamicGroup.cpp
+++ b/src/libfwbuilder/src/fwbuilder/DynamicGroup.cpp
@ -21,8 +21,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/DynamicGroup.h"
 #include "fwbuilder/XMLTools.h"
--- a/src/libfwbuilder/src/fwbuilder/FWException.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWException.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWException.h"
--- a/src/libfwbuilder/src/fwbuilder/FWIntervalReference.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWIntervalReference.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWIntervalReference.h"
--- a/src/libfwbuilder/src/fwbuilder/FWObject.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWObject.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/Tools.h"
--- a/src/libfwbuilder/src/fwbuilder/FWObject.h
+++ b/src/libfwbuilder/src/fwbuilder/FWObject.h
@ -27,8 +27,6 @@
 #ifndef  __FWOBJECT_HH_FLAG__
 #define  __FWOBJECT_HH_FLAG__

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include <time.h>
 #include <string>
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp
@ -23,8 +23,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include <sys/types.h>
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_create_object.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_create_object.cpp
@ -29,8 +29,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include <sys/types.h>
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_search.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_search.cpp
@ -25,8 +25,6 @@

 #include <stdlib.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObject.h"
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp
@ -25,8 +25,6 @@

 #include <stdlib.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObject.h"
--- a/src/libfwbuilder/src/fwbuilder/FWObjectReference.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWObjectReference.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObjectReference.h"
--- a/src/libfwbuilder/src/fwbuilder/FWOptions.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWOptions.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWOptions.h"
--- a/src/libfwbuilder/src/fwbuilder/FWReference.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWReference.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWReference.h"
--- a/src/libfwbuilder/src/fwbuilder/FWServiceReference.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWServiceReference.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWServiceReference.h"
--- a/src/libfwbuilder/src/fwbuilder/FailoverClusterGroup.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FailoverClusterGroup.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FailoverClusterGroup.h"
--- a/src/libfwbuilder/src/fwbuilder/Firewall.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Firewall.cpp
@ -27,8 +27,6 @@
 #include <time.h>
 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObjectDatabase.h"
--- a/src/libfwbuilder/src/fwbuilder/Group.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Group.cpp
@ -26,8 +26,6 @@

 #include <iostream>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObject.h"
--- a/src/libfwbuilder/src/fwbuilder/Host.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Host.cpp
@ -27,8 +27,6 @@
 #include <assert.h>
 #include <iostream>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObjectDatabase.h"
--- a/src/libfwbuilder/src/fwbuilder/ICMP6Service.cpp
+++ b/src/libfwbuilder/src/fwbuilder/ICMP6Service.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/ICMP6Service.h"
--- a/src/libfwbuilder/src/fwbuilder/ICMPService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/ICMPService.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/ICMPService.h"
--- a/src/libfwbuilder/src/fwbuilder/IPRoute.cpp
+++ b/src/libfwbuilder/src/fwbuilder/IPRoute.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/InetAddr.h"
--- a/src/libfwbuilder/src/fwbuilder/IPService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/IPService.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/IPService.h"
--- a/src/libfwbuilder/src/fwbuilder/IPv4.cpp
+++ b/src/libfwbuilder/src/fwbuilder/IPv4.cpp
@ -38,8 +38,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include <assert.h>
 #include <iostream>
--- a/src/libfwbuilder/src/fwbuilder/IPv6.cpp
+++ b/src/libfwbuilder/src/fwbuilder/IPv6.cpp
@ -38,8 +38,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include <assert.h>
 #include <iostream>
--- a/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/InetAddr.h"
--- a/src/libfwbuilder/src/fwbuilder/InetAddr.cpp
+++ b/src/libfwbuilder/src/fwbuilder/InetAddr.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/InetAddr.h"
--- a/src/libfwbuilder/src/fwbuilder/InetAddr.h
+++ b/src/libfwbuilder/src/fwbuilder/InetAddr.h
@ -47,7 +47,6 @@ typedef unsigned int uint32_t;
 #endif

 #include "fwbuilder/uint128.h"
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/FWException.h"

 namespace libfwbuilder
--- a/src/libfwbuilder/src/fwbuilder/InetAddrMask.cpp
+++ b/src/libfwbuilder/src/fwbuilder/InetAddrMask.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/InetAddrMask.h"
--- a/src/libfwbuilder/src/fwbuilder/Interface.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Interface.cpp
@ -24,8 +24,6 @@
 #include <assert.h>
 #include <iostream>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/Interface.h"
--- a/src/libfwbuilder/src/fwbuilder/InterfaceData.cpp
+++ b/src/libfwbuilder/src/fwbuilder/InterfaceData.cpp
@ -25,8 +25,6 @@
 */


-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "InterfaceData.h"
--- a/src/libfwbuilder/src/fwbuilder/Interval.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Interval.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/Interval.h"
--- a/src/libfwbuilder/src/fwbuilder/IntervalGroup.cpp
+++ b/src/libfwbuilder/src/fwbuilder/IntervalGroup.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/IntervalGroup.h"
--- a/src/libfwbuilder/src/fwbuilder/Library.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Library.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObject.h"
--- a/src/libfwbuilder/src/fwbuilder/Logger.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Logger.cpp
@ -25,8 +25,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include <stdlib.h>
--- a/src/libfwbuilder/src/fwbuilder/Management.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Management.cpp
@ -28,8 +28,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObjectDatabase.h"
--- a/src/libfwbuilder/src/fwbuilder/MultiAddress.cpp
+++ b/src/libfwbuilder/src/fwbuilder/MultiAddress.cpp
@ -25,8 +25,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/MultiAddress.h"
--- a/src/libfwbuilder/src/fwbuilder/NAT.cpp
+++ b/src/libfwbuilder/src/fwbuilder/NAT.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/NAT.h"
--- a/src/libfwbuilder/src/fwbuilder/Network.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Network.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/Network.h"
--- a/src/libfwbuilder/src/fwbuilder/NetworkIPv6.cpp
+++ b/src/libfwbuilder/src/fwbuilder/NetworkIPv6.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/Inet6AddrMask.h"
 #include "fwbuilder/NetworkIPv6.h"
--- a/src/libfwbuilder/src/fwbuilder/ObjectGroup.cpp
+++ b/src/libfwbuilder/src/fwbuilder/ObjectGroup.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"



--- a/src/libfwbuilder/src/fwbuilder/ObjectMatcher.cpp
+++ b/src/libfwbuilder/src/fwbuilder/ObjectMatcher.cpp
@ -41,8 +41,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/ObjectMatcher.h"

--- a/src/libfwbuilder/src/fwbuilder/ObjectMatcher.h
+++ b/src/libfwbuilder/src/fwbuilder/ObjectMatcher.h
@ -30,7 +30,6 @@
 #include <string>
 #include <list>

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Dispatch.h"


--- a/src/libfwbuilder/src/fwbuilder/ObjectMirror.cpp
+++ b/src/libfwbuilder/src/fwbuilder/ObjectMirror.cpp
@ -28,8 +28,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/ObjectMirror.h"

--- a/src/libfwbuilder/src/fwbuilder/ObjectMirror.h
+++ b/src/libfwbuilder/src/fwbuilder/ObjectMirror.h
@ -30,7 +30,6 @@
 #include <string>
 #include <list>

-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Dispatch.h"


--- a/src/libfwbuilder/src/fwbuilder/Policy.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Policy.cpp
@ -26,8 +26,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"



--- a/src/libfwbuilder/src/fwbuilder/Resources.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Resources.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include <sys/types.h>
--- a/src/libfwbuilder/src/fwbuilder/Resources.h
+++ b/src/libfwbuilder/src/fwbuilder/Resources.h
@ -28,7 +28,6 @@
 #ifndef _RESOURCES_HH
 #define _RESOURCES_HH

-#include "fwbuilder/libfwbuilder-config.h"

 #include <map>
 #include <string>
--- a/src/libfwbuilder/src/fwbuilder/Routing.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Routing.cpp
@ -30,8 +30,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/Routing.h"
 #include "fwbuilder/Rule.h"
--- a/src/libfwbuilder/src/fwbuilder/Rule.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Rule.cpp
@ -30,8 +30,6 @@
 #include <sstream>
 #include <iostream>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObjectDatabase.h"
--- a/src/libfwbuilder/src/fwbuilder/RuleElement.cpp
+++ b/src/libfwbuilder/src/fwbuilder/RuleElement.cpp
@ -28,8 +28,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObjectDatabase.h"
--- a/src/libfwbuilder/src/fwbuilder/RuleSet.cpp
+++ b/src/libfwbuilder/src/fwbuilder/RuleSet.cpp
@ -25,8 +25,6 @@
 */


-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/FWObjectDatabase.h"
--- a/src/libfwbuilder/src/fwbuilder/SecuwallMgmtFile.cpp
+++ b/src/libfwbuilder/src/fwbuilder/SecuwallMgmtFile.cpp
@ -14,8 +14,6 @@
 * o The terms of NetCitadel End User License Agreement
 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/SecuwallMgmtFile.h"
--- a/src/libfwbuilder/src/fwbuilder/Service.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Service.cpp
@ -23,8 +23,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/Service.h"
--- a/src/libfwbuilder/src/fwbuilder/ServiceGroup.cpp
+++ b/src/libfwbuilder/src/fwbuilder/ServiceGroup.cpp
@ -25,8 +25,6 @@
 */


-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/Service.h"
--- a/src/libfwbuilder/src/fwbuilder/StateSyncClusterGroup.cpp
+++ b/src/libfwbuilder/src/fwbuilder/StateSyncClusterGroup.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/StateSyncClusterGroup.h"
--- a/src/libfwbuilder/src/fwbuilder/TCPService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/TCPService.cpp
@ -25,8 +25,6 @@
 */


-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/TCPService.h"
--- a/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp
@ -25,8 +25,6 @@
 */


-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/TCPUDPService.h"
--- a/src/libfwbuilder/src/fwbuilder/TagService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/TagService.cpp
@ -27,8 +27,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/TagService.h"
--- a/src/libfwbuilder/src/fwbuilder/ThreadTools.cpp
+++ b/src/libfwbuilder/src/fwbuilder/ThreadTools.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/ThreadTools.h"
--- a/src/libfwbuilder/src/fwbuilder/ThreadTools.h
+++ b/src/libfwbuilder/src/fwbuilder/ThreadTools.h
@ -27,7 +27,6 @@
 #ifndef __THREAD_TOOLS_H_FLAG__
 #define __THREAD_TOOLS_H_FLAG__

-#include "fwbuilder/libfwbuilder-config.h"

 #include <time.h> //for time_t definition
 #include <pthread.h>
--- a/src/libfwbuilder/src/fwbuilder/Tools.cpp
+++ b/src/libfwbuilder/src/fwbuilder/Tools.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/Tools.h"
 #include "fwbuilder/XMLTools.h"
--- a/src/libfwbuilder/src/fwbuilder/Tools.h
+++ b/src/libfwbuilder/src/fwbuilder/Tools.h
@ -39,7 +39,6 @@
 # define nil NULL
 #endif

-#include "config.h"

 #include <string>
 #include <map>
--- a/src/libfwbuilder/src/fwbuilder/UDPService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/UDPService.cpp
@ -25,8 +25,6 @@
 */


-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/UDPService.h"
--- a/src/libfwbuilder/src/fwbuilder/UserService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/UserService.cpp
@ -27,8 +27,6 @@

 #include <assert.h>

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/UserService.h"
--- a/src/libfwbuilder/src/fwbuilder/XMLTools.cpp
+++ b/src/libfwbuilder/src/fwbuilder/XMLTools.cpp
@ -25,8 +25,6 @@
 */


-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #include "fwbuilder/XMLTools.h"
--- a/src/libfwbuilder/src/fwbuilder/XMLTools.h
+++ b/src/libfwbuilder/src/fwbuilder/XMLTools.h
@ -31,8 +31,6 @@
 #ifndef __XML_TOOLS_HH_FLAG__
 #define __XML_TOOLS_HH_FLAG__

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"

 #include "fwbuilder/Tools.h"
 #include "fwbuilder/FWException.h"
--- a/src/libfwbuilder/src/fwbuilder/dns.cpp
+++ b/src/libfwbuilder/src/fwbuilder/dns.cpp
@ -24,8 +24,6 @@

 */

-#include "config.h"
-#include "fwbuilder/libfwbuilder-config.h"


 #ifndef _WIN32
--- a/src/libfwbuilder/src/fwbuilder/dns.h
+++ b/src/libfwbuilder/src/fwbuilder/dns.h
@ -28,7 +28,6 @@
 #ifndef __DNS_HH_FLAG__
 #define __DNS_HH_FLAG__

-#include "fwbuilder/libfwbuilder-config.h"

 #ifndef _WIN32

--- a/Show More
+++ b/Show More