diff --git a/Tests/Functional/Core/CoreSpecial/CMakeLists.txt b/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
index caee8a2465fd03489ee53817d49aea7df23077fb..986a6cd686155024d37a82d222872ac3a40c4969 100644
--- a/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
+++ b/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
@@ -12,8 +12,8 @@ set(test_cases
 
 # build executables for each test case
 file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
-add_executable(${test} ${include_files} ${source_files})
+
+add_executable(${test} ${source_files})
 target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
 
 # create test cases
diff --git a/Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt b/Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt
index 2dd14f3e88dcf3a609ff190cf0733617a51d9f13..5f7ca44e1a762934b7da20fa041945bed8febc00 100644
--- a/Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt
+++ b/Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt
@@ -14,9 +14,8 @@ set(test_cases
     )
 
 file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
 
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
 foreach(test_case ${test_cases})
     add_test(${test}/${test_case}
diff --git a/Tests/Functional/Fit/FitObjective/CMakeLists.txt b/Tests/Functional/Fit/FitObjective/CMakeLists.txt
index 923e4e6045f61f964e843ba91092fe1384a860aa..b109eea4a5f10d8fe648cb41c013069589279b8b 100644
--- a/Tests/Functional/Fit/FitObjective/CMakeLists.txt
+++ b/Tests/Functional/Fit/FitObjective/CMakeLists.txt
@@ -21,9 +21,8 @@ set(test_cases
 include_directories(${RootMinimizers_INCLUDE_DIRS})
 
 file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
 
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
 
 foreach(test_case ${test_cases})
diff --git a/Tests/Functional/Fit/Minimizer/CMakeLists.txt b/Tests/Functional/Fit/Minimizer/CMakeLists.txt
index 0d5396ca6591422801c406b10b87bd9f1eebf0fa..c74291e5b18739c135621b4759a5c8a2976a5b9a 100644
--- a/Tests/Functional/Fit/Minimizer/CMakeLists.txt
+++ b/Tests/Functional/Fit/Minimizer/CMakeLists.txt
@@ -25,9 +25,8 @@ set(test_cases
 include_directories(${RootMinimizers_INCLUDE_DIRS})
 
 file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
 
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
 
 foreach(test_case ${test_cases})
diff --git a/Tests/Functional/GUI/GUISpecial/CMakeLists.txt b/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
index 64ad6691539c5578d50a924673fde805f7570b70..79be50f65923e5b2e8b7ff87b42c37a6ad0aa5c5 100644
--- a/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
+++ b/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
@@ -25,11 +25,10 @@ set(test_cases
 )
 
 file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
 
 find_package(Qt5Core REQUIRED)
 
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} BornAgainCore BornAgainGUI BornAgainTestMachinery)
 target_link_libraries(${test} Qt5::Core)
 
diff --git a/Tests/Functional/Python/PyEmbedded/CMakeLists.txt b/Tests/Functional/Python/PyEmbedded/CMakeLists.txt
index ceda8dbbe79fdd0b5a13d19f6f30e8db49fe27ff..f396f183e0b6fc40a7013ebedeb8ac61c8bc0bbe 100644
--- a/Tests/Functional/Python/PyEmbedded/CMakeLists.txt
+++ b/Tests/Functional/Python/PyEmbedded/CMakeLists.txt
@@ -19,12 +19,10 @@ include_directories(
 )
 
 file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
 
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
 
 foreach(test_case ${test_cases})
     add_test(${test}/${test_case} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test} ${test_case})
 endforeach()
-
diff --git a/Tests/Functional/TestMachinery/CMakeLists.txt b/Tests/Functional/TestMachinery/CMakeLists.txt
index 02744f40ed04fea426197fe64664e6ecad58cad1..8b4284adaf21b9cef06671c0f3a133f83734c288 100644
--- a/Tests/Functional/TestMachinery/CMakeLists.txt
+++ b/Tests/Functional/TestMachinery/CMakeLists.txt
@@ -5,18 +5,13 @@
 set(library_name BornAgainTestMachinery)
 
 file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
 
 if(WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL")
 endif()
 
 # --- making library ---------
-add_library(
-    ${library_name}
-    SHARED
-    ${source_files} ${include_files}
-    )
+add_library(${library_name} SHARED ${source_files})
 
 set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
 set(${library_name}_LIBRARY_TYPE SHARED)
diff --git a/Tests/UnitTests/Core/CMakeLists.txt b/Tests/UnitTests/Core/CMakeLists.txt
index d698befdded4d3a9c7021d0bf84c0885a87e0b41..120219c1dba7768119503cb2bb41866accf36264 100644
--- a/Tests/UnitTests/Core/CMakeLists.txt
+++ b/Tests/UnitTests/Core/CMakeLists.txt
@@ -5,9 +5,8 @@ set(test UnitTestCore)
 include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
 
 file(GLOB source_files "*/*.cpp" "../utilities/TestAll.cpp")
-file(GLOB include_files "*/*.h")
 
-add_executable(${test} ${source_files} ${include_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
 
 gtest_discover_tests(${test} TEST_PREFIX Core:Unit:)
diff --git a/Tests/UnitTests/Fit/CMakeLists.txt b/Tests/UnitTests/Fit/CMakeLists.txt
index c73c57d5d0768d45df50e6e2ffbbe0c099c1a3f7..58defbd1cf9b3c0bae9c988d19edd9a38f67e7b1 100644
--- a/Tests/UnitTests/Fit/CMakeLists.txt
+++ b/Tests/UnitTests/Fit/CMakeLists.txt
@@ -5,9 +5,8 @@ set(test UnitTestFit)
 include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
 
 file(GLOB source_files "*.cpp" "../utilities/TestAll.cpp")
-file(GLOB include_files "*.h")
 
-add_executable(${test} ${source_files} ${include_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} ${BornAgainFit_LIBRARY} gtest)
 
 gtest_discover_tests(${test} TEST_PREFIX Fit:Unit:)
diff --git a/Tests/UnitTests/GUI/CMakeLists.txt b/Tests/UnitTests/GUI/CMakeLists.txt
index d4d10ca47653356c5f89051946e101c811cc4ff4..59bd0c6e85dfc3bdd333b488056b24f41e88165a 100644
--- a/Tests/UnitTests/GUI/CMakeLists.txt
+++ b/Tests/UnitTests/GUI/CMakeLists.txt
@@ -3,7 +3,6 @@ include(GoogleTest)
 set(test UnitTestGUI)
 
 file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
 
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Test REQUIRED)
@@ -11,7 +10,7 @@ find_package(Qt5Test REQUIRED)
 include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
 
 set(CMAKE_AUTOMOC ON)
-add_executable(${test} ${source_files} ${include_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} ${BornAgainGUI_LIBRARY} gtest)
 target_link_libraries(${test} Qt5::Core Qt5::Test)
 
diff --git a/Tests/UnitTests/Numeric/CMakeLists.txt b/Tests/UnitTests/Numeric/CMakeLists.txt
index e7e7fb8103dbfaa481dd4ef533d854a06ee47c9d..6d8a18ef38feebcb39bc4e8981b3b9c76092f01f 100644
--- a/Tests/UnitTests/Numeric/CMakeLists.txt
+++ b/Tests/UnitTests/Numeric/CMakeLists.txt
@@ -9,9 +9,8 @@ endif()
 include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
 
 file(GLOB source_files "*.cpp" "../utilities/TestAll.cpp")
-file(GLOB include_files "*.h")
 
-add_executable(${test} ${source_files} ${include_files})
+add_executable(${test} ${source_files})
 target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     target_compile_options(${test} PUBLIC "-Wno-deprecated-copy")