diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index c5d1aa0be..4ad06f7a6 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -25,6 +25,7 @@ find_package(Qt5WebKitWidgets REQUIRED)
 qt5_wrap_ui(ui_Main.h Main.ui)
 
 # Set name of binary and add_executable()
+file(GLOB HEADERS "*.h")
 if (APPLE)
 	set(EXECUTEABLE AlethZero)
 	set(BIN_INSTALL_DIR ".")
@@ -41,14 +42,14 @@ if (APPLE)
 	set(MACOSX_BUNDLE_ICON_FILE alethzero)
 	include(BundleUtilities)
 
-	add_executable(${EXECUTEABLE} MACOSX_BUNDLE alethzero.icns Main.ui ${SRC_LIST})
+	add_executable(${EXECUTEABLE} MACOSX_BUNDLE alethzero.icns Main.ui ${SRC_LIST} ${HEADERS})
 	set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
 	SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
 	SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
 else ()
 	set(EXECUTEABLE alethzero)
-	add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST})
+	add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST} ${HEADERS})
 endif ()
 
 qt5_use_modules(${EXECUTEABLE} Core)# Gui Widgets Network WebKit WebKitWidgets)
diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt
index eee1d258b..087c5314a 100644
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@@ -8,7 +8,8 @@ link_directories(../libwebthree)
 
 set(EXECUTABLE eth)
 
-add_executable(${EXECUTABLE} ${SRC_LIST})
+file(GLOB HEADERS "*.h")
+add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} secp256k1)
diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt
index 3f3ecb619..81e210cad 100644
--- a/libdevcore/CMakeLists.txt
+++ b/libdevcore/CMakeLists.txt
@@ -10,13 +10,12 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE devcore)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
-file(GLOB HEADERS "*.h") 
 
 include_directories(..)
 
diff --git a/libdevcrypto/CMakeLists.txt b/libdevcrypto/CMakeLists.txt
index e7f112f95..cee7d130d 100644
--- a/libdevcrypto/CMakeLists.txt
+++ b/libdevcrypto/CMakeLists.txt
@@ -4,15 +4,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE devcrypto)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} devcore)
diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt
index 6aba644f1..f5cf00b57 100644
--- a/libethcore/CMakeLists.txt
+++ b/libethcore/CMakeLists.txt
@@ -4,15 +4,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE ethcore)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} devcrypto)
diff --git a/libethereum/CMakeLists.txt b/libethereum/CMakeLists.txt
index 128dd5999..cb2049886 100644
--- a/libethereum/CMakeLists.txt
+++ b/libethereum/CMakeLists.txt
@@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE ethereum)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} evm)
diff --git a/libevm/CMakeLists.txt b/libevm/CMakeLists.txt
index f19119f83..0c31a9fc3 100644
--- a/libevm/CMakeLists.txt
+++ b/libevm/CMakeLists.txt
@@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE evm)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} ethcore)
diff --git a/libevmface/CMakeLists.txt b/libevmface/CMakeLists.txt
index 212ce825d..874b9e397 100644
--- a/libevmface/CMakeLists.txt
+++ b/libevmface/CMakeLists.txt
@@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE evmface)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} devcore)
diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
index 7746613ec..cb50cc36e 100644
--- a/liblll/CMakeLists.txt
+++ b/liblll/CMakeLists.txt
@@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE lll)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} evmface)
diff --git a/libp2p/CMakeLists.txt b/libp2p/CMakeLists.txt
index c3cdc70b9..9e20fd99f 100644
--- a/libp2p/CMakeLists.txt
+++ b/libp2p/CMakeLists.txt
@@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE p2p)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} devcrypto)
diff --git a/libqethereum/CMakeLists.txt b/libqethereum/CMakeLists.txt
index 68ee1bb9d..4fb7d1a21 100644
--- a/libqethereum/CMakeLists.txt
+++ b/libqethereum/CMakeLists.txt
@@ -51,10 +51,11 @@ if (APPLE)
 	include(BundleUtilities)
 endif ()
 
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${RESOURCE_ADDED} ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS})
 endif()
 
 include_directories(/)
diff --git a/libserpent/CMakeLists.txt b/libserpent/CMakeLists.txt
index 0d66393b2..0090b5dc3 100644
--- a/libserpent/CMakeLists.txt
+++ b/libserpent/CMakeLists.txt
@@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE serpent)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} lll)
diff --git a/libwebthree/CMakeLists.txt b/libwebthree/CMakeLists.txt
index d3332d8b0..cc1b290f5 100644
--- a/libwebthree/CMakeLists.txt
+++ b/libwebthree/CMakeLists.txt
@@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE webthree)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} ethereum)
diff --git a/libwhisper/CMakeLists.txt b/libwhisper/CMakeLists.txt
index 49857d16a..364d9759a 100644
--- a/libwhisper/CMakeLists.txt
+++ b/libwhisper/CMakeLists.txt
@@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE whisper)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
+file(GLOB HEADERS "*.h")
 if(ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} ethcore)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6936addb3..2e5366079 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,7 +6,8 @@ include_directories(..)
 link_directories(../libethcore)
 link_directories(../libethereum)
 
-add_executable(testeth ${SRC_LIST})
+file(GLOB HEADERS "*.h")
+add_executable(testeth ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(testeth ethereum)
 target_link_libraries(testeth ethcore)
diff --git a/third/CMakeLists.txt b/third/CMakeLists.txt
index 77b2bb496..9221ad045 100644
--- a/third/CMakeLists.txt
+++ b/third/CMakeLists.txt
@@ -25,6 +25,7 @@ find_package(Qt5WebKitWidgets REQUIRED)
 qt5_wrap_ui(ui_Main.h Main.ui)
 
 # Set name of binary and add_executable()
+file(GLOB HEADERS "*.h")
 if (APPLE)
 	set(EXECUTEABLE Third)
 	set(BIN_INSTALL_DIR ".")
@@ -41,14 +42,14 @@ if (APPLE)
 	set(MACOSX_BUNDLE_ICON_FILE third)
 	include(BundleUtilities)
 
-	add_executable(${EXECUTEABLE} MACOSX_BUNDLE third.icns Main.ui ${SRC_LIST})
+	add_executable(${EXECUTEABLE} MACOSX_BUNDLE third.icns Main.ui ${SRC_LIST} ${HEADERS})
 	set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
 	SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
 	SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
 else ()
 	set(EXECUTEABLE third)
-	add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST})
+	add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST} ${HEADERS})
 endif ()
 
 qt5_use_modules(${EXECUTEABLE} Core)# Gui Widgets Network WebKit WebKitWidgets)