diff --git a/qmake.inc b/qmake.inc
index 9e55e534c..f1ec9b12f 100644
--- a/qmake.inc
+++ b/qmake.inc
@@ -9,7 +9,6 @@ TEMPLATE      = app
 SO_VERSION    = @LIBFWBUILDER_SOLIB_VERSION@
 
 DEFINES      += $$(DEFINES)
-INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
 LANGUAGE      = C++
 UI_DIR        = ui
 MANDIR        = /home/vadim/src/fwb3-branch-v3/install_root/share/man/
@@ -35,6 +34,8 @@ unix {
 	exec_prefix             = @EXEC_PREFIX@
 	DESTDIR                 =
 
+	INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
+
     LIBS_FWCOMPILER         = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
     LIBS_FWBUILDER          = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
 
diff --git a/qmake.inc.in b/qmake.inc.in
index 4a89f2caa..4e7d76aac 100644
--- a/qmake.inc.in
+++ b/qmake.inc.in
@@ -9,7 +9,6 @@ TEMPLATE      = app
 SO_VERSION    = @LIBFWBUILDER_SOLIB_VERSION@
 
 DEFINES      += $$(DEFINES)
-INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) @LIBFWBUILDER_INCLUDEPATH@
 LANGUAGE      = C++
 UI_DIR        = ui
 MANDIR        = @MANDIR@
@@ -35,6 +34,8 @@ unix {
 	exec_prefix             = @EXEC_PREFIX@
 	DESTDIR                 =
 
+    INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) @LIBFWBUILDER_INCLUDEPATH@
+
     LIBS_FWCOMPILER         = @LIBFWBUILDER_LIBS_FWCOMPILER@
     LIBS_FWBUILDER          = @LIBFWBUILDER_LIBS_FWBUILDER@
 
@@ -71,7 +72,7 @@ unix {
 }
 
 exists(qmake2.inc) {
-  include( qmake2.inc)
+  include(qmake2.inc)
 }
 
 INSTALLS += target
diff --git a/src/gui/ConfirmDeleteObjectDialog.h b/src/gui/ConfirmDeleteObjectDialog.h
index edef80fab..2b2d60897 100644
--- a/src/gui/ConfirmDeleteObjectDialog.h
+++ b/src/gui/ConfirmDeleteObjectDialog.h
@@ -29,7 +29,8 @@
 
 #include "config.h"
 #include <ui_confirmdeleteobjectdialog_q.h>
-#include <FindWhereUsedWidget.h>
+
+#include "FindWhereUsedWidget.h"
 
 #include  <vector>
 #include  <map>
diff --git a/src/gui/FWObjectDrag.cpp b/src/gui/FWObjectDrag.cpp
index e273ab21e..1d6736159 100644
--- a/src/gui/FWObjectDrag.cpp
+++ b/src/gui/FWObjectDrag.cpp
@@ -26,7 +26,7 @@
 #include "../../config.h"
 #include "global.h"
 
-#include <FWObjectDrag.h>
+#include "FWObjectDrag.h"
 
 #include <fwbuilder/FWObject.h>
 //Added by qt3to4:
diff --git a/src/gui/ObjConflictResolutionDialog.h b/src/gui/ObjConflictResolutionDialog.h
index 0e00218ec..4f5e82945 100644
--- a/src/gui/ObjConflictResolutionDialog.h
+++ b/src/gui/ObjConflictResolutionDialog.h
@@ -102,7 +102,7 @@ class CompareObjectsDialog :
     std::list<QString> report;
     QStringList        report_attributes;
     int                num_conflicts;
-    int                column_width[];
+    int                column_width[4];
     
     void writeColumn(std::ostringstream &sstr,
                      int column_num,
diff --git a/src/gui/RCS.cpp b/src/gui/RCS.cpp
index 28e78c20c..e1587634c 100644
--- a/src/gui/RCS.cpp
+++ b/src/gui/RCS.cpp
@@ -27,13 +27,14 @@
 #include "global.h"
 #include "utils.h"
 
+#include "RCS.h"
+
 // need this for FS_SEPARATOR
 #include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/Tools.h"
 
 //#include "FWWindow.h"
 
-#include <RCS.h>
 #include <qdir.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
diff --git a/src/gui/RCSFilePreview.cpp b/src/gui/RCSFilePreview.cpp
index 185b70dc6..acb38d953 100644
--- a/src/gui/RCSFilePreview.cpp
+++ b/src/gui/RCSFilePreview.cpp
@@ -26,8 +26,8 @@
 #include "../../config.h"
 #include "global.h"
 
-#include <RCS.h>
-#include <RCSFilePreview.h>
+#include "RCS.h"
+#include "RCSFilePreview.h"
 
 #include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/FWException.h"
diff --git a/src/gui/fwbuilder_ph.h b/src/gui/fwbuilder_ph.h
index a8a6612df..912d13337 100755
--- a/src/gui/fwbuilder_ph.h
+++ b/src/gui/fwbuilder_ph.h
@@ -1,5 +1,6 @@
 
-#if defined(Q_OS_WIN32)
+#if 0
+#if defined(_WIN32)
 #  include <stdio.h>
 #  include <sys/timeb.h>
 #  include <windows.h>
@@ -9,6 +10,7 @@
 #  include <unistd.h>
 #  include <pwd.h>
 #endif
+#endif
 
 #include <errno.h>
 #include <fcntl.h>
@@ -25,6 +27,8 @@
 #include "global.h"
 #include "utils.h"
 
+#include "fwbuilder/libfwbuilder-config.h"
+
 #include "fwbuilder/Address.h"
 #include "fwbuilder/AddressRange.h"
 #include "fwbuilder/AddressTable.h"
@@ -67,7 +71,6 @@
 #include "fwbuilder/Tools.h"
 #include "fwbuilder/UDPService.h"
 #include "fwbuilder/XMLTools.h"
-#include "fwbuilder/libfwbuilder-config.h"
 #include "fwbuilder/physAddress.h"
 
 // QT
diff --git a/src/gui/instBatchOptionsDialog.h b/src/gui/instBatchOptionsDialog.h
index 67f5aac7b..9ac203d1d 100644
--- a/src/gui/instBatchOptionsDialog.h
+++ b/src/gui/instBatchOptionsDialog.h
@@ -28,7 +28,8 @@
 #define __INSTBATCHOPTIONSDIALOG_H_
 
 #include "config.h"
-#include <instOptionsDialog.h>
+
+#include "instOptionsDialog.h"
 
 class instConf;