diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt
index 2c424c9fa..b9116b2a2 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt
@@ -4,34 +4,59 @@
 # $Author$
 #
 
-ADD_SUBDIRECTORY(CodeGen)
-ADD_SUBDIRECTORY(CommonUnitTestsPlaceholder)
-ADD_SUBDIRECTORY(httq)
-ADD_SUBDIRECTORY(LtsAppDescriptor)
-ADD_SUBDIRECTORY(LtsAppManager)
-ADD_SUBDIRECTORY(LtsCommandLineParser)
-ADD_SUBDIRECTORY(LtsCoordinate)
-ADD_SUBDIRECTORY(LtsCoordTrans)
-# LtsElevation depends on Lts/Viewer/SituationMap (outside release scope) - exclude from first release
-if(NOT RELEASE_BUILD)
+# RELEASE_BUILD: exclude modules with DDS/RTI dependencies not needed for TetraIF/Z
+# DDS-dependent modules: CodeGen, LtsAppManager, LtsBotan, LtsCoordinate, LtsElevation,
+# LtsLogin, LtsMultiMonitor, LtsPluginManager, LtsPrinting, LtsProjectionWorkstation,
+# LtsScriptTimeline, LtsSession, LtsTimelineClassic, LtsVirtualKeyboard, LtsWidgets,
+# PluginInterfaces (TopicReplayInterface, RecordReplayPlugin), TopicEditorBase
+
+if(RELEASE_BUILD)
+  # Core modules needed for TetraIF and Z
+  ADD_SUBDIRECTORY(CommonUnitTestsPlaceholder)
+  ADD_SUBDIRECTORY(httq)
+  ADD_SUBDIRECTORY(LtsAppDescriptor)
+  ADD_SUBDIRECTORY(LtsCommandLineParser)
+  ADD_SUBDIRECTORY(LtsCoordTrans)
+  ADD_SUBDIRECTORY(LtsLicence)
+  ADD_SUBDIRECTORY(LtsNotification)
+  ADD_SUBDIRECTORY(LtsRestClient)
+  ADD_SUBDIRECTORY(LtsSerialPortQuerry)
+  ADD_SUBDIRECTORY(LtsTimeline)
+  ADD_SUBDIRECTORY(LtsUtils)
+  ADD_SUBDIRECTORY(LtsWebSocket)
+  ADD_SUBDIRECTORY(PluginInterfaces)
+  ADD_SUBDIRECTORY(ProjectConfig)
+  # Excluded: CodeGen, LtsAppManager, LtsBotan, LtsCoordinate, LtsElevation, LtsLogin,
+  # LtsMultiMonitor, LtsPluginManager, LtsPrinting, LtsProjectionWorkstation,
+  # LtsScriptTimeline, LtsSession, LtsTimelineClassic, LtsVirtualKeyboard, LtsWidgets,
+  # TopicEditorBase
+else()
+  ADD_SUBDIRECTORY(CodeGen)
+  ADD_SUBDIRECTORY(CommonUnitTestsPlaceholder)
+  ADD_SUBDIRECTORY(httq)
+  ADD_SUBDIRECTORY(LtsAppDescriptor)
+  ADD_SUBDIRECTORY(LtsAppManager)
+  ADD_SUBDIRECTORY(LtsCommandLineParser)
+  ADD_SUBDIRECTORY(LtsCoordinate)
+  ADD_SUBDIRECTORY(LtsCoordTrans)
   ADD_SUBDIRECTORY(LtsElevation)
+  ADD_SUBDIRECTORY(LtsLicence)
+  ADD_SUBDIRECTORY(LtsLogin)
+  ADD_SUBDIRECTORY(LtsMultiMonitor)
+  ADD_SUBDIRECTORY(LtsNotification)
+  ADD_SUBDIRECTORY(LtsPluginManager)
+  ADD_SUBDIRECTORY(LtsPrinting)
+  ADD_SUBDIRECTORY(LtsProjectionWorkstation)
+  ADD_SUBDIRECTORY(LtsRestClient)
+  ADD_SUBDIRECTORY(LtsScriptTimeline)
+  ADD_SUBDIRECTORY(LtsSerialPortQuerry)
+  ADD_SUBDIRECTORY(LtsSession)
+  ADD_SUBDIRECTORY(LtsTimeline)
+  ADD_SUBDIRECTORY(LtsUtils)
+  ADD_SUBDIRECTORY(LtsVirtualKeyboard)
+  ADD_SUBDIRECTORY(LtsWebSocket)
+  ADD_SUBDIRECTORY(LtsWidgets)
+  ADD_SUBDIRECTORY(PluginInterfaces)
+  ADD_SUBDIRECTORY(ProjectConfig)
+  ADD_SUBDIRECTORY(TopicEditorBase)
 endif()
-ADD_SUBDIRECTORY(LtsLicence)
-ADD_SUBDIRECTORY(LtsLogin)
-ADD_SUBDIRECTORY(LtsMultiMonitor)
-ADD_SUBDIRECTORY(LtsNotification)
-ADD_SUBDIRECTORY(LtsPluginManager)
-ADD_SUBDIRECTORY(LtsPrinting)
-ADD_SUBDIRECTORY(LtsProjectionWorkstation)
-ADD_SUBDIRECTORY(LtsRestClient)
-ADD_SUBDIRECTORY(LtsScriptTimeline)
-ADD_SUBDIRECTORY(LtsSerialPortQuerry)
-ADD_SUBDIRECTORY(LtsSession)
-ADD_SUBDIRECTORY(LtsTimeline)
-ADD_SUBDIRECTORY(LtsUtils)
-ADD_SUBDIRECTORY(LtsVirtualKeyboard)
-ADD_SUBDIRECTORY(LtsWebSocket)
-ADD_SUBDIRECTORY(LtsWidgets)
-ADD_SUBDIRECTORY(PluginInterfaces)
-ADD_SUBDIRECTORY(ProjectConfig)
-ADD_SUBDIRECTORY(TopicEditorBase)