diff --git a/CMakeLists.txt b/CMakeLists.txt
index de9f30fe4..63b834b0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -780,6 +780,27 @@ set(OC_CLONK_SOURCES
 	thirdparty/timsort/sort.h
 )
 
+set(QT_EDITOR_SOURCES
+	src/editor/C4ConsoleQt.cpp
+	src/editor/C4ConsoleQt.h
+	src/editor/C4ConsoleQtState.cpp
+	src/editor/C4ConsoleQtState.h
+	src/editor/C4ConsoleQtPropListViewer.cpp
+	src/editor/C4ConsoleQtPropListViewer.h
+	src/editor/C4ConsoleQtObjectListViewer.cpp
+	src/editor/C4ConsoleQtObjectListViewer.h
+	src/editor/C4ConsoleQtDefinitionListViewer.cpp
+	src/editor/C4ConsoleQtDefinitionListViewer.h
+	src/editor/C4ConsoleQtViewport.cpp
+	src/editor/C4ConsoleQtViewport.h
+	src/editor/C4ConsoleQtNewScenario.cpp
+	src/editor/C4ConsoleQtNewScenario.h
+	src/editor/C4ConsoleQtNewScenario.ui
+	src/editor/C4ConsoleQtMainWindow.ui
+	src/editor/resource.qrc
+	${qt_editor_resources}
+)
+
 set(MAPE_BASE_SOURCES
 	src/C4Include.cpp
 	src/landscape/C4MapCreatorS2.cpp
@@ -919,50 +940,14 @@ elseif(USE_SDL_MAINLOOP)
 		src/platform/C4AppSDL.cpp
 		src/platform/C4WindowSDL.cpp
 	)
-	# TODO: Remove duplication
 	if(WITH_QT_EDITOR)
 		qt5_add_resources(qt_editor_resources "src/editor/resource.qrc")
-		list(APPEND OC_GUI_SOURCES
-			src/editor/C4ConsoleQt.cpp
-			src/editor/C4ConsoleQt.h
-			src/editor/C4ConsoleQtState.cpp
-			src/editor/C4ConsoleQtState.h
-			src/editor/C4ConsoleQtPropListViewer.cpp
-			src/editor/C4ConsoleQtPropListViewer.h
-			src/editor/C4ConsoleQtObjectListViewer.cpp
-			src/editor/C4ConsoleQtObjectListViewer.h
-			src/editor/C4ConsoleQtDefinitionListViewer.cpp
-			src/editor/C4ConsoleQtDefinitionListViewer.h
-			src/editor/C4ConsoleQtViewport.cpp
-			src/editor/C4ConsoleQtViewport.h
-			src/editor/C4ConsoleQtMainWindow.ui
-			src/editor/resource.qrc
-			${qt_editor_resources}
-		)
+		list(APPEND OC_GUI_SOURCES ${QT_EDITOR_SOURCES})
 	endif()
 elseif(USE_WIN32_WINDOWS)
 	if(WITH_QT_EDITOR)
 		qt5_add_resources(qt_editor_resources "src/editor/resource.qrc")
-		list(APPEND OC_GUI_SOURCES
-			src/editor/C4ConsoleQt.cpp
-			src/editor/C4ConsoleQt.h
-			src/editor/C4ConsoleQtState.cpp
-			src/editor/C4ConsoleQtState.h
-			src/editor/C4ConsoleQtPropListViewer.cpp
-			src/editor/C4ConsoleQtPropListViewer.h
-			src/editor/C4ConsoleQtObjectListViewer.cpp
-			src/editor/C4ConsoleQtObjectListViewer.h
-			src/editor/C4ConsoleQtDefinitionListViewer.cpp
-			src/editor/C4ConsoleQtDefinitionListViewer.h
-			src/editor/C4ConsoleQtViewport.cpp
-			src/editor/C4ConsoleQtViewport.h
-			src/editor/C4ConsoleQtNewScenario.cpp
-			src/editor/C4ConsoleQtNewScenario.h
-			src/editor/C4ConsoleQtNewScenario.ui
-			src/editor/C4ConsoleQtMainWindow.ui
-			src/editor/resource.qrc
-			${qt_editor_resources}
-		)
+		list(APPEND OC_GUI_SOURCES ${QT_EDITOR_SOURCES})
 	else()
 		list(APPEND OC_GUI_SOURCES
 			src/editor/C4ConsoleWin32.cpp