diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake
index f27904c70..c7f8b462c 100644
--- a/cmake/Definitions.cmake
+++ b/cmake/Definitions.cmake
@@ -33,13 +33,6 @@ macro(configure_definitions)
     cmake_policy(SET CMP0005 NEW)
   endif()
 
-  # TODO: explain why we're adding headers to sources.
-  if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-    set(ADD_HEADERS_TO_SOURCES FALSE)
-  else()
-    set(ADD_HEADERS_TO_SOURCES TRUE)
-  endif()
-
   set(BIN_TEMP_DIR ${PROJECT_BINARY_DIR}/temp/bin)
 
 endmacro()
diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index ae5d064d2..8619298c3 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/src/lib/gui/CMakeLists.txt
@@ -28,14 +28,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   list(APPEND sources ${mac_sources})
 endif()
 
-if(ADD_HEADERS_TO_SOURCES)
-  list(APPEND sources ${headers})
-endif()
-
 # generated includes
 include_directories(${PROJECT_BINARY_DIR}/config)
 
-add_library(${target} STATIC ${sources})
+add_library(${target} STATIC ${sources} ${headers})
 
 target_link_libraries(
   ${target}
diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
index bc00b0344..8e3ca7cce 100644
--- a/src/test/integtests/CMakeLists.txt
+++ b/src/test/integtests/CMakeLists.txt
@@ -16,5 +16,5 @@
 
 config_test()
 set(target ${INTEG_TESTS_BIN})
-add_executable(${target} ${sources})
+add_executable(${target} ${sources} ${headers})
 target_link_libraries(${target} ${test_libs})
diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
index 5adc2eeae..8dce63700 100644
--- a/src/test/unittests/CMakeLists.txt
+++ b/src/test/unittests/CMakeLists.txt
@@ -16,5 +16,5 @@
 
 config_test()
 set(target ${UNIT_TESTS_BIN})
-add_executable(${target} ${sources})
+add_executable(${target} ${sources} ${headers})
 target_link_libraries(${target} ${test_libs})