diff --git a/src/gui/fwbuilder_ph.h b/src/gui/fwbuilder_ph.h
index 60f749f32..58975c321 100755
--- a/src/gui/fwbuilder_ph.h
+++ b/src/gui/fwbuilder_ph.h
@@ -1,57 +1,4 @@
-#include "global.h"
-#include "utils.h"
-#include "config.h"
-#include <iostream>
-#include "fwbuilder/InetAddr.h"
-#include "fwbuilder/InetAddrMask.h"
-#include "fwbuilder/Firewall.h"
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qlineedit.h>
-#include "fwbuilder/FWObject.h"
-#include <qpushbutton.h>
-#include <qmessagebox.h>
-#include "fwbuilder/Resources.h"
-#include <qspinbox.h>
-#include <qtextedit.h>
-#include "fwbuilder/Library.h"
-#include <qlabel.h>
-#include <qregexp.h>
-#include <qapplication.h>
-#include "fwbuilder/Interface.h"
-#include <qstring.h>
-#include <qradiobutton.h>
-#include "fwbuilder/FWObjectDatabase.h"
-#include <qpixmapcache.h>
-#include <QWidget>
-#include <map>
-#include "fwbuilder/Management.h"
-#include <QDialog>
-#include <string>
-#include <qstackedwidget.h>
-#include "fwbuilder/Rule.h"
-#include "fwbuilder/FWException.h"
-#include <qcursor.h>
-#include <algorithm>
-#include <list>
-#include <qlistwidget.h>
-#include "fwbuilder/RuleElement.h"
-#include <qobject.h>
-#include "fwbuilder/TCPService.h"
-#include "fwbuilder/UDPService.h"
-#include <vector>
-#include "fwbuilder/IPService.h"
-#include "fwbuilder/ICMPService.h"
-#include <qtimer.h>
-#include "../../config.h"
-#include "fwbuilder/Policy.h"
-#include "fwbuilder/FWReference.h"
-#include <qtooltip.h>
-#include <errno.h>
-#include "fwbuilder/Network.h"
-#include <stdlib.h>
-#include "fwbuilder/Host.h"
-#include <qfiledialog.h>
+
 #if defined(Q_OS_WIN32)
 #  include <stdio.h>
 #  include <sys/timeb.h>
@@ -62,111 +9,176 @@
 #  include <unistd.h>
 #  include <pwd.h>
 #endif
+
+#include <errno.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#include <stdlib.h>
+#include <libxml/xmlmemory.h>
+
+#if defined __cplusplus
+
+#include "../../config.h"
+#include "VERSION.h"
+#include "build_num"
+#include "definitions.h"
+#include "global.h"
+#include "utils.h"
+
+#include "fwbuilder/Address.h"
+#include "fwbuilder/AddressRange.h"
+#include "fwbuilder/AddressTable.h"
+#include "fwbuilder/BackgroundOp.h"
+#include "fwbuilder/Constants.h"
+#include "fwbuilder/CustomService.h"
+#include "fwbuilder/DNSName.h"
+#include "fwbuilder/FWException.h"
+#include "fwbuilder/FWObject.h"
+#include "fwbuilder/FWObjectDatabase.h"
+#include "fwbuilder/FWOptions.h"
+#include "fwbuilder/FWReference.h"
+#include "fwbuilder/Firewall.h"
+#include "fwbuilder/Group.h"
+#include "fwbuilder/Host.h"
+#include "fwbuilder/ICMPService.h"
+#include "fwbuilder/IPService.h"
+#include "fwbuilder/IPv4.h"
+#include "fwbuilder/InetAddr.h"
+#include "fwbuilder/InetAddrMask.h"
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/InterfacePolicy.h"
+#include "fwbuilder/Interval.h"
+#include "fwbuilder/IntervalGroup.h"
+#include "fwbuilder/Library.h"
+#include "fwbuilder/Logger.h"
+#include "fwbuilder/Management.h"
+#include "fwbuilder/NAT.h"
+#include "fwbuilder/Network.h"
+#include "fwbuilder/ObjectGroup.h"
+#include "fwbuilder/Policy.h"
+#include "fwbuilder/Resources.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/Tools.h"
+#include "fwbuilder/UDPService.h"
+#include "fwbuilder/XMLTools.h"
+#include "fwbuilder/libfwbuilder-config.h"
+#include "fwbuilder/physAddress.h"
+
+// QT
+
+#include <QCloseEvent>
+#include <QContextMenuEvent>
+#include <QDialog>
+#include <QDragEnterEvent>
+#include <QDragLeaveEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QFocusEvent>
+#include <QHeaderView>
+#include <QHideEvent>
+#include <QKeyEvent>
+#include <QList>
+#include <QMenu>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QPaintEvent>
+#include <QPixmap>
+#include <QShowEvent>
+#include <QStackedWidget>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QWidget>
+#include <qaction.h>
+#include <qapplication.h>
+#include <qcheckbox.h>
+#include <qcolor.h>
+#include <qcolordialog.h>
+#include <qcombobox.h>
+#include <qcursor.h>
+#include <qdatetime.h>
+#include <qdialog.h>
+#include <qdir.h>
+#include <qdrag.h>
+#include <qevent.h>
+#include <qeventloop.h>
+#include <qfile.h>
+#include <qfiledialog.h>
+#include <qfileinfo.h>
+#include <qfont.h>
+#include <qframe.h>
+#include <qglobal.h>
+#include <qgroupbox.h>
+#include <qheaderview.h>
+#include <qhostaddress.h>
+#include <qhostinfo.h>
+#include <qimage.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qlineedit.h>
+#include <qlistview.h>
+#include <qlistwidget.h>
+#include <qmap.h>
+#include <qmenu.h>
+#include <qmessagebox.h>
+#include <qobject.h>
 #include <qpainter.h>
 #include <qpixmap.h>
-#include <time.h>
-#include "fwbuilder/RuleSet.h"
-#include <qfile.h>
-#include "fwbuilder/AddressRange.h"
-#include <qlayout.h>
-#include <sstream>
-#include <qstringlist.h>
-#include "fwbuilder/IPv4.h"
-#include <qtextbrowser.h>
-#include "fwbuilder/ObjectGroup.h"
-#include "fwbuilder/NAT.h"
-#include "fwbuilder/Interval.h"
-#include "fwbuilder/XMLTools.h"
-#include "definitions.h"
-#include "fwbuilder/InterfacePolicy.h"
-#include <qmenu.h>
-#include <fcntl.h>
-#include <qprocess.h>
-#include <sys/stat.h>
-#include "fwbuilder/CustomService.h"
-#include <qeventloop.h>
-#include "fwbuilder/ServiceGroup.h"
-#include "fwbuilder/TagService.h"
-#include <qtextstream.h>
-#include <qtreewidget.h>
-#include "fwbuilder/AddressTable.h"
-#include "fwbuilder/IntervalGroup.h"
-#include "fwbuilder/DNSName.h"
-#include <fstream>
-#include <qtabwidget.h>
-#include <qdir.h>
-#include <QDropEvent>
-#include "fwbuilder/Routing.h"
-#include <qdrag.h>
-#include <qmap.h>
-#include "VERSION.h"
-#include <qfont.h>
-#include <qgroupbox.h>
-#include <qtextcodec.h>
-#include <functional>
-#include <qprinter.h>
-#include <qrect.h>
-#include <ios>
-#include <qwidget.h>
-#include <qtablewidget.h>
-#include <set>
-#include "fwbuilder/Logger.h"
-#include <sys/types.h>
-#include <QDragEnterEvent>
-#include <qcolor.h>
-#include "fwbuilder/FWOptions.h"
-#include <qaction.h>
-#include <QHeaderView>
-#include <QPixmap>
-#include <qtoolbutton.h>
-#include <utility>
-#include <qevent.h>
-#include <qdialog.h>
-#include <qsplitter.h>
-#include <QMenu>
-#include <string.h>
-#include <qlistview.h>
-#include "fwbuilder/Tools.h"
-#include <QStackedWidget>
-#include <QMimeData>
-#include "fwbuilder/Address.h"
-#include <QTreeWidget>
-#include <qdatetime.h>
-#include "fwbuilder/Group.h"
-#include <QCloseEvent>
-#include <qhostinfo.h>
-#include <qstatusbar.h>
-#include "fwbuilder/physAddress.h"
-#include <qfileinfo.h>
-#include <qcolordialog.h>
-#include <QContextMenuEvent>
-#include "fwbuilder/Constants.h"
+#include <qpixmapcache.h>
 #include <qprintdialog.h>
-#include <QKeyEvent>
-#include <QDragLeaveEvent>
-#include <qvariant.h>
-#include "qobject.h"
-#include <QHideEvent>
-#include <qglobal.h>
-#include <QDragMoveEvent>
-#include <qstyle.h>
-#include <QPaintEvent>
-#include <cctype>
-#include <libxml/xmlmemory.h>
-#include <QFocusEvent>
-#include "fwbuilder/BackgroundOp.h"
-#include <qimage.h>
-#include <QList>
-#include <QMouseEvent>
-#include <qframe.h>
-#include <qsettings.h>
-#include "fwbuilder/libfwbuilder-config.h"
-#include <qhostaddress.h>
+#include <qprinter.h>
+#include <qprocess.h>
 #include <qprogressbar.h>
-#include <qheaderview.h>
-#include "build_num"
-#include <assert.h>
-#include <QTreeWidgetItem>
-#include <QShowEvent>
-#include <qvector.h>
+#include <qpushbutton.h>
+#include <qradiobutton.h>
+#include <qrect.h>
+#include <qregexp.h>
+#include <qsettings.h>
+#include <qspinbox.h>
+#include <qsplitter.h>
+#include <qstackedwidget.h>
+#include <qstatusbar.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qstyle.h>
 #include <qtableview.h>
+#include <qtablewidget.h>
+#include <qtabwidget.h>
+#include <qtextbrowser.h>
+#include <qtextcodec.h>
+#include <qtextedit.h>
+#include <qtextstream.h>
+#include <qtimer.h>
+#include <qtoolbutton.h>
+#include <qtooltip.h>
+#include <qtreewidget.h>
+#include <qvariant.h>
+#include <qvector.h>
+#include <qwidget.h>
+
+// STL
+
+#include <algorithm>
+#include <cctype>
+#include <fstream>
+#include <functional>
+#include <ios>
+#include <iostream>
+#include <list>
+#include <map>
+#include <set>
+#include <sstream>
+#include <string.h>
+#include <string>
+#include <utility>
+#include <vector>
+
+#endif
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 6a846e390..6e2f7047e 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -69,7 +69,7 @@ HEADERS += ../../config.h \
 	NetworkDialog.h \
 	NetworkDialogIPv6.h \
 	UserDialog.h \
-    	RuleSetDialog.h \
+	RuleSetDialog.h \
 	LibraryDialog.h \
 	CustomServiceDialog.h \
 	IPServiceDialog.h \