diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 22f36e7b..683bcc98 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(FindPkgConfig)
 
-add_library(appleii SHARED
+set(SOURCE_FILES
   Speaker.cpp
   SoundCore.cpp
   AY8910.cpp
@@ -73,6 +73,90 @@ add_library(appleii SHARED
   Z80VICE/daa.cpp
   )
 
+set(HEADER_FILES
+  Speaker.h
+  SoundCore.h
+  AY8910.h
+  Mockingboard.h
+  Pravets.h
+  Tape.h
+  YamlHelper.h
+  Log.h
+  Disk.h
+  DiskFormatTrack.h
+  DiskImage.h
+  DiskImageHelper.h
+  Harddisk.h
+  Memory.h
+  CPU.h
+  6821.h
+  NoSlotClock.h
+  SAM.h
+  z80emu.h
+  ParallelPrinter.h
+  MouseInterface.h
+  LanguageCard.h
+  RGBMonitor.h
+  NTSC.h
+  NTSC_CharSet.h
+  CardManager.h
+  Disk2CardManager.h
+  Riff.h
+  SaveState.h
+  SynchronousEventManager.h
+  Video.h
+  Core.h
+  Utilities.h
+  FrameBase.h
+
+  Common.h
+  DiskDefs.h
+  DiskLog.h
+  Interface.h
+  SaveState_Structs_common.h
+  SaveState_Structs_v1.h
+
+  Configuration/PropertySheetHelper.h
+
+  linux/windows/handles.h
+  linux/windows/files.h
+  linux/windows/resources.h
+  linux/windows/bitmap.h
+  linux/windows/time.h
+  linux/windows/stringcb.h
+  linux/windows/strings.h
+  linux/windows/misc.h
+  linux/windows/winbase.h
+  linux/windows/winuser.h
+  linux/windows/dsound.h
+  linux/windows/guiddef.h
+  linux/windows/dmusicc.h
+  linux/windows/winnls.h
+  linux/windows/gdi.h
+  linux/windows/mmreg.h
+  linux/windows/mmsystem.h
+
+  linux/interface.h
+  linux/data.h
+  linux/benchmark.h
+  linux/paddle.h
+  linux/version.h
+  linux/registry.h
+  linux/keyboard.h
+  linux/linuxframe.h
+  linux/win.h
+
+  Z80VICE/z80.h
+  Z80VICE/z80mem.h
+  Z80VICE/z80regs.h
+  Z80VICE/daa.h
+  )
+
+add_library(appleii SHARED
+  ${SOURCE_FILES}
+  ${HEADER_FILES}
+  )
+
 pkg_check_modules(YAML REQUIRED yaml-0.1)
 pkg_check_modules(MINIZIP REQUIRED minizip)
 find_package(Boost REQUIRED)
diff --git a/source/frontends/common2/CMakeLists.txt b/source/frontends/common2/CMakeLists.txt
index 3a6f4aff..a07cfca6 100644
--- a/source/frontends/common2/CMakeLists.txt
+++ b/source/frontends/common2/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(GNUInstallDirs)
 
-add_library(common2 STATIC
+set(SOURCE_FILES
   resources.cpp
   fileregistry.cpp
   ptreeregistry.cpp
@@ -10,6 +10,21 @@ add_library(common2 STATIC
   speed.cpp
   )
 
+set(HEADER_FILES
+  resources.h
+  fileregistry.h
+  ptreeregistry.h
+  programoptions.h
+  utils.h
+  timer.h
+  speed.h
+  )
+
+add_library(common2 STATIC
+  ${SOURCE_FILES}
+  ${HEADER_FILES}
+  )
+
 find_package(Boost REQUIRED
   COMPONENTS program_options
   )
diff --git a/source/frontends/libretro/CMakeLists.txt b/source/frontends/libretro/CMakeLists.txt
index cce7358c..c0e2dc51 100644
--- a/source/frontends/libretro/CMakeLists.txt
+++ b/source/frontends/libretro/CMakeLists.txt
@@ -5,7 +5,7 @@ set(LIBRETRO_COMMON_PATH NONE CACHE PATH "path to libretro-common")
 if (EXISTS ${LIBRETRO_COMMON_PATH}/include/libretro.h)
   message("Using LIBRETRO_COMMON_PATH=${LIBRETRO_COMMON_PATH}")
 
-  add_library(applewin_libretro SHARED
+  set(SOURCE_FILES
     environment.cpp
     libretro.cpp
     bitmaps.cpp
@@ -19,6 +19,22 @@ if (EXISTS ${LIBRETRO_COMMON_PATH}/include/libretro.h)
     retroregistry.cpp
     )
 
+  set(HEADER_FILES
+    environment.h
+    rdirectsound.h
+    game.h
+    joypadbase.h
+    joypad.h
+    analog.h
+    rdirectsound.h
+    retroregistry.h
+    )
+
+  add_library(applewin_libretro SHARED
+    ${SOURCE_FILES}
+    ${HEADER_FILES}
+    )
+
   target_include_directories(applewin_libretro PRIVATE
     ${LIBRETRO_COMMON_PATH}/include
     )
diff --git a/source/frontends/ncurses/CMakeLists.txt b/source/frontends/ncurses/CMakeLists.txt
index ac8fa424..0bfab07a 100644
--- a/source/frontends/ncurses/CMakeLists.txt
+++ b/source/frontends/ncurses/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(FindPkgConfig)
 
-add_executable(applen
+set(SOURCE_FILES
   main.cpp
   world.cpp
   colors.cpp
@@ -10,6 +10,19 @@ add_executable(applen
   bitmaps.cpp
   )
 
+set(HEADER_FILES
+  world.h
+  colors.h
+  evdevpaddle.h
+  nframe.h
+  asciiart.h
+  )
+
+add_executable(applen
+  ${SOURCE_FILES}
+  ${HEADER_FILES}
+  )
+
 pkg_search_module(NCURSESW REQUIRED ncursesw)
 pkg_search_module(LIBEVDEV REQUIRED libevdev)
 
diff --git a/source/frontends/qt/CMakeLists.txt b/source/frontends/qt/CMakeLists.txt
index 1bee561f..fb34cfa9 100644
--- a/source/frontends/qt/CMakeLists.txt
+++ b/source/frontends/qt/CMakeLists.txt
@@ -10,9 +10,8 @@ find_package(Qt5 REQUIRED
 
 add_subdirectory(QHexView)
 
-add_executable(qapple
+set(SOURCE_FILES
   main.cpp
-  qapple.qrc
   qapple.cpp
   qresources.cpp
   preferences.cpp
@@ -25,7 +24,28 @@ add_executable(qapple
   loggingcategory.cpp
   viewbuffer.cpp
   qdirectsound.cpp
-)
+  )
+
+set(HEADER_FILES
+  applicationname.h
+  qapple.h
+  preferences.h
+  emulator.h
+  memorycontainer.h
+  gamepadpaddle.h
+  qvideo.h
+  configuration.h
+  options.h
+  loggingcategory.h
+  viewbuffer.h
+  qdirectsound.h
+  )
+
+add_executable(qapple
+  ${SOURCE_FILES}
+  ${HEADER_FILES}
+  qapple.qrc
+  )
 
 target_link_libraries(qapple PRIVATE
   Qt5::Widgets
diff --git a/source/frontends/sdl/CMakeLists.txt b/source/frontends/sdl/CMakeLists.txt
index eab44af5..f215b190 100644
--- a/source/frontends/sdl/CMakeLists.txt
+++ b/source/frontends/sdl/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(FindPkgConfig)
 
-add_executable(sa2
+set(SOURCE_FILES
   main.cpp
   bitmaps.cpp
   emulator.cpp
@@ -9,6 +9,18 @@ add_executable(sa2
   utils.cpp
   )
 
+set(HEADER_FILES
+  emulator.h
+  gamepad.h
+  sdirectsound.h
+  utils.h
+  )
+
+add_executable(sa2
+  ${SOURCE_FILES}
+  ${HEADER_FILES}
+  )
+
 find_package(SDL2 REQUIRED)
 pkg_search_module(SDL2_IMAGE REQUIRED SDL2_image)