diff --git a/Modules/Core/elxModuleCore.cmake b/Modules/Core/elxModuleCore.cmake
index 8e5e3e2dfbc60ffb02fc194444791290f73f169a..1ab5fb44636cee9b00c8d502a5a2150cff18df9c 100644
--- a/Modules/Core/elxModuleCore.cmake
+++ b/Modules/Core/elxModuleCore.cmake
@@ -8,6 +8,12 @@ set( ${MODULE}_INCLUDE_DIRS
   ${${MODULE}_SOURCE_DIR}/ComponentInterface/include
 )
 
+file(GLOB ${MODULE}_HEADER_FILES "${${MODULE}_SOURCE_DIR}/*/include/*.*")
+#@Kasper: file GLOB is generally disencouraged for source files (missing files are not detected and CMake doesn't know if the project has to be updated when due to a checkout extra source files are in the tree), but since this I think is not really an issue for header files...
+#I read: CMake will figure out that they're headers; it won't try to build them. http://stackoverflow.com/questions/8316104/specify-how-cmake-creates-visual-studio-project
+
+
+
 # Export libraries
 set( ${MODULE}_LIBRARIES 
   ${MODULE}
@@ -29,5 +35,5 @@ set( ${MODULE}_SOURCE_FILES
 
 # Compile library
 
-add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" )
+add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" ${${MODULE}_HEADER_FILES})
 target_link_libraries( ${MODULE} ${ELASTIX_LIBRARIES} )