diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2b31239f..432bac45f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,31 @@ cmake_minimum_required(VERSION 2.6)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 
 # Local files
+
 set(BSA bsa/bsa_archive.cpp bsa/bsa_file.cpp)
+set(BSA_HEADER bsa/bsa_archive.hpp bsa/bsa_file.hpp)
+
 set(NIF nif/nif_file.cpp nifogre/ogre_nif_loader.cpp)
+set(NIF_HEADER nif/controlled.hpp nif/effect.hpp nif/nif_types.hpp  nif/record.hpp
+    nif/controller.hpp nif/extra.hpp nif/node.hpp nif/record_ptr.hpp
+    nif/data.hpp nif/nif_file.hpp nif/property.hpp)
+    
 set(TOOLS tools/stringops.cpp tools/fileops.cpp)
+set(TOOLS_HEADER tools/fileops.hpp tools/slice_array.hpp tools/stringops.hpp)
+
 set(MANGLE_VFS mangle/vfs/servers/ogre_vfs.cpp)
+
 set(OGRE ogre/renderer.cpp)
+set(OGRE_HEADER ogre/renderer.hpp)
+
 set(INPUT input/oismanager.cpp)
+set(INPUT_HEADER input/oismanager.hpp)
+
 set(GAME game/main.cpp game/esm_store/store.cpp game/cell_store.cpp)
+set(GAME_HEADER game/cell_store.hpp game/esm_store/reclists.hpp  game/esm_store/store.hpp)
+
 set(GAMEREND game/render/mwscene.cpp)
+set(GAMEREND_HEADER game/render/cell.hpp game/render/mwscene.hpp)
 
 # Platform specific
 if (WIN32)
@@ -50,5 +67,14 @@ configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.linux
 endif (WIN32)
 
 # Main executable
-add_executable(openmw ${BSA} ${TOOLS} ${OGRE} ${INPUT} ${GAME} ${GAMEREND})
+
+add_executable(openmw
+    ${BSA} ${BSA_HEADER}
+    ${TOOLS} ${TOOLS_HEADER}
+    ${OGRE} ${OGRE_HEADER}
+    ${INPUT} ${INPUT_HEADER}
+    ${GAME} ${GAME_HEADER}
+    ${GAMEREND} ${GAMEREND_HEADER})
+
 target_link_libraries(openmw ${OGRE_LIBRARIES} ${OIS_LIBRARIES})
+