diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96a9fd5..86b5b04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,6 +114,21 @@ set(VIDEO_FORMAT_SOURCES
 	"${SRC_DIR}/video/core/VideoIOFormat.cpp"
 )
 
+set(LEGACY_VIDEO_BACKEND_SOURCES
+	"${SRC_DIR}/video/legacy/VideoBackend.cpp"
+	"${SRC_DIR}/video/legacy/VideoBackend.h"
+	"${SRC_DIR}/video/legacy/VideoBackendLifecycle.cpp"
+	"${SRC_DIR}/video/legacy/VideoBackendLifecycle.h"
+	"${SRC_DIR}/video/playout/OutputProductionController.cpp"
+	"${SRC_DIR}/video/playout/OutputProductionController.h"
+	"${SRC_DIR}/video/playout/RenderCadenceController.cpp"
+	"${SRC_DIR}/video/playout/RenderCadenceController.h"
+	"${SRC_DIR}/video/playout/RenderOutputQueue.cpp"
+	"${SRC_DIR}/video/playout/RenderOutputQueue.h"
+	"${SRC_DIR}/video/playout/SystemOutputFramePool.cpp"
+	"${SRC_DIR}/video/playout/SystemOutputFramePool.h"
+)
+
 set(SLANG_RUNTIME_FILES
 	"${SLANG_ROOT}/bin/slangc.exe"
 	"${SLANG_ROOT}/bin/slang-compiler.dll"
@@ -150,8 +165,7 @@ else()
 		"${SRC_DIR}/*.h"
 	)
 	list(REMOVE_ITEM RENDER_CADENCE_APP_SOURCES
-		"${SRC_DIR}/video/legacy/VideoBackend.cpp"
-		"${SRC_DIR}/video/legacy/VideoBackend.h"
+		${LEGACY_VIDEO_BACKEND_SOURCES}
 	)
 
 	add_executable(RenderCadenceCompositor ${RENDER_CADENCE_APP_SOURCES})
diff --git a/src/video/decklink/DeckLinkOutputThread.h b/src/video/decklink/DeckLinkOutputThread.h
deleted file mode 100644
index 8da08f7..0000000
--- a/src/video/decklink/DeckLinkOutputThread.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "VideoOutputThread.h"
-
-namespace RenderCadenceCompositor
-{
-using DeckLinkOutputThreadConfig = VideoOutputThreadConfig;
-using DeckLinkOutputThreadMetrics = VideoOutputThreadMetrics;
-
-template <typename SystemFrameExchange>
-using DeckLinkOutputThread = VideoOutputThread<SystemFrameExchange>;
-}