diff --git a/.gitignore b/.gitignore
index 7bc5dc756..6ed36367d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ install*
 ltmain.sh
 configure
 libtool
+qmake.inc
+config.h
 .obj
 .moc
 .ui
diff --git a/config.h.in b/config.h.in
index d7d1bbb10..4275a6900 100644
--- a/config.h.in
+++ b/config.h.in
@@ -112,7 +112,7 @@ using namespace std;
 #  define SNPRINTF  _snprintf
 #  define VSNPRINTF _vsnprintf
 
-#  define _WIN32_WINNT 0x0502
+#  define WINVER 0x0502
 
 #else
 
diff --git a/src/libfwbuilder/.gitignore b/src/libfwbuilder/.gitignore
index 8b1378917..deae3c625 100644
--- a/src/libfwbuilder/.gitignore
+++ b/src/libfwbuilder/.gitignore
@@ -1 +1 @@
-
+libfwbuilder-config.h
diff --git a/src/libfwbuilder/src/fwbuilder/Address.cpp b/src/libfwbuilder/src/fwbuilder/Address.cpp
index bb6b5a90c..b4c8cc128 100644
--- a/src/libfwbuilder/src/fwbuilder/Address.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/AddressRange.cpp b/src/libfwbuilder/src/fwbuilder/AddressRange.cpp
index 394e9902c..55f6e816e 100644
--- a/src/libfwbuilder/src/fwbuilder/AddressRange.cpp
+++ b/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;
 
diff --git a/src/libfwbuilder/src/fwbuilder/AddressTable.cpp b/src/libfwbuilder/src/fwbuilder/AddressTable.cpp
index 084161fad..09bcc1522 100644
--- a/src/libfwbuilder/src/fwbuilder/AddressTable.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/AttachedNetworks.cpp b/src/libfwbuilder/src/fwbuilder/AttachedNetworks.cpp
index 12783ae2d..cc2e0c04b 100644
--- a/src/libfwbuilder/src/fwbuilder/AttachedNetworks.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/BackgroundOp.cpp b/src/libfwbuilder/src/fwbuilder/BackgroundOp.cpp
index 925ca3edb..3a9fd8d35 100644
--- a/src/libfwbuilder/src/fwbuilder/BackgroundOp.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/Cluster.cpp b/src/libfwbuilder/src/fwbuilder/Cluster.cpp
index 3f141b301..d3f6fb2a8 100644
--- a/src/libfwbuilder/src/fwbuilder/Cluster.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/ClusterGroup.cpp b/src/libfwbuilder/src/fwbuilder/ClusterGroup.cpp
index 583e0d620..8cd34cc32 100644
--- a/src/libfwbuilder/src/fwbuilder/ClusterGroup.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/Constants.cpp b/src/libfwbuilder/src/fwbuilder/Constants.cpp
index 742118259..2ecede38b 100644
--- a/src/libfwbuilder/src/fwbuilder/Constants.cpp
+++ b/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;
 
diff --git a/src/libfwbuilder/src/fwbuilder/CustomService.cpp b/src/libfwbuilder/src/fwbuilder/CustomService.cpp
index 93a0362f8..9a1a34008 100644
--- a/src/libfwbuilder/src/fwbuilder/CustomService.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/DNSName.cpp b/src/libfwbuilder/src/fwbuilder/DNSName.cpp
index a428840cd..aa6d29d74 100644
--- a/src/libfwbuilder/src/fwbuilder/DNSName.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/DynamicGroup.cpp b/src/libfwbuilder/src/fwbuilder/DynamicGroup.cpp
index 9bd3ee2b6..1db04623c 100644
--- a/src/libfwbuilder/src/fwbuilder/DynamicGroup.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/FWException.cpp b/src/libfwbuilder/src/fwbuilder/FWException.cpp
index 6c80acba1..1d4828827 100644
--- a/src/libfwbuilder/src/fwbuilder/FWException.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/FWIntervalReference.cpp b/src/libfwbuilder/src/fwbuilder/FWIntervalReference.cpp
index 2b4d3a82d..b7e64bfa0 100644
--- a/src/libfwbuilder/src/fwbuilder/FWIntervalReference.cpp
+++ b/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;
 
diff --git a/src/libfwbuilder/src/fwbuilder/FWObject.cpp b/src/libfwbuilder/src/fwbuilder/FWObject.cpp
index 1854767ff..c2c2e53d3 100644
--- a/src/libfwbuilder/src/fwbuilder/FWObject.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp
index eea8f25a2..079a68f2c 100644
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_create_object.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_create_object.cpp
index 10c9f826d..158bd52e9 100644
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_create_object.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_search.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_search.cpp
index 0e18ed8f8..23662ed1d 100644
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_search.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp
index 7e7faaada..807234b08 100644
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectReference.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectReference.cpp
index 805d6098e..8614f5866 100644
--- a/src/libfwbuilder/src/fwbuilder/FWObjectReference.cpp
+++ b/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;
 
diff --git a/src/libfwbuilder/src/fwbuilder/FWOptions.cpp b/src/libfwbuilder/src/fwbuilder/FWOptions.cpp
index 0c93f14fe..389db416a 100644
--- a/src/libfwbuilder/src/fwbuilder/FWOptions.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/FWReference.cpp b/src/libfwbuilder/src/fwbuilder/FWReference.cpp
index 6c6dfd567..cabd54c19 100644
--- a/src/libfwbuilder/src/fwbuilder/FWReference.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/FWServiceReference.cpp b/src/libfwbuilder/src/fwbuilder/FWServiceReference.cpp
index ea4088cc4..f325786a2 100644
--- a/src/libfwbuilder/src/fwbuilder/FWServiceReference.cpp
+++ b/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;
 
diff --git a/src/libfwbuilder/src/fwbuilder/FailoverClusterGroup.cpp b/src/libfwbuilder/src/fwbuilder/FailoverClusterGroup.cpp
index 93f343a0d..d30bcff56 100644
--- a/src/libfwbuilder/src/fwbuilder/FailoverClusterGroup.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/Firewall.cpp b/src/libfwbuilder/src/fwbuilder/Firewall.cpp
index f6cfcedd8..5c2890433 100644
--- a/src/libfwbuilder/src/fwbuilder/Firewall.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/Group.cpp b/src/libfwbuilder/src/fwbuilder/Group.cpp
index 07174aa99..65bf2fedc 100644
--- a/src/libfwbuilder/src/fwbuilder/Group.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/Host.cpp b/src/libfwbuilder/src/fwbuilder/Host.cpp
index bddbd5435..f0dea3015 100644
--- a/src/libfwbuilder/src/fwbuilder/Host.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/ICMP6Service.cpp b/src/libfwbuilder/src/fwbuilder/ICMP6Service.cpp
index c4a38577a..7a795b98e 100644
--- a/src/libfwbuilder/src/fwbuilder/ICMP6Service.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/ICMPService.cpp b/src/libfwbuilder/src/fwbuilder/ICMPService.cpp
index bebe9e78f..720550ada 100644
--- a/src/libfwbuilder/src/fwbuilder/ICMPService.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/IPRoute.cpp b/src/libfwbuilder/src/fwbuilder/IPRoute.cpp
index fe4f80069..64a9dfa8a 100644
--- a/src/libfwbuilder/src/fwbuilder/IPRoute.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/IPService.cpp b/src/libfwbuilder/src/fwbuilder/IPService.cpp
index 50923df29..4bb157b4b 100644
--- a/src/libfwbuilder/src/fwbuilder/IPService.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/IPv4.cpp b/src/libfwbuilder/src/fwbuilder/IPv4.cpp
index 401948095..62a76b511 100644
--- a/src/libfwbuilder/src/fwbuilder/IPv4.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/IPv6.cpp b/src/libfwbuilder/src/fwbuilder/IPv6.cpp
index 2d9d35cd3..8760688f3 100644
--- a/src/libfwbuilder/src/fwbuilder/IPv6.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp b/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp
index 49b5a1df4..5119ed08c 100644
--- a/src/libfwbuilder/src/fwbuilder/Inet6AddrMask.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/InetAddr.cpp b/src/libfwbuilder/src/fwbuilder/InetAddr.cpp
index df71282de..d3b7aa2de 100644
--- a/src/libfwbuilder/src/fwbuilder/InetAddr.cpp
+++ b/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
diff --git a/src/libfwbuilder/src/fwbuilder/InetAddrMask.cpp b/src/libfwbuilder/src/fwbuilder/InetAddrMask.cpp
index b0c185abb..986d6ec0f 100644
--- a/src/libfwbuilder/src/fwbuilder/InetAddrMask.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/Interface.cpp b/src/libfwbuilder/src/fwbuilder/Interface.cpp
index c2590bd04..00a64dd3a 100644
--- a/src/libfwbuilder/src/fwbuilder/Interface.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/InterfaceData.cpp b/src/libfwbuilder/src/fwbuilder/InterfaceData.cpp
index 3d8bc9cb1..721a9b0bc 100644
--- a/src/libfwbuilder/src/fwbuilder/InterfaceData.cpp
+++ b/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"
 
diff --git a/src/libfwbuilder/src/fwbuilder/Interval.cpp b/src/libfwbuilder/src/fwbuilder/Interval.cpp
index 1abe0b05e..3a2e349fd 100644
--- a/src/libfwbuilder/src/fwbuilder/Interval.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/IntervalGroup.cpp b/src/libfwbuilder/src/fwbuilder/IntervalGroup.cpp
index 2fc365786..36be1fb68 100644
--- a/src/libfwbuilder/src/fwbuilder/IntervalGroup.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/Library.cpp b/src/libfwbuilder/src/fwbuilder/Library.cpp
index 2b2edb9c8..b4b4ef009 100644
--- a/src/libfwbuilder/src/fwbuilder/Library.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/Logger.cpp b/src/libfwbuilder/src/fwbuilder/Logger.cpp
index 4a8fb7031..9ceb9c158 100644
--- a/src/libfwbuilder/src/fwbuilder/Logger.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/Management.cpp b/src/libfwbuilder/src/fwbuilder/Management.cpp
index c500d3bc6..5ca78adf1 100644
--- a/src/libfwbuilder/src/fwbuilder/Management.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/MultiAddress.cpp b/src/libfwbuilder/src/fwbuilder/MultiAddress.cpp
index 5ae634d07..167e7faed 100644
--- a/src/libfwbuilder/src/fwbuilder/MultiAddress.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/NAT.cpp b/src/libfwbuilder/src/fwbuilder/NAT.cpp
index a7e8cad4b..fdc3069a5 100644
--- a/src/libfwbuilder/src/fwbuilder/NAT.cpp
+++ b/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;
 
diff --git a/src/libfwbuilder/src/fwbuilder/Network.cpp b/src/libfwbuilder/src/fwbuilder/Network.cpp
index cd342c9ad..400d5f4f7 100644
--- a/src/libfwbuilder/src/fwbuilder/Network.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/NetworkIPv6.cpp b/src/libfwbuilder/src/fwbuilder/NetworkIPv6.cpp
index 6b3395b0f..4c17ddd43 100644
--- a/src/libfwbuilder/src/fwbuilder/NetworkIPv6.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/ObjectGroup.cpp b/src/libfwbuilder/src/fwbuilder/ObjectGroup.cpp
index a056880fd..b3da57978 100644
--- a/src/libfwbuilder/src/fwbuilder/ObjectGroup.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/ObjectMatcher.cpp b/src/libfwbuilder/src/fwbuilder/ObjectMatcher.cpp
index 46e8ea100..e5294bbf7 100644
--- a/src/libfwbuilder/src/fwbuilder/ObjectMatcher.cpp
+++ b/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"
diff --git a/src/libfwbuilder/src/fwbuilder/ObjectMirror.cpp b/src/libfwbuilder/src/fwbuilder/ObjectMirror.cpp
index 86feabfb6..10c9dd5e3 100644
--- a/src/libfwbuilder/src/fwbuilder/ObjectMirror.cpp
+++ b/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"
diff --git a/src/libfwbuilder/src/fwbuilder/Policy.cpp b/src/libfwbuilder/src/fwbuilder/Policy.cpp
index b29c083a2..8641a74bd 100644
--- a/src/libfwbuilder/src/fwbuilder/Policy.cpp
+++ b/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;
 
diff --git a/src/libfwbuilder/src/fwbuilder/Resources.cpp b/src/libfwbuilder/src/fwbuilder/Resources.cpp
index 40f0a90cd..5b254aa2a 100644
--- a/src/libfwbuilder/src/fwbuilder/Resources.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/Routing.cpp b/src/libfwbuilder/src/fwbuilder/Routing.cpp
index e6752c890..c5f15240e 100644
--- a/src/libfwbuilder/src/fwbuilder/Routing.cpp
+++ b/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;
 
diff --git a/src/libfwbuilder/src/fwbuilder/Rule.cpp b/src/libfwbuilder/src/fwbuilder/Rule.cpp
index 8c536be2a..1f2190189 100644
--- a/src/libfwbuilder/src/fwbuilder/Rule.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/RuleElement.cpp b/src/libfwbuilder/src/fwbuilder/RuleElement.cpp
index af9146f01..761bcd82d 100644
--- a/src/libfwbuilder/src/fwbuilder/RuleElement.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/RuleSet.cpp b/src/libfwbuilder/src/fwbuilder/RuleSet.cpp
index dda275bd3..0bfb68aab 100644
--- a/src/libfwbuilder/src/fwbuilder/RuleSet.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/SecuwallMgmtFile.cpp b/src/libfwbuilder/src/fwbuilder/SecuwallMgmtFile.cpp
index 432380184..735984438 100644
--- a/src/libfwbuilder/src/fwbuilder/SecuwallMgmtFile.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/Service.cpp b/src/libfwbuilder/src/fwbuilder/Service.cpp
index dab7632bf..15d6c1e55 100644
--- a/src/libfwbuilder/src/fwbuilder/Service.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/ServiceGroup.cpp b/src/libfwbuilder/src/fwbuilder/ServiceGroup.cpp
index 2e9a2420a..f2b634d10 100644
--- a/src/libfwbuilder/src/fwbuilder/ServiceGroup.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/StateSyncClusterGroup.cpp b/src/libfwbuilder/src/fwbuilder/StateSyncClusterGroup.cpp
index 7ad2697bd..7a6a53895 100644
--- a/src/libfwbuilder/src/fwbuilder/StateSyncClusterGroup.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/TCPService.cpp b/src/libfwbuilder/src/fwbuilder/TCPService.cpp
index cd13ca3af..74ffb8022 100644
--- a/src/libfwbuilder/src/fwbuilder/TCPService.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp b/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp
index 13f8e1ab8..76e31bdfd 100644
--- a/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/TagService.cpp b/src/libfwbuilder/src/fwbuilder/TagService.cpp
index 2a78177dd..bc63a1ecd 100644
--- a/src/libfwbuilder/src/fwbuilder/TagService.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/ThreadTools.cpp b/src/libfwbuilder/src/fwbuilder/ThreadTools.cpp
index dc551f80b..76b32243c 100644
--- a/src/libfwbuilder/src/fwbuilder/ThreadTools.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/Tools.cpp b/src/libfwbuilder/src/fwbuilder/Tools.cpp
index 0604025e8..44af06925 100644
--- a/src/libfwbuilder/src/fwbuilder/Tools.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/UDPService.cpp b/src/libfwbuilder/src/fwbuilder/UDPService.cpp
index ce9dcff69..52257075e 100644
--- a/src/libfwbuilder/src/fwbuilder/UDPService.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/UserService.cpp b/src/libfwbuilder/src/fwbuilder/UserService.cpp
index b70bdc75b..e2a53c30f 100644
--- a/src/libfwbuilder/src/fwbuilder/UserService.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/XMLTools.cpp b/src/libfwbuilder/src/fwbuilder/XMLTools.cpp
index cc2f0f464..2788490a1 100644
--- a/src/libfwbuilder/src/fwbuilder/XMLTools.cpp
+++ b/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>
 
diff --git a/src/libfwbuilder/src/fwbuilder/dns.cpp b/src/libfwbuilder/src/fwbuilder/dns.cpp
index 52a9e42e3..779c4ddf3 100644
--- a/src/libfwbuilder/src/fwbuilder/dns.cpp
+++ b/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;
diff --git a/src/libfwbuilder/src/fwbuilder/fwbuilder.pro b/src/libfwbuilder/src/fwbuilder/fwbuilder.pro
index a2f757f61..6e40a0537 100644
--- a/src/libfwbuilder/src/fwbuilder/fwbuilder.pro
+++ b/src/libfwbuilder/src/fwbuilder/fwbuilder.pro
@@ -5,6 +5,8 @@ include(../../qmake.inc)
 TEMPLATE = lib
 CONFIG += staticlib
 
+INCLUDEPATH += "../../../../"
+
 #
 SOURCES  = 	InetAddr.cpp \
 			InetAddrMask.cpp \
diff --git a/src/libfwbuilder/src/fwbuilder/physAddress.cpp b/src/libfwbuilder/src/fwbuilder/physAddress.cpp
index 055fd25ae..41582bb70 100644
--- a/src/libfwbuilder/src/fwbuilder/physAddress.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwbuilder/snmp.cpp b/src/libfwbuilder/src/fwbuilder/snmp.cpp
index ef2fa348c..8cd376da2 100644
--- a/src/libfwbuilder/src/fwbuilder/snmp.cpp
+++ b/src/libfwbuilder/src/fwbuilder/snmp.cpp
@@ -21,8 +21,10 @@
 
 */
 
+#include "config.h"
 #include "fwbuilder/libfwbuilder-config.h"
 
+
 #ifdef HAVE_LIBSNMP
 
 #include <stdlib.h>
diff --git a/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp b/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp
index 158b19b7f..664adb985 100644
--- a/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp
+++ b/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>
diff --git a/src/libfwbuilder/src/fwcompiler/Compiler.cpp b/src/libfwbuilder/src/fwcompiler/Compiler.cpp
index 3abedb0f5..dd74482eb 100644
--- a/src/libfwbuilder/src/fwcompiler/Compiler.cpp
+++ b/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"
diff --git a/src/libfwbuilder/src/fwcompiler/Compiler_helpers.cpp b/src/libfwbuilder/src/fwcompiler/Compiler_helpers.cpp
index af75199a9..eb45533a5 100644
--- a/src/libfwbuilder/src/fwcompiler/Compiler_helpers.cpp
+++ b/src/libfwbuilder/src/fwcompiler/Compiler_helpers.cpp
@@ -10,6 +10,7 @@
 
 */
  
+#include "config.h"
 #include "fwbuilder/libfwbuilder-config.h"
 
 #include "Compiler.h"
diff --git a/src/libfwbuilder/src/fwcompiler/Compiler_object_match.cpp b/src/libfwbuilder/src/fwcompiler/Compiler_object_match.cpp
index 7d56188c8..57c357f18 100644
--- a/src/libfwbuilder/src/fwcompiler/Compiler_object_match.cpp
+++ b/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"
diff --git a/src/libfwbuilder/src/fwcompiler/fwcompiler.pro b/src/libfwbuilder/src/fwcompiler/fwcompiler.pro
index ea5aee222..56b5fecdc 100644
--- a/src/libfwbuilder/src/fwcompiler/fwcompiler.pro
+++ b/src/libfwbuilder/src/fwcompiler/fwcompiler.pro
@@ -5,6 +5,8 @@ include(../../qmake.inc)
 TEMPLATE = lib
 CONFIG += staticlib
 
+INCLUDEPATH += "../../../../"
+
 #
 SOURCES  = 	BaseCompiler.cpp \
 			Compiler.cpp \