diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 984a9008e2b0cf4b371049775575eb85be6e1a2a..553fca64643abedae92b743207ef643c32f9c116 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -24,4 +24,5 @@ set(SRC
   MallocUtils.cpp
 )
 
-append_gmsh_src(Common "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Common *.h) 
+append_gmsh_src(Common "${SRC};${HDR}")
diff --git a/Fltk/CMakeLists.txt b/Fltk/CMakeLists.txt
index aa7db415a90dfe36a7857207c509544000307aee..8655797dd3164dfb0521f26bd6fefd73dc3ed2ce 100644
--- a/Fltk/CMakeLists.txt
+++ b/Fltk/CMakeLists.txt
@@ -27,4 +27,5 @@ set(SRC
     partitionDialog.cpp
 )
 
-append_gmsh_src(Fltk "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Fltk *.h) 
+append_gmsh_src(Fltk "${SRC};${HDR}")
diff --git a/Geo/CMakeLists.txt b/Geo/CMakeLists.txt
index c598141b3e1cc8476c223168811826835a852f1a..89e0c22ee78eb24687ec7723fc55c3ab0e93b3f0 100644
--- a/Geo/CMakeLists.txt
+++ b/Geo/CMakeLists.txt
@@ -34,4 +34,5 @@ set(SRC
   CellComplex.cpp ChainComplex.cpp Homology.cpp
 )
 
-append_gmsh_src(Geo "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Geo *.h) 
+append_gmsh_src(Geo "${SRC};${HDR}")
diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt
index 154a7c8a1c894473ed31d74754515523b84b31d8..6f35f444b828674b59441c5146ce7a9eb105154e 100644
--- a/Graphics/CMakeLists.txt
+++ b/Graphics/CMakeLists.txt
@@ -22,4 +22,5 @@ set(SRC
   gl2yuv.cpp
 )
 
-append_gmsh_src(Graphics "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Graphics *.h) 
+append_gmsh_src(Graphics "${SRC};${HDR}")
diff --git a/Mesh/CMakeLists.txt b/Mesh/CMakeLists.txt
index c66dd893813d24e931c0aeb06990843b1e1f115c..83ec22a23e48b3771595ac6da7373bb78377088d 100644
--- a/Mesh/CMakeLists.txt
+++ b/Mesh/CMakeLists.txt
@@ -32,5 +32,5 @@ set(SRC
     meshRefine.cpp
 )
 
-append_gmsh_src(Mesh "${SRC}")
-
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Mesh *.h) 
+append_gmsh_src(Mesh "${SRC};${HDR}")
diff --git a/Numeric/CMakeLists.txt b/Numeric/CMakeLists.txt
index 86deeda39e224be0af7bd9baa20d0914f5a394a0..0df0824974dfc8eb99b6f9ee6442818db6c87d90 100644
--- a/Numeric/CMakeLists.txt
+++ b/Numeric/CMakeLists.txt
@@ -27,4 +27,5 @@ set(SRC
     gmshLinearSystemCSR.cpp
 )
 
-append_gmsh_src(Numeric "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Numeric *.h) 
+append_gmsh_src(Numeric "${SRC};${HDR}")
diff --git a/Parser/CMakeLists.txt b/Parser/CMakeLists.txt
index 2ea7c818a8a863f4ff04224eece990696ea0447a..2e5eb53a6e4d668db088577a7cfbaba0a9ed55c6 100644
--- a/Parser/CMakeLists.txt
+++ b/Parser/CMakeLists.txt
@@ -9,4 +9,5 @@ set(SRC
   FunctionManager.cpp
 )
 
-append_gmsh_src(Parser "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Parser *.h) 
+append_gmsh_src(Parser "${SRC};${HDR}")
diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt
index ab346609cf298b2d28c22d0c3ef2e8a715b86553..fd108fba2e1c42bd5c4443e38afd59ba259438d3 100644
--- a/Plugin/CMakeLists.txt
+++ b/Plugin/CMakeLists.txt
@@ -27,4 +27,5 @@ set(SRC
   HomologyComputation.cpp
 )
 
-append_gmsh_src(Plugin "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Plugin *.h) 
+append_gmsh_src(Plugin "${SRC};${HDR}")
diff --git a/Post/CMakeLists.txt b/Post/CMakeLists.txt
index c61bd9c6dcfaae3ebd88db976f53e06d2206e203..dd9254bf0b2fb195ce4a5dd3a5a25ec33551c786 100644
--- a/Post/CMakeLists.txt
+++ b/Post/CMakeLists.txt
@@ -14,4 +14,5 @@ set(SRC
   ColorTable.cpp
 )
 
-append_gmsh_src(Post "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Post *.h) 
+append_gmsh_src(Post "${SRC};${HDR}")
diff --git a/Qt/CMakeLists.txt b/Qt/CMakeLists.txt
index 7a7323c327bb8a8bd97ad326d7d7a80a46d0e93f..b256dd91452c88cc9eef909503cec5d8617422c7 100644
--- a/Qt/CMakeLists.txt
+++ b/Qt/CMakeLists.txt
@@ -14,7 +14,8 @@ set(MOC_HDR
   graphicWindow.h
 )
 
-append_gmsh_src(Qt "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Qt *.h) 
+append_gmsh_src(Qt "${SRC};${HDR}")
 
 foreach(FILE ${MOC_HDR})
   list(APPEND MOC_LIST Qt/${FILE})
diff --git a/Solver/CMakeLists.txt b/Solver/CMakeLists.txt
index 5fc96966ae863ee3fb5c12c9957d2ca62ff7f06a..a115f56ef491d2d411204de5fd3cb4f963ad0867 100644
--- a/Solver/CMakeLists.txt
+++ b/Solver/CMakeLists.txt
@@ -10,4 +10,5 @@ set(SRC
   elasticitySolver.cpp
 )
 
-append_gmsh_src(Solver "${SRC}")
+file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Solver *.h) 
+append_gmsh_src(Solver "${SRC};${HDR}")