diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt
index a6b58e6a5..21cd7e8b2 100755
--- a/src/GEOMBase/CMakeLists.txt
+++ b/src/GEOMBase/CMakeLists.txt
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 
 # additional include directories
diff --git a/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx
index 05dabb9fe..9425cb809 100644
--- a/src/GEOMGUI/GEOMGUI.cxx
+++ b/src/GEOMGUI/GEOMGUI.cxx
@@ -68,7 +68,7 @@ bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/ )
 
 //=================================================================================
 // class    : GEOMGUI::OnMousePress
-// purpose  : Mouse press event processing. Should return FALSE to let the event 
+// purpose  : Mouse press event processing. Should return false to let the event 
 //            be processed further.
 //=================================================================================
 bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
diff --git a/src/GEOMToolsGUI/CMakeLists.txt b/src/GEOMToolsGUI/CMakeLists.txt
index 96380bee2..47164d839 100755
--- a/src/GEOMToolsGUI/CMakeLists.txt
+++ b/src/GEOMToolsGUI/CMakeLists.txt
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 
 # additional include directories
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
index 1d8bc588b..0a8e4ffde 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
@@ -43,7 +43,7 @@
 // purpose  : Constructs a GEOMToolsGUI_DeflectionDlg which is a child of 'parent', with the
 //            name 'name' and widget flags set to 'f'.
 //            The dialog will by default be modeless, unless you set 'modal' to
-//            TRUE to construct a modal dialog.
+//            true to construct a modal dialog.
 //=================================================================================
 GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
index bfadece29..82985ae1a 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
@@ -44,7 +44,7 @@
 // purpose  : Constructs a GEOMToolsGUI_LineWidthDlg which is a child of 'parent', with the
 //            name 'name' and widget flags set to 'f'.
 //            The dialog will by default be modeless, unless you set 'modal' to
-//            TRUE to construct a modal dialog.
+//            true to construct a modal dialog.
 //=================================================================================
 
 GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QString& title)
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
index 724346eb8..4e7541f04 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
@@ -44,7 +44,7 @@
 // purpose  : Constructs a GEOMToolsGUI_NbIsosDlg which is a child of 'parent', with the 
 //            name 'name' and widget flags set to 'f'.
 //            The dialog will by default be modeless, unless you set 'modal' to
-//            TRUE to construct a modal dialog.
+//            true to construct a modal dialog.
 //=================================================================================
 GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   :QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint )
diff --git a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
index 8580ae6eb..4b0607795 100755
--- a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
+++ b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
@@ -18,12 +18,12 @@
 #
 
 INCLUDE(${SWIG_USE_FILE})
-INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
+  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
diff --git a/src/Material/CMakeLists.txt b/src/Material/CMakeLists.txt
index c7f0291ab..7511183a6 100755
--- a/src/Material/CMakeLists.txt
+++ b/src/Material/CMakeLists.txt
@@ -17,10 +17,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
+  ${QT_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
diff --git a/src/PrimitiveGUI/CMakeLists.txt b/src/PrimitiveGUI/CMakeLists.txt
index 876d2068f..38a9d318e 100755
--- a/src/PrimitiveGUI/CMakeLists.txt
+++ b/src/PrimitiveGUI/CMakeLists.txt
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 
 # additional include directories