diff --git a/cpu/ppc/CMakeLists.txt b/cpu/ppc/CMakeLists.txt
index ce7b3c4..6cb6a17 100644
--- a/cpu/ppc/CMakeLists.txt
+++ b/cpu/ppc/CMakeLists.txt
@@ -1,6 +1,8 @@
 include_directories("${PROJECT_SOURCE_DIR}"
                     "${PROJECT_SOURCE_DIR}/thirdparty/loguru/")
 
-file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+                  "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
+    )
 
 add_library(cpu_ppc OBJECT ${SOURCES})
diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
index 4cb4fd2..d3e0126 100644
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
@@ -20,6 +20,22 @@ platform_glob(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
                       "${CMAKE_CURRENT_SOURCE_DIR}/sound/*.cpp"
                       "${CMAKE_CURRENT_SOURCE_DIR}/storage/*.cpp"
                       "${CMAKE_CURRENT_SOURCE_DIR}/video/*.cpp"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/adb/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/firewire/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/i2c/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/ata/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/pci/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/scsi/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/common/usb/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/ethernet/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/floppy/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/ioctrl/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/memctrl/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/serial/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/sound/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/storage/*.h"
+                      "${CMAKE_CURRENT_SOURCE_DIR}/video/*.h"
     )
 
 add_library(devices OBJECT ${SOURCES})
diff --git a/machines/CMakeLists.txt b/machines/CMakeLists.txt
index 92a4ac7..9bd5c5c 100644
--- a/machines/CMakeLists.txt
+++ b/machines/CMakeLists.txt
@@ -4,7 +4,9 @@ include_directories("${PROJECT_SOURCE_DIR}"
                     "${PROJECT_SOURCE_DIR}/devices"
                     "${PROJECT_SOURCE_DIR}/thirdparty/loguru/")
 
-file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+                  "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
+    )
 
 add_library(machines OBJECT ${SOURCES})
 target_link_libraries(machines PRIVATE)