need to define WINVER in config.h, also need to make sure this file is #included first; changes all #include of fwbuilder and fwcompile .h files to #include "" since they are not installed in system /include directory

.gitignore

@@ -25,6 +25,8 @@ install*
 ltmain.sh
 configure
 libtool
+qmake.inc
+config.h
 .obj
 .moc
 .ui

config.h.in

@@ -112,7 +112,7 @@ using namespace std;
 #  define SNPRINTF  _snprintf
 #  define VSNPRINTF _vsnprintf
 
-#  define _WIN32_WINNT 0x0502
+#  define WINVER 0x0502
 
 #else
 

src/libfwbuilder/.gitignore

@@ -1 +1 @@
-
+libfwbuilder-config.h

src/libfwbuilder/src/fwbuilder/Address.cpp

@@ -27,12 +27,14 @@
 #include <assert.h>
 #include <iostream>
 
-#include <fwbuilder/libfwbuilder-config.h>
-#include <fwbuilder/Address.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/FWException.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
+#include "fwbuilder/Address.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/FWException.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/AddressRange.cpp

@@ -26,10 +26,12 @@
 #include <assert.h>
 #include <iostream>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/AddressRange.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/AddressRange.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 

src/libfwbuilder/src/fwbuilder/AddressTable.cpp

@@ -25,15 +25,17 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/AddressTable.h>
-#include <fwbuilder/FWException.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/Network.h>
-#include <fwbuilder/NetworkIPv6.h>
+
+#include "fwbuilder/AddressTable.h"
+#include "fwbuilder/FWException.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/Network.h"
+#include "fwbuilder/NetworkIPv6.h"
 
 #include <iostream>
 #include <fstream>

src/libfwbuilder/src/fwbuilder/AttachedNetworks.cpp

@@ -23,17 +23,19 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/AttachedNetworks.h>
-#include <fwbuilder/FWException.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/IPv6.h>
-#include <fwbuilder/Network.h>
-#include <fwbuilder/NetworkIPv6.h>
+
+#include "fwbuilder/AttachedNetworks.h"
+#include "fwbuilder/FWException.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/IPv6.h"
+#include "fwbuilder/Network.h"
+#include "fwbuilder/NetworkIPv6.h"
 
 #include <iostream>
 #include <fstream>

src/libfwbuilder/src/fwbuilder/BackgroundOp.cpp

@@ -25,7 +25,9 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -38,7 +40,7 @@
 #include <errno.h>
 #include <signal.h>
 
-#include <fwbuilder/BackgroundOp.h>
+#include "fwbuilder/BackgroundOp.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/Cluster.cpp

@@ -17,28 +17,30 @@
 #include <time.h>
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/Cluster.h>
-#include <fwbuilder/StateSyncClusterGroup.h>
-#include <fwbuilder/FailoverClusterGroup.h>
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/Management.h>
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/IPv6.h>
+#include "fwbuilder/Cluster.h"
+#include "fwbuilder/StateSyncClusterGroup.h"
+#include "fwbuilder/FailoverClusterGroup.h"
 
-#include <fwbuilder/Policy.h>
-#include <fwbuilder/NAT.h>
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/Management.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/IPv6.h"
 
-#include <fwbuilder/Routing.h>
+#include "fwbuilder/Policy.h"
+#include "fwbuilder/NAT.h"
 
-#include <fwbuilder/RuleElement.h>
+#include "fwbuilder/Routing.h"
 
-#include <fwbuilder/XMLTools.h>
+#include "fwbuilder/RuleElement.h"
+
+#include "fwbuilder/XMLTools.h"
 #include "fwbuilder/Resources.h"
 
 using namespace std;

src/libfwbuilder/src/fwbuilder/ClusterGroup.cpp

@@ -14,13 +14,15 @@
  * o The terms of NetCitadel End User License Agreement
  */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/ClusterGroup.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/Firewall.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/FWOptions.h>
+
+#include "fwbuilder/ClusterGroup.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/FWOptions.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/Constants.cpp

@@ -21,10 +21,11 @@
 
 */
 
-#include "../../config.h"
-#include "fwbuilder/Constants.h"
+#include "config.h"
 #include "fwbuilder/libfwbuilder-config.h"
 
+#include "fwbuilder/Constants.h"
+
 using namespace std;
 using namespace libfwbuilder;
 

src/libfwbuilder/src/fwbuilder/CustomService.cpp

@@ -27,11 +27,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/CustomService.h>
-#include <fwbuilder/XMLTools.h>
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/CustomService.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/DNSName.cpp

@@ -25,16 +25,18 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/DNSName.h>
-#include <fwbuilder/FWException.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/InetAddr.h>
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/IPv6.h>
-#include <fwbuilder/dns.h>
+
+#include "fwbuilder/DNSName.h"
+#include "fwbuilder/FWException.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/InetAddr.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/IPv6.h"
+#include "fwbuilder/dns.h"
 
 #include <iostream>
 

src/libfwbuilder/src/fwbuilder/DynamicGroup.cpp

@@ -21,12 +21,14 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
+#include "fwbuilder/DynamicGroup.h"
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/RuleElement.h"
 
-#include <fwbuilder/DynamicGroup.h>
-#include <fwbuilder/XMLTools.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/RuleElement.h>
 #include <cstring>
 
 using namespace std;

src/libfwbuilder/src/fwbuilder/FWException.cpp

@@ -24,9 +24,11 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWException.h>
+
+#include "fwbuilder/FWException.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/FWIntervalReference.cpp

@@ -24,11 +24,13 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWIntervalReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWIntervalReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 

src/libfwbuilder/src/fwbuilder/FWObject.cpp

@@ -24,21 +24,23 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/Tools.h>
-#include <fwbuilder/XMLTools.h>
-#include <fwbuilder/FWObject.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/Library.h>
 
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/RuleSet.h>
-#include <fwbuilder/RuleElement.h>
-#include <fwbuilder/Rule.h>
-#include <fwbuilder/Host.h>
-#include <fwbuilder/Interface.h>
+#include "fwbuilder/Tools.h"
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/FWObject.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/Library.h"
+
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/RuleSet.h"
+#include "fwbuilder/RuleElement.h"
+#include "fwbuilder/Rule.h"
+#include "fwbuilder/Host.h"
+#include "fwbuilder/Interface.h"
 
 #include <stdlib.h>
 #include <stdio.h>

src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp

@@ -23,6 +23,10 @@
 
 */
 
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -33,55 +37,53 @@
 #include <cstring>
 #include <signal.h>
 
-#include <fwbuilder/memcheck.h>
+#include "fwbuilder/memcheck.h"
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "fwbuilder/FWObject.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
-#include <fwbuilder/FWObject.h>
-#include <fwbuilder/FWObjectDatabase.h>
-
-#include <fwbuilder/AttachedNetworks.h>
-#include <fwbuilder/Library.h>
-#include <fwbuilder/Interval.h>
-#include <fwbuilder/ICMPService.h>
-#include <fwbuilder/ICMP6Service.h>
-#include <fwbuilder/IPService.h>
-#include <fwbuilder/TCPService.h>
-#include <fwbuilder/UDPService.h>
-#include <fwbuilder/CustomService.h>
-#include <fwbuilder/FWReference.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/FWIntervalReference.h>
-#include <fwbuilder/Host.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/IPv6.h>
-#include <fwbuilder/physAddress.h>
-#include <fwbuilder/DNSName.h>
-#include <fwbuilder/AddressTable.h>
-#include <fwbuilder/Group.h>
-#include <fwbuilder/Rule.h>
-#include <fwbuilder/RuleElement.h>
-#include <fwbuilder/RuleSet.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/Firewall.h>
-#include <fwbuilder/Cluster.h>
-#include <fwbuilder/StateSyncClusterGroup.h>
-#include <fwbuilder/FailoverClusterGroup.h>
-#include <fwbuilder/NAT.h>
-#include <fwbuilder/Policy.h>
-#include <fwbuilder/Routing.h>
-#include <fwbuilder/ObjectGroup.h>
-#include <fwbuilder/ServiceGroup.h>
-#include <fwbuilder/IntervalGroup.h>
-#include <fwbuilder/Network.h>
-#include <fwbuilder/NetworkIPv6.h>
-#include <fwbuilder/AddressRange.h>
-#include <fwbuilder/Management.h>
-#include <fwbuilder/XMLTools.h>
-#include <fwbuilder/TagService.h>
-#include <fwbuilder/UserService.h>
+#include "fwbuilder/AttachedNetworks.h"
+#include "fwbuilder/Library.h"
+#include "fwbuilder/Interval.h"
+#include "fwbuilder/ICMPService.h"
+#include "fwbuilder/ICMP6Service.h"
+#include "fwbuilder/IPService.h"
+#include "fwbuilder/TCPService.h"
+#include "fwbuilder/UDPService.h"
+#include "fwbuilder/CustomService.h"
+#include "fwbuilder/FWReference.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/FWIntervalReference.h"
+#include "fwbuilder/Host.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/IPv6.h"
+#include "fwbuilder/physAddress.h"
+#include "fwbuilder/DNSName.h"
+#include "fwbuilder/AddressTable.h"
+#include "fwbuilder/Group.h"
+#include "fwbuilder/Rule.h"
+#include "fwbuilder/RuleElement.h"
+#include "fwbuilder/RuleSet.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/Cluster.h"
+#include "fwbuilder/StateSyncClusterGroup.h"
+#include "fwbuilder/FailoverClusterGroup.h"
+#include "fwbuilder/NAT.h"
+#include "fwbuilder/Policy.h"
+#include "fwbuilder/Routing.h"
+#include "fwbuilder/ObjectGroup.h"
+#include "fwbuilder/ServiceGroup.h"
+#include "fwbuilder/IntervalGroup.h"
+#include "fwbuilder/Network.h"
+#include "fwbuilder/NetworkIPv6.h"
+#include "fwbuilder/AddressRange.h"
+#include "fwbuilder/Management.h"
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/TagService.h"
+#include "fwbuilder/UserService.h"
 
 #include <iostream>
 #include <sstream>

src/libfwbuilder/src/fwbuilder/FWObjectDatabase_create_object.cpp

@@ -24,6 +24,10 @@
 
 */
 
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -34,56 +38,54 @@
 #include <cstring>
 #include <signal.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "fwbuilder/FWObject.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
-#include <fwbuilder/FWObject.h>
-#include <fwbuilder/FWObjectDatabase.h>
+#include "fwbuilder/AddressRange.h"
+#include "fwbuilder/AddressTable.h"
+#include "fwbuilder/CustomService.h"
+#include "fwbuilder/DNSName.h"
+#include "fwbuilder/FWIntervalReference.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/FWReference.h"
+#include "fwbuilder/FWServiceReference.h"
 
-#include <fwbuilder/AddressRange.h>
-#include <fwbuilder/AddressTable.h>
-#include <fwbuilder/CustomService.h>
-#include <fwbuilder/DNSName.h>
-#include <fwbuilder/FWIntervalReference.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/FWReference.h>
-#include <fwbuilder/FWServiceReference.h>
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/Cluster.h"
+#include "fwbuilder/StateSyncClusterGroup.h"
+#include "fwbuilder/FailoverClusterGroup.h"
 
-#include <fwbuilder/Firewall.h>
-#include <fwbuilder/Cluster.h>
-#include <fwbuilder/StateSyncClusterGroup.h>
-#include <fwbuilder/FailoverClusterGroup.h>
-
-#include <fwbuilder/AttachedNetworks.h>
-#include <fwbuilder/DynamicGroup.h>
-#include <fwbuilder/Group.h>
-#include <fwbuilder/Host.h>
-#include <fwbuilder/ICMP6Service.h>
-#include <fwbuilder/ICMPService.h>
-#include <fwbuilder/IPService.h>
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/IPv6.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/Interval.h>
-#include <fwbuilder/IntervalGroup.h>
-#include <fwbuilder/Library.h>
-#include <fwbuilder/Management.h>
-#include <fwbuilder/NAT.h>
-#include <fwbuilder/Network.h>
-#include <fwbuilder/NetworkIPv6.h>
-#include <fwbuilder/ObjectGroup.h>
-#include <fwbuilder/Policy.h>
-#include <fwbuilder/Routing.h>
-#include <fwbuilder/Rule.h>
-#include <fwbuilder/RuleElement.h>
-#include <fwbuilder/RuleSet.h>
-#include <fwbuilder/ServiceGroup.h>
-#include <fwbuilder/TCPService.h>
-#include <fwbuilder/TagService.h>
-#include <fwbuilder/UDPService.h>
-#include <fwbuilder/UserService.h>
-#include <fwbuilder/XMLTools.h>
-#include <fwbuilder/physAddress.h>
+#include "fwbuilder/AttachedNetworks.h"
+#include "fwbuilder/DynamicGroup.h"
+#include "fwbuilder/Group.h"
+#include "fwbuilder/Host.h"
+#include "fwbuilder/ICMP6Service.h"
+#include "fwbuilder/ICMPService.h"
+#include "fwbuilder/IPService.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/IPv6.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/Interval.h"
+#include "fwbuilder/IntervalGroup.h"
+#include "fwbuilder/Library.h"
+#include "fwbuilder/Management.h"
+#include "fwbuilder/NAT.h"
+#include "fwbuilder/Network.h"
+#include "fwbuilder/NetworkIPv6.h"
+#include "fwbuilder/ObjectGroup.h"
+#include "fwbuilder/Policy.h"
+#include "fwbuilder/Routing.h"
+#include "fwbuilder/Rule.h"
+#include "fwbuilder/RuleElement.h"
+#include "fwbuilder/RuleSet.h"
+#include "fwbuilder/ServiceGroup.h"
+#include "fwbuilder/TCPService.h"
+#include "fwbuilder/TagService.h"
+#include "fwbuilder/UDPService.h"
+#include "fwbuilder/UserService.h"
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/physAddress.h"
 
 #include <iostream>
 #include <sstream>

src/libfwbuilder/src/fwbuilder/FWObjectDatabase_search.cpp

@@ -25,23 +25,25 @@
 
 #include <stdlib.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObject.h>
-#include <fwbuilder/FWObjectDatabase.h>
 
-#include <fwbuilder/Library.h>
-#include <fwbuilder/Host.h>
-#include <fwbuilder/Firewall.h>
-#include <fwbuilder/Cluster.h>
-#include <fwbuilder/Group.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/FWReference.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/FWIntervalReference.h>
-#include <fwbuilder/Rule.h>
-#include <fwbuilder/RuleSet.h>
+#include "fwbuilder/FWObject.h"
+#include "fwbuilder/FWObjectDatabase.h"
+
+#include "fwbuilder/Library.h"
+#include "fwbuilder/Host.h"
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/Cluster.h"
+#include "fwbuilder/Group.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/FWReference.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/FWIntervalReference.h"
+#include "fwbuilder/Rule.h"
+#include "fwbuilder/RuleSet.h"
 
 #include <iostream>
 #include <sstream>

src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp

@@ -25,22 +25,24 @@
 
 #include <stdlib.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObject.h>
-#include <fwbuilder/FWObjectDatabase.h>
 
-#include <fwbuilder/Library.h>
-#include <fwbuilder/Host.h>
-#include <fwbuilder/Firewall.h>
-#include <fwbuilder/Group.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/RuleSet.h>
-#include <fwbuilder/ClusterGroup.h>
-#include <fwbuilder/FWReference.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/FWIntervalReference.h>
+#include "fwbuilder/FWObject.h"
+#include "fwbuilder/FWObjectDatabase.h"
+
+#include "fwbuilder/Library.h"
+#include "fwbuilder/Host.h"
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/Group.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/RuleSet.h"
+#include "fwbuilder/ClusterGroup.h"
+#include "fwbuilder/FWReference.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/FWIntervalReference.h"
 
 #include <iostream>
 #include <sstream>

src/libfwbuilder/src/fwbuilder/FWObjectReference.cpp

@@ -24,12 +24,14 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/ObjectGroup.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/ObjectGroup.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 

src/libfwbuilder/src/fwbuilder/FWOptions.cpp

@@ -26,10 +26,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/Firewall.h>
+
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/Firewall.h"
 
 #include <iostream>
 

src/libfwbuilder/src/fwbuilder/FWReference.cpp

@@ -24,11 +24,13 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <assert.h>
 

src/libfwbuilder/src/fwbuilder/FWServiceReference.cpp

@@ -24,13 +24,15 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Service.h>
-#include <fwbuilder/ServiceGroup.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Service.h"
+#include "fwbuilder/ServiceGroup.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 

src/libfwbuilder/src/fwbuilder/FailoverClusterGroup.cpp

@@ -24,10 +24,12 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FailoverClusterGroup.h>
-#include <fwbuilder/FWOptions.h>
+
+#include "fwbuilder/FailoverClusterGroup.h"
+#include "fwbuilder/FWOptions.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/Firewall.cpp

@@ -27,23 +27,25 @@
 #include <time.h>
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/FailoverClusterGroup.h>
-#include <fwbuilder/Firewall.h>
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/IPv6.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/Management.h>
-#include <fwbuilder/NAT.h>
-#include <fwbuilder/Policy.h>
-#include <fwbuilder/Routing.h>
-#include <fwbuilder/RuleElement.h>
-#include <fwbuilder/StateSyncClusterGroup.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/FailoverClusterGroup.h"
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/IPv6.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/Management.h"
+#include "fwbuilder/NAT.h"
+#include "fwbuilder/Policy.h"
+#include "fwbuilder/Routing.h"
+#include "fwbuilder/RuleElement.h"
+#include "fwbuilder/StateSyncClusterGroup.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <iostream>
 #include <algorithm>

src/libfwbuilder/src/fwbuilder/Group.cpp

@@ -26,12 +26,14 @@
 
 #include <iostream>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObject.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Group.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWObject.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Group.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <algorithm>
 

src/libfwbuilder/src/fwbuilder/Host.cpp

@@ -27,14 +27,16 @@
 #include <assert.h>
 #include <iostream>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Host.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/Management.h>
 
-#include <fwbuilder/XMLTools.h>
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Host.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/Management.h"
+
+#include "fwbuilder/XMLTools.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/ICMP6Service.cpp

@@ -26,10 +26,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/ICMP6Service.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/ICMP6Service.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/ICMPService.cpp

@@ -26,10 +26,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/ICMPService.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/ICMPService.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/IPRoute.cpp

@@ -24,10 +24,12 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/InetAddr.h>
-#include <fwbuilder/IPRoute.h>
+
+#include "fwbuilder/InetAddr.h"
+#include "fwbuilder/IPRoute.h"
 
 #include <stdio.h>
 #include <iostream>

src/libfwbuilder/src/fwbuilder/IPService.cpp

@@ -26,10 +26,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/IPService.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/IPService.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <iostream>
 

src/libfwbuilder/src/fwbuilder/IPv4.cpp

@@ -38,15 +38,17 @@
 
  */
 
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 #include <assert.h>
 #include <iostream>
 #include <cstring>
 #include <stdexcept>
-#include <fwbuilder/libfwbuilder-config.h>
 
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/XMLTools.h>
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/IPv6.cpp

@@ -38,17 +38,19 @@
 
  */
 
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 #include <assert.h>
 #include <iostream>
 #include <sstream>
 #include <cstring>
 
-#include <fwbuilder/libfwbuilder-config.h>
-#include <fwbuilder/Inet6AddrMask.h>
+#include "fwbuilder/Inet6AddrMask.h"
 
-#include <fwbuilder/IPv6.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/XMLTools.h>
+#include "fwbuilder/IPv6.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp

@@ -26,13 +26,15 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/InetAddr.h>
-#include <fwbuilder/Inet6AddrMask.h>
+
+#include "fwbuilder/InetAddr.h"
+#include "fwbuilder/Inet6AddrMask.h"
 
 extern "C" {
-#include <fwbuilder/inet_net.h>
+#include "fwbuilder/inet_net.h"
 }
 
 #include <stdio.h>

src/libfwbuilder/src/fwbuilder/InetAddr.cpp

@@ -24,13 +24,15 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/InetAddr.h>
-#include <fwbuilder/Interface.h>
+
+#include "fwbuilder/InetAddr.h"
+#include "fwbuilder/Interface.h"
 
 extern "C" {
-#  include <fwbuilder/inet_net.h>
+#  include "fwbuilder/inet_net.h"
 }
 
 #ifndef _WIN32

src/libfwbuilder/src/fwbuilder/InetAddrMask.cpp

@@ -24,9 +24,11 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/InetAddrMask.h>
+
+#include "fwbuilder/InetAddrMask.h"
 
 #include <stdio.h>
 #include <iostream>

src/libfwbuilder/src/fwbuilder/Interface.cpp

@@ -24,17 +24,19 @@
 #include <assert.h>
 #include <iostream>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/FailoverClusterGroup.h>
-#include <fwbuilder/XMLTools.h>
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/IPv6.h>
-#include <fwbuilder/Host.h>
-#include <fwbuilder/AttachedNetworks.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Resources.h>
+
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/FailoverClusterGroup.h"
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/IPv6.h"
+#include "fwbuilder/Host.h"
+#include "fwbuilder/AttachedNetworks.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Resources.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/InterfaceData.cpp

@@ -25,7 +25,9 @@
 */
 
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 
 #include "InterfaceData.h"
 

src/libfwbuilder/src/fwbuilder/Interval.cpp

@@ -24,12 +24,14 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/Interval.h>
-#include <fwbuilder/FWIntervalReference.h>
-#include <fwbuilder/XMLTools.h>
-#include <fwbuilder/FWObjectDatabase.h>
+
+#include "fwbuilder/Interval.h"
+#include "fwbuilder/FWIntervalReference.h"
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
 #include <sstream>
 

src/libfwbuilder/src/fwbuilder/IntervalGroup.cpp

@@ -24,12 +24,14 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/IntervalGroup.h>
-#include <fwbuilder/Interval.h>
-#include <fwbuilder/FWIntervalReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
+
+#include "fwbuilder/IntervalGroup.h"
+#include "fwbuilder/Interval.h"
+#include "fwbuilder/FWIntervalReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/Library.cpp

@@ -24,11 +24,13 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObject.h>
-#include <fwbuilder/Library.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWObject.h"
+#include "fwbuilder/Library.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/Logger.cpp

@@ -25,7 +25,9 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -41,7 +43,7 @@
 #include <errno.h>
 #include <signal.h>
 
-#include <fwbuilder/BackgroundOp.h>
+#include "fwbuilder/BackgroundOp.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/Management.cpp

@@ -28,12 +28,14 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Tools.h>
-#include <fwbuilder/Management.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Tools.h"
+#include "fwbuilder/Management.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <iostream>
 

src/libfwbuilder/src/fwbuilder/MultiAddress.cpp

@@ -25,14 +25,16 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/MultiAddress.h>
-#include <fwbuilder/FWException.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/Network.h>
+
+#include "fwbuilder/MultiAddress.h"
+#include "fwbuilder/FWException.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/Network.h"
 
 #include <iostream>
 #include <fstream>

src/libfwbuilder/src/fwbuilder/NAT.cpp

@@ -26,12 +26,14 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/NAT.h>
-#include <fwbuilder/Rule.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/FWObjectDatabase.h>
+
+#include "fwbuilder/NAT.h"
+#include "fwbuilder/Rule.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
 using namespace libfwbuilder;
 

src/libfwbuilder/src/fwbuilder/Network.cpp

@@ -26,10 +26,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/Network.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/Network.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <string>
 

src/libfwbuilder/src/fwbuilder/NetworkIPv6.cpp

@@ -26,10 +26,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
-#include <fwbuilder/Inet6AddrMask.h>
-#include <fwbuilder/NetworkIPv6.h>
-#include <fwbuilder/XMLTools.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
+#include "fwbuilder/Inet6AddrMask.h"
+#include "fwbuilder/NetworkIPv6.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <string>
 #include <sstream>

src/libfwbuilder/src/fwbuilder/ObjectGroup.cpp

@@ -24,28 +24,30 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
 
-#include <fwbuilder/ObjectGroup.h>
-#include <fwbuilder/Service.h>
-#include <fwbuilder/ServiceGroup.h>
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Interval.h>
 
-#include <fwbuilder/Host.h>
-#include <fwbuilder/Firewall.h>
-#include <fwbuilder/Cluster.h>
-#include <fwbuilder/Network.h>
-#include <fwbuilder/NetworkIPv6.h>
-#include <fwbuilder/IPv4.h>
-#include <fwbuilder/IPv6.h>
-#include <fwbuilder/DNSName.h>
-#include <fwbuilder/AddressTable.h>
-#include <fwbuilder/AddressRange.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/RuleSet.h>
+#include "fwbuilder/ObjectGroup.h"
+#include "fwbuilder/Service.h"
+#include "fwbuilder/ServiceGroup.h"
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Interval.h"
+
+#include "fwbuilder/Host.h"
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/Cluster.h"
+#include "fwbuilder/Network.h"
+#include "fwbuilder/NetworkIPv6.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/IPv6.h"
+#include "fwbuilder/DNSName.h"
+#include "fwbuilder/AddressTable.h"
+#include "fwbuilder/AddressRange.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/RuleSet.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/ObjectMatcher.cpp

@@ -41,7 +41,9 @@
 
 #include <assert.h>
 
+#include "config.h"
 #include "fwbuilder/libfwbuilder-config.h"
+
 #include "fwbuilder/ObjectMatcher.h"
 
 #include "fwbuilder/InetAddr.h"

src/libfwbuilder/src/fwbuilder/ObjectMirror.cpp

@@ -28,7 +28,9 @@
 
 #include <assert.h>
 
+#include "config.h"
 #include "fwbuilder/libfwbuilder-config.h"
+
 #include "fwbuilder/ObjectMirror.h"
 
 #include "fwbuilder/FWObjectDatabase.h"

src/libfwbuilder/src/fwbuilder/Policy.cpp

@@ -26,14 +26,16 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Policy.h>
-#include <fwbuilder/Rule.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Policy.h"
+#include "fwbuilder/Rule.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/XMLTools.h"
  
 using namespace libfwbuilder;
 

src/libfwbuilder/src/fwbuilder/Resources.cpp

@@ -24,7 +24,9 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 
 #include <sys/types.h>
 

src/libfwbuilder/src/fwbuilder/Routing.cpp

@@ -30,11 +30,13 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
-#include <fwbuilder/Routing.h>
-#include <fwbuilder/Rule.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/FWObjectDatabase.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
+#include "fwbuilder/Routing.h"
+#include "fwbuilder/Rule.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
 using namespace libfwbuilder;
 

src/libfwbuilder/src/fwbuilder/Rule.cpp

@@ -25,19 +25,21 @@
 #include <sstream>
 #include <iostream>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/Firewall.h>
-#include <fwbuilder/Rule.h>
-#include <fwbuilder/RuleElement.h>
-#include <fwbuilder/Policy.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/XMLTools.h>
-#include <fwbuilder/Policy.h>
-#include <fwbuilder/NAT.h>
-#include <fwbuilder/Routing.h>
-#include <fwbuilder/TagService.h>
+
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/Rule.h"
+#include "fwbuilder/RuleElement.h"
+#include "fwbuilder/Policy.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/Policy.h"
+#include "fwbuilder/NAT.h"
+#include "fwbuilder/Routing.h"
+#include "fwbuilder/TagService.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/RuleElement.cpp

@@ -23,25 +23,27 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/RuleElement.h>
-#include <fwbuilder/Rule.h>
 
-#include <fwbuilder/IPService.h>
-#include <fwbuilder/TagService.h>
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/RuleElement.h"
+#include "fwbuilder/Rule.h"
 
-#include <fwbuilder/Interval.h>
-#include <fwbuilder/Interface.h>
-#include <fwbuilder/Network.h>
-#include <fwbuilder/Firewall.h>
+#include "fwbuilder/IPService.h"
+#include "fwbuilder/TagService.h"
 
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/FWIntervalReference.h>
+#include "fwbuilder/Interval.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/Network.h"
+#include "fwbuilder/Firewall.h"
 
-#include <fwbuilder/XMLTools.h>
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/FWIntervalReference.h"
+
+#include "fwbuilder/XMLTools.h"
 
 #include <iostream>
 

src/libfwbuilder/src/fwbuilder/RuleSet.cpp

@@ -25,12 +25,14 @@
 */
 
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/RuleSet.h>
-#include <fwbuilder/FWOptions.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/RuleSet.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <iostream>
 

src/libfwbuilder/src/fwbuilder/SecuwallMgmtFile.cpp

@@ -14,10 +14,12 @@
  * o The terms of NetCitadel End User License Agreement
  */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/SecuwallMgmtFile.h>
-#include <fwbuilder/Tools.h>
+
+#include "fwbuilder/SecuwallMgmtFile.h"
+#include "fwbuilder/Tools.h"
 
 #include <iostream>
 #include <fstream>

src/libfwbuilder/src/fwbuilder/Service.cpp

@@ -23,12 +23,14 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/Service.h>
-#include <fwbuilder/FWException.h>
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
+
+#include "fwbuilder/Service.h"
+#include "fwbuilder/FWException.h"
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/ServiceGroup.cpp

@@ -25,27 +25,29 @@
 */
 
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/Service.h>
-#include <fwbuilder/ServiceGroup.h>
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
-#include <fwbuilder/ObjectGroup.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/Address.h>
-#include <fwbuilder/Interval.h>
 
-#include <fwbuilder/IPService.h>
-#include <fwbuilder/ICMPService.h>
-#include <fwbuilder/ICMP6Service.h>
-#include <fwbuilder/TCPService.h>
-#include <fwbuilder/UDPService.h>
-#include <fwbuilder/CustomService.h>
-#include <fwbuilder/TagService.h>
-#include <fwbuilder/UserService.h>
-#include <fwbuilder/FWServiceReference.h>
-#include <fwbuilder/RuleSet.h>
+#include "fwbuilder/Service.h"
+#include "fwbuilder/ServiceGroup.h"
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/ObjectGroup.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/Address.h"
+#include "fwbuilder/Interval.h"
+
+#include "fwbuilder/IPService.h"
+#include "fwbuilder/ICMPService.h"
+#include "fwbuilder/ICMP6Service.h"
+#include "fwbuilder/TCPService.h"
+#include "fwbuilder/UDPService.h"
+#include "fwbuilder/CustomService.h"
+#include "fwbuilder/TagService.h"
+#include "fwbuilder/UserService.h"
+#include "fwbuilder/FWServiceReference.h"
+#include "fwbuilder/RuleSet.h"
 
 #include <iostream>
 

src/libfwbuilder/src/fwbuilder/StateSyncClusterGroup.cpp

@@ -24,10 +24,12 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/StateSyncClusterGroup.h>
-#include <fwbuilder/FWOptions.h>
+
+#include "fwbuilder/StateSyncClusterGroup.h"
+#include "fwbuilder/FWOptions.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/TCPService.cpp

@@ -25,10 +25,12 @@
 */
 
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/TCPService.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/TCPService.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp

@@ -25,10 +25,12 @@
 */
 
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/TCPUDPService.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/TCPUDPService.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/TagService.cpp

@@ -27,10 +27,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/TagService.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/TagService.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/ThreadTools.cpp

@@ -24,9 +24,11 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/ThreadTools.h>
+
+#include "fwbuilder/ThreadTools.h"
 
 #include <time.h>
 #include <sys/types.h>

src/libfwbuilder/src/fwbuilder/Tools.cpp

@@ -24,9 +24,11 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
-#include <fwbuilder/Tools.h>
-#include <fwbuilder/XMLTools.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
+#include "fwbuilder/Tools.h"
+#include "fwbuilder/XMLTools.h"
 
 #include <string.h>
 #include <stdio.h>

src/libfwbuilder/src/fwbuilder/UDPService.cpp

@@ -25,10 +25,12 @@
 */
 
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/UDPService.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/UDPService.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace libfwbuilder;
 using namespace std;

src/libfwbuilder/src/fwbuilder/UserService.cpp

@@ -27,10 +27,12 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/UserService.h>
-#include <fwbuilder/XMLTools.h>
+
+#include "fwbuilder/UserService.h"
+#include "fwbuilder/XMLTools.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/XMLTools.cpp

@@ -25,10 +25,12 @@
 */
 
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/XMLTools.h>
-#include <fwbuilder/ThreadTools.h>
+
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/ThreadTools.h"
 
 #include <zlib.h>
 

src/libfwbuilder/src/fwbuilder/dns.cpp

@@ -24,7 +24,9 @@
 
 */
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 
 #ifndef _WIN32
 #  include <netdb.h>
@@ -49,8 +51,9 @@
 #include <sstream>
 #include <cstdlib>
 #include <cstring>
-#include <fwbuilder/dns.h>
-#include <fwbuilder/ThreadTools.h>
+
+#include "fwbuilder/dns.h"
+#include "fwbuilder/ThreadTools.h"
 
 using namespace std;
 using namespace libfwbuilder;

src/libfwbuilder/src/fwbuilder/fwbuilder.pro

@@ -5,6 +5,8 @@ include(../../qmake.inc)
 TEMPLATE = lib
 CONFIG += staticlib
 
+INCLUDEPATH += "../../../../"
+
 #
 SOURCES  = 	InetAddr.cpp \
 			InetAddrMask.cpp \

src/libfwbuilder/src/fwbuilder/physAddress.cpp

@@ -25,12 +25,14 @@
 
 #include <assert.h>
 
-#include <fwbuilder/libfwbuilder-config.h>
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
 
-#include <fwbuilder/physAddress.h>
-#include <fwbuilder/FWException.h>
-#include <fwbuilder/FWObjectReference.h>
-#include <fwbuilder/FWObjectDatabase.h>
+
+#include "fwbuilder/physAddress.h"
+#include "fwbuilder/FWException.h"
+#include "fwbuilder/FWObjectReference.h"
+#include "fwbuilder/FWObjectDatabase.h"
 
 #include <iostream>
 //#include <ostream>

src/libfwbuilder/src/fwbuilder/snmp.cpp

@@ -21,8 +21,10 @@
 
 */
 
+#include "config.h"
 #include "fwbuilder/libfwbuilder-config.h"
 
+
 #ifdef HAVE_LIBSNMP
 
 #include <stdlib.h>

src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp

@@ -23,12 +23,13 @@
 
 */
 
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 #include <assert.h>
 
 #include "BaseCompiler.h"
 
-#include "fwbuilder/libfwbuilder-config.h"
-
 #include <iostream>
 #include <iomanip>
 #include <algorithm>

src/libfwbuilder/src/fwcompiler/Compiler.cpp

@@ -21,12 +21,13 @@
 
 */
 
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 #include <assert.h>
 
 #include "Compiler.h"
 
-#include "fwbuilder/libfwbuilder-config.h"
-
 #include "fwbuilder/AddressRange.h"
 #include "fwbuilder/Cluster.h"
 #include "fwbuilder/CustomService.h"

src/libfwbuilder/src/fwcompiler/Compiler_helpers.cpp

@@ -10,6 +10,7 @@
 
 */
  
+#include "config.h"
 #include "fwbuilder/libfwbuilder-config.h"
 
 #include "Compiler.h"

src/libfwbuilder/src/fwcompiler/Compiler_object_match.cpp

@@ -25,9 +25,11 @@
 
 #include <assert.h>
 
+#include "config.h"
+#include "fwbuilder/libfwbuilder-config.h"
+
 #include "Compiler.h"
 
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/AddressRange.h"
 #include "fwbuilder/RuleElement.h"
 #include "fwbuilder/Firewall.h"

src/libfwbuilder/src/fwcompiler/fwcompiler.pro

@@ -5,6 +5,8 @@ include(../../qmake.inc)
 TEMPLATE = lib
 CONFIG += staticlib
 
+INCLUDEPATH += "../../../../"
+
 #
 SOURCES  = 	BaseCompiler.cpp \
 			Compiler.cpp \