diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index d4f0e42b..0dc49bd0 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -82,7 +82,8 @@ FOREACH(DIR IN LISTS DIRS_WITH_SRC)
 	set(SRC_DIR_TO_GLOB ${DIR})
 	FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp)
 	SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
-	
+        FILE(GLOB INCLUDE_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.h)
+	SET(MG_INCLUDE_FILES ${MG_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR})	
 	IF(APPLE)
 		FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.mm)
 		#MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}")
@@ -100,7 +101,9 @@ SET(TARGET_NAME "glest.bin")
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
 
-ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES})
+SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
+
+ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
 TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
 TARGET_LINK_LIBRARIES(${TARGET_NAME} glest_lib)
 TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index e3c126f5..25c7b80c 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -127,7 +127,7 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
 # [RCL] FIXME: make it compiler-agnostic
 SET(CMAKE_CXX_FLAGS "-O3 -fno-strict-aliasing -frounding-math  -fsignaling-nans -mfpmath=sse -msse")
 
-ADD_LIBRARY(glest_lib ${MG_SOURCE_FILES})
+ADD_LIBRARY(glest_lib ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
 TARGET_LINK_LIBRARIES(glest_lib streflop)
 TARGET_LINK_LIBRARIES(glest_lib ${EXTERNAL_LIBS})