diff --git a/src/modules/artnet/CMakeLists.txt b/src/modules/artnet/CMakeLists.txt
index a5db7db5c6..a29cc62e79 100644
--- a/src/modules/artnet/CMakeLists.txt
+++ b/src/modules/artnet/CMakeLists.txt
@@ -3,22 +3,20 @@ project (artnet)
 
 set(SOURCES
 	consumer/artnet_consumer.cpp
-
-	artnet.cpp
-)
-set(HEADERS
 	consumer/artnet_consumer.h
 
+	util/fixture_calculation.cpp
+	util/fixture_calculation.h
+
+	artnet.cpp
 	artnet.h
-	util/fixture_calculation.cpp util/fixture_calculation.h
 )
 
 casparcg_add_module_project(artnet
-	SOURCES ${SOURCES} ${HEADERS}
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "artnet::init"
 )
 target_include_directories(artnet PRIVATE
-    ..
     ../..
 )
 
diff --git a/src/modules/bluefish/CMakeLists.txt b/src/modules/bluefish/CMakeLists.txt
index db5b1459a6..6e46762b78 100644
--- a/src/modules/bluefish/CMakeLists.txt
+++ b/src/modules/bluefish/CMakeLists.txt
@@ -3,21 +3,19 @@ project (bluefish)
 
 set(SOURCES
 		consumer/bluefish_consumer.cpp
+		consumer/bluefish_consumer.h
         producer/bluefish_producer.cpp
+		producer/bluefish_producer.h
 		util/blue_velvet.cpp
+		util/blue_velvet.h
+		util/memory.h
 		bluefish.cpp
-)
-set(HEADERS
-	    consumer/bluefish_consumer.h
-        producer/bluefish_producer.h
-        util/blue_velvet.h
-	    util/memory.h
-        bluefish.h
-	StdAfx.h
+		bluefish.h
+		StdAfx.h
 )
 
 casparcg_add_module_project(bluefish
-    SOURCES ${SOURCES} ${HEADERS}
+    SOURCES ${SOURCES}
 	INIT_FUNCTION "bluefish::init"
 )
 target_include_directories(bluefish PRIVATE
diff --git a/src/modules/decklink/CMakeLists.txt b/src/modules/decklink/CMakeLists.txt
index ec0e3389e8..d690034116 100644
--- a/src/modules/decklink/CMakeLists.txt
+++ b/src/modules/decklink/CMakeLists.txt
@@ -3,36 +3,34 @@ project (decklink)
 
 set(SOURCES
 		consumer/decklink_consumer.cpp
-		consumer/frame.cpp
-		consumer/config.cpp
-		consumer/monitor.cpp
-
-		producer/decklink_producer.cpp
-
-		decklink.cpp
-)
-set(HEADERS
 		consumer/decklink_consumer.h
+		consumer/frame.cpp
 		consumer/frame.h
+		consumer/config.cpp
 		consumer/config.h
+		consumer/monitor.cpp
 		consumer/monitor.h
 
+		producer/decklink_producer.cpp
 		producer/decklink_producer.h
 
 		util/util.h
 
+		decklink.cpp
 		decklink.h
+
 		decklink_api.h
 		StdAfx.h
 )
+
 if (MSVC)
-	list(APPEND HEADERS
+	list(APPEND SOURCES
 			interop/DeckLinkAPI_i.c
 			interop/DeckLinkAPI.h
 			interop/DeckLinkAPIVersion.h
 	)
 else()
-	list(APPEND HEADERS
+	list(APPEND SOURCES
 			linux_interop/DeckLinkAPIConfiguration.h
 			linux_interop/DeckLinkAPIDeckControl.h
 			linux_interop/DeckLinkAPIDispatch.cpp
@@ -56,7 +54,7 @@ else()
 endif ()
 
 casparcg_add_module_project(decklink
-	SOURCES ${SOURCES} ${HEADERS}
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "decklink::init"
 )
 target_include_directories(decklink PRIVATE
diff --git a/src/modules/ffmpeg/CMakeLists.txt b/src/modules/ffmpeg/CMakeLists.txt
index 631792e27c..f1490f18ba 100644
--- a/src/modules/ffmpeg/CMakeLists.txt
+++ b/src/modules/ffmpeg/CMakeLists.txt
@@ -3,34 +3,31 @@ project (ffmpeg)
 
 set(SOURCES
 	producer/av_producer.cpp
+	producer/av_producer.h
 	producer/av_input.cpp
-	util/av_util.cpp
+	producer/av_input.h
 	producer/ffmpeg_producer.cpp
+	producer/ffmpeg_producer.h
 	consumer/ffmpeg_consumer.cpp
+	consumer/ffmpeg_consumer.h
 
-	ffmpeg.cpp
-)
-set(HEADERS
-	util/av_assert.h
-	producer/av_producer.h
-	producer/av_input.h
+	util/av_util.cpp
 	util/av_util.h
-	producer/ffmpeg_producer.h
-	consumer/ffmpeg_consumer.h
+	util/av_assert.h
 
-	defines.h
+	ffmpeg.cpp
 	ffmpeg.h
+	defines.h
 	StdAfx.h
 )
 
 casparcg_add_module_project(ffmpeg
-	SOURCES ${SOURCES} ${HEADERS}
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "ffmpeg::init"
 	UNINIT_FUNCTION "ffmpeg::uninit"
 )
 
 target_include_directories(ffmpeg PRIVATE
-    ..
     ../..
     ${FFMPEG_INCLUDE_PATH}
     )
diff --git a/src/modules/flash/CMakeLists.txt b/src/modules/flash/CMakeLists.txt
index 4fb8974538..266e392185 100644
--- a/src/modules/flash/CMakeLists.txt
+++ b/src/modules/flash/CMakeLists.txt
@@ -3,33 +3,27 @@ project (flash)
 
 set(SOURCES
 		interop/Flash9e_i.c
-
-		producer/FlashAxContainer.cpp
-		producer/flash_producer.cpp
-
-		util/swf.cpp
-
-		flash.cpp
-)
-set(HEADERS
 		interop/axflash.h
 		interop/TimerHelper.h
 
+		producer/FlashAxContainer.cpp
 		producer/FlashAxContainer.h
+		producer/flash_producer.cpp
 		producer/flash_producer.h
 
+		util/swf.cpp
 		util/swf.h
 
+		flash.cpp
 		flash.h
 		StdAfx.h
 )
 
 casparcg_add_module_project(flash
-	SOURCES ${SOURCES} ${HEADERS} 
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "flash::init"
 )
 target_include_directories(flash PRIVATE
-    ..
     ../..
     ${ZLIB_INCLUDE_PATH}
     )
diff --git a/src/modules/html/CMakeLists.txt b/src/modules/html/CMakeLists.txt
index 4ff480855d..24095ab82d 100644
--- a/src/modules/html/CMakeLists.txt
+++ b/src/modules/html/CMakeLists.txt
@@ -3,26 +3,22 @@ project (html)
 
 set(SOURCES
 		producer/html_cg_proxy.cpp
-		producer/html_producer.cpp
-
-		html.cpp
-)
-set(HEADERS
 		producer/html_cg_proxy.h
+		producer/html_producer.cpp
 		producer/html_producer.h
 
+		html.cpp
 		html.h
 )
 
 casparcg_add_module_project(html
-	SOURCES ${SOURCES} ${HEADERS}
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "html::init"
 	UNINIT_FUNCTION "html::uninit"
 	CLI_INTERCEPTOR "html::intercept_command_line"
 )
 
 target_include_directories(html PRIVATE
-    ..
     ../..
     ${CEF_INCLUDE_PATH}
     )
diff --git a/src/modules/image/CMakeLists.txt b/src/modules/image/CMakeLists.txt
index fc2ad125cc..8c64ea604c 100644
--- a/src/modules/image/CMakeLists.txt
+++ b/src/modules/image/CMakeLists.txt
@@ -3,36 +3,29 @@ project (image)
 
 set(SOURCES
 		consumer/image_consumer.cpp
-
-		producer/image_producer.cpp
-
-		producer/image_scroll_producer.cpp
-
-		util/image_algorithms.cpp
-		util/image_loader.cpp
-
-		image.cpp
-)
-set(HEADERS
 		consumer/image_consumer.h
 
+		producer/image_producer.cpp
 		producer/image_producer.h
 
+		producer/image_scroll_producer.cpp
 		producer/image_scroll_producer.h
 
+		util/image_algorithms.cpp
 		util/image_algorithms.h
+		util/image_loader.cpp
 		util/image_loader.h
 		util/image_view.h
 
+		image.cpp
 		image.h
 )
 
 casparcg_add_module_project(image
-	SOURCES ${SOURCES} ${HEADERS}
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "image::init"
 )
 target_include_directories(image PRIVATE
-    ..
     ../..
     ${FREEIMAGE_INCLUDE_PATH}
     )
diff --git a/src/modules/image/consumer/image_consumer.cpp b/src/modules/image/consumer/image_consumer.cpp
index aa9267a1de..b32d06c25f 100644
--- a/src/modules/image/consumer/image_consumer.cpp
+++ b/src/modules/image/consumer/image_consumer.cpp
@@ -46,8 +46,8 @@
 #include <utility>
 #include <vector>
 
+#include "../util/image_algorithms.h"
 #include "../util/image_view.h"
-#include "image/util/image_algorithms.h"
 
 namespace caspar { namespace image {
 
diff --git a/src/modules/newtek/CMakeLists.txt b/src/modules/newtek/CMakeLists.txt
index d57a42746b..a45bc6d417 100644
--- a/src/modules/newtek/CMakeLists.txt
+++ b/src/modules/newtek/CMakeLists.txt
@@ -3,21 +3,15 @@ project (newtek)
 
 set(SOURCES
 		consumer/newtek_ndi_consumer.cpp
-
-		producer/newtek_ndi_producer.cpp
-
-		util/ndi.cpp
-
-		newtek.cpp
-
-)
-set(HEADERS
 		consumer/newtek_ndi_consumer.h
 
+		producer/newtek_ndi_producer.cpp
 		producer/newtek_ndi_producer.h
 
+		util/ndi.cpp
 		util/ndi.h
 
+		newtek.cpp
 		newtek.h
 
 		interop/Processing.NDI.compat.h
@@ -38,11 +32,11 @@ set(HEADERS
 )
 
 casparcg_add_module_project(newtek
-	SOURCES ${SOURCES} ${HEADERS}
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "newtek::init"
 )
 target_include_directories(newtek PRIVATE
-    ..
+	..
     ../..
     ${FFMPEG_INCLUDE_PATH}
     )
@@ -55,6 +49,4 @@ source_group(sources\\interop interop/*)
 source_group(sources\\util util/*)
 source_group(sources ./*)
 
-target_link_libraries(newtek
-    ffmpeg
-)
+target_link_libraries(newtek ffmpeg)
diff --git a/src/modules/oal/CMakeLists.txt b/src/modules/oal/CMakeLists.txt
index 2c6b4e9e82..b65176b338 100644
--- a/src/modules/oal/CMakeLists.txt
+++ b/src/modules/oal/CMakeLists.txt
@@ -3,24 +3,19 @@ project (oal)
 
 set(SOURCES
 		consumer/oal_consumer.cpp
-
-		oal.cpp
-)
-set(HEADERS
 		consumer/oal_consumer.h
 
+		oal.cpp
 		oal.h
 )
 
 casparcg_add_module_project(oal
-	SOURCES ${SOURCES} ${HEADERS}
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "oal::init"
 )
 target_include_directories(oal PRIVATE
-    ..
     ../..
     ${FFMPEG_INCLUDE_PATH}
-    ${OPENAL_INCLUDE_PATH}
     )
 
 set_target_properties(oal PROPERTIES FOLDER modules)
@@ -32,5 +27,5 @@ if(MSVC)
 			OpenAL32)
 else()
 	target_link_libraries(oal
-			openal)
+			OpenAL::OpenAL)
 endif()
diff --git a/src/modules/screen/CMakeLists.txt b/src/modules/screen/CMakeLists.txt
index e1da9f167b..088dd11ee3 100644
--- a/src/modules/screen/CMakeLists.txt
+++ b/src/modules/screen/CMakeLists.txt
@@ -3,15 +3,12 @@ project (screen)
 
 set(SOURCES
 	consumer/screen_consumer.cpp
-
-	screen.cpp
-)
-set(HEADERS
 	consumer/screen_consumer.h
 
 	consumer_screen_vertex.h
 	consumer_screen_fragment.h
 
+	screen.cpp
 	screen.h
 )
 
@@ -20,20 +17,17 @@ bin2c("consumer/screen.frag" "consumer_screen_fragment.h" "caspar::screen" "frag
 
 if (MSVC)
 else ()
-	list(APPEND HEADERS
-			util/x11_util.h
-			)
 	list(APPEND SOURCES
-			util/x11_util.cpp
-			)
+		util/x11_util.cpp
+		util/x11_util.h
+	)
 endif ()
 
 casparcg_add_module_project(screen
-	SOURCES ${SOURCES} ${HEADERS}
+	SOURCES ${SOURCES}
 	INIT_FUNCTION "screen::init"
 )
 target_include_directories(screen PRIVATE
-    ..
     ../..
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GLEW_INCLUDE_PATH}