diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt
index 1faf4caa..79dfb15c 100644
--- a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt
+++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt
@@ -1,48 +1,50 @@
-include (ACGCommon)
-
-include_directories (
-  ../../../..
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-set (targetName DecimaterGui)
-
-# source code directories
-set (directories 
-  ../../QtViewer
-  ../
-)
-
-# collect all header and source files
-acg_append_files (headers "*.hh" ${directories})
-
-set (sources
-  ../../QtViewer/QGLViewerWidget.cc
-  ../../QtViewer/MeshViewerWidgetT.cc
-  ../DecimaterViewerWidget.cc
-  ../decimaterviewer.cc
-)
-
-# remove template cc files from source file list
-acg_drop_templates (sources)
-
-# genereate uic and moc targets
-acg_qt4_automoc (moc_targets ${headers})
-
-if (WIN32)
-  acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
-  # link to qtmain library to get WinMain function for a non terminal app
-  target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
-else ()
-  acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
-endif ()
-
-target_link_libraries (${targetName}
-  OpenMeshCore
-  OpenMeshTools
-  ${QT_LIBRARIES}
-  ${OPENGL_LIBRARIES}
-  ${GLEW_LIBRARY}
-  ${GLUT_LIBRARIES}
-)
-
+include (ACGCommon)
+
+include_directories (
+  ../../../..
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${GLEW_INCLUDE_DIR}
+  ${GLUT_INCLUDE_DIR}
+)
+
+set (targetName DecimaterGui)
+
+# source code directories
+set (directories 
+  ../../QtViewer
+  ../
+)
+
+# collect all header and source files
+acg_append_files (headers "*.hh" ${directories})
+
+set (sources
+  ../../QtViewer/QGLViewerWidget.cc
+  ../../QtViewer/MeshViewerWidgetT.cc
+  ../DecimaterViewerWidget.cc
+  ../decimaterviewer.cc
+)
+
+# remove template cc files from source file list
+acg_drop_templates (sources)
+
+# genereate uic and moc targets
+acg_qt4_automoc (moc_targets ${headers})
+
+if (WIN32)
+  acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
+  # link to qtmain library to get WinMain function for a non terminal app
+  target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
+else ()
+  acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
+endif ()
+
+target_link_libraries (${targetName}
+  OpenMeshCore
+  OpenMeshTools
+  ${QT_LIBRARIES}
+  ${OPENGL_LIBRARIES}
+  ${GLEW_LIBRARY}
+  ${GLUT_LIBRARIES}
+)
+
diff --git a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt
index e148c419..f49b50f6 100644
--- a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt
+++ b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt
@@ -1,44 +1,46 @@
-include (ACGCommon)
-
-include_directories (
-  ../../..
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-set (targetName QtViewer)
-
-# source code directories
-set (directories 
-  .
-)
-
-# collect all header and source files
-acg_append_files (headers "*.hh" ${directories})
-acg_append_files (sources "*.cc" ${directories})
-acg_append_files (ui "*.ui" ${directories})
-
-# remove template cc files from source file list
-acg_drop_templates (sources)
-
-# genereate uic and moc targets
-acg_qt4_autouic (uic_targets ${ui})
-acg_qt4_automoc (moc_targets ${headers})
-
-
-if (WIN32)
-  acg_add_executable (${targetName} WIN32 ${uic_targets} ${sources} ${headers} ${moc_targets})
-  # link to qtmain library to get WinMain function for a non terminal app
-  target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
-else ()
-  acg_add_executable (${targetName} ${uic_targets} ${sources} ${headers} ${moc_targets})
-endif ()
-
-target_link_libraries (${targetName}
-  OpenMeshCore
-  OpenMeshTools
-  ${QT_LIBRARIES}
-  ${OPENGL_LIBRARIES}
-  ${GLEW_LIBRARY}
-  ${GLUT_LIBRARIES}
-)
-
+include (ACGCommon)
+
+include_directories (
+  ../../..
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${GLEW_INCLUDE_DIR}
+  ${GLUT_INCLUDE_DIR}
+)
+
+set (targetName QtViewer)
+
+# source code directories
+set (directories 
+  .
+)
+
+# collect all header and source files
+acg_append_files (headers "*.hh" ${directories})
+acg_append_files (sources "*.cc" ${directories})
+acg_append_files (ui "*.ui" ${directories})
+
+# remove template cc files from source file list
+acg_drop_templates (sources)
+
+# genereate uic and moc targets
+acg_qt4_autouic (uic_targets ${ui})
+acg_qt4_automoc (moc_targets ${headers})
+
+
+if (WIN32)
+  acg_add_executable (${targetName} WIN32 ${uic_targets} ${sources} ${headers} ${moc_targets})
+  # link to qtmain library to get WinMain function for a non terminal app
+  target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
+else ()
+  acg_add_executable (${targetName} ${uic_targets} ${sources} ${headers} ${moc_targets})
+endif ()
+
+target_link_libraries (${targetName}
+  OpenMeshCore
+  OpenMeshTools
+  ${QT_LIBRARIES}
+  ${OPENGL_LIBRARIES}
+  ${GLEW_LIBRARY}
+  ${GLUT_LIBRARIES}
+)
+
diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt
index 296e4421..a9df3696 100644
--- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt
+++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt
@@ -1,48 +1,50 @@
-include (ACGCommon)
-
-include_directories (
-  ../../../..
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-set (targetName SubdividerGui)
-
-# source code directories
-set (directories 
-  ../../QtViewer
-  ../
-)
-
-# collect all header and source files
-acg_append_files (headers "*.hh" ${directories})
-
-set (sources
-  ../../QtViewer/QGLViewerWidget.cc
-  ../../QtViewer/MeshViewerWidgetT.cc
-  ../SubdivideWidget.cc
-  ../qtsubdivider.cc
-)
-
-# remove template cc files from source file list
-acg_drop_templates (sources)
-
-# genereate uic and moc targets
-acg_qt4_automoc (moc_targets ${headers})
-
-if (WIN32)
-  acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
-  # link to qtmain library to get WinMain function for a non terminal app
-  target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
-else ()
-  acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
-endif ()
-
-target_link_libraries (${targetName}
-  OpenMeshCore
-  OpenMeshTools
-  ${QT_LIBRARIES}
-  ${OPENGL_LIBRARIES}
-  ${GLEW_LIBRARY}
-  ${GLUT_LIBRARIES}
-)
-
+include (ACGCommon)
+
+include_directories (
+  ../../../..
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${GLEW_INCLUDE_DIR}
+  ${GLUT_INCLUDE_DIR}
+)
+
+set (targetName SubdividerGui)
+
+# source code directories
+set (directories 
+  ../../QtViewer
+  ../
+)
+
+# collect all header and source files
+acg_append_files (headers "*.hh" ${directories})
+
+set (sources
+  ../../QtViewer/QGLViewerWidget.cc
+  ../../QtViewer/MeshViewerWidgetT.cc
+  ../SubdivideWidget.cc
+  ../qtsubdivider.cc
+)
+
+# remove template cc files from source file list
+acg_drop_templates (sources)
+
+# genereate uic and moc targets
+acg_qt4_automoc (moc_targets ${headers})
+
+if (WIN32)
+  acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
+  # link to qtmain library to get WinMain function for a non terminal app
+  target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
+else ()
+  acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
+endif ()
+
+target_link_libraries (${targetName}
+  OpenMeshCore
+  OpenMeshTools
+  ${QT_LIBRARIES}
+  ${OPENGL_LIBRARIES}
+  ${GLEW_LIBRARY}
+  ${GLUT_LIBRARIES}
+)
+