diff --git a/Source/compositorclient/test/client-renderer/plugin/CMakeLists.txt b/Source/compositorclient/test/client-renderer/plugin/CMakeLists.txt
index 7517741f..0e704e7a 100644
--- a/Source/compositorclient/test/client-renderer/plugin/CMakeLists.txt
+++ b/Source/compositorclient/test/client-renderer/plugin/CMakeLists.txt
@@ -19,6 +19,7 @@ find_package(Thunder REQUIRED)
 find_package(${NAMESPACE}Core CONFIG REQUIRED)
 find_package(${NAMESPACE}Messaging CONFIG REQUIRED)
 find_package(${NAMESPACE}Plugins CONFIG REQUIRED)
+find_package(${NAMESPACE}Common CONFIG REQUIRED)
 find_package(CompileSettingsDebug CONFIG REQUIRED)
 
 set(PLUGIN_COMPOSITORCLIENT_PLUGIN_STARTMODE "Activated" CACHE STRING "Automatically start ClientCompositorRender plugin")
@@ -42,6 +43,7 @@ target_link_libraries(ClientCompositorRender
         ${NAMESPACE}Core::${NAMESPACE}Core
         ${NAMESPACE}Messaging::${NAMESPACE}Messaging
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins
+        ${NAMESPACE}Common::${NAMESPACE}Common
         CompileSettingsDebug::CompileSettingsDebug
         ClientCompositorRenderCommon
 )
@@ -94,4 +96,4 @@ install(TARGETS ClientCompositorRender
             INSTALL_NAME ClientCompositorRender${Index}.json
         )
     endforeach()
-endif()
\ No newline at end of file
+endif()
diff --git a/Source/compositorclient/test/client-renderer/plugin/Module.h b/Source/compositorclient/test/client-renderer/plugin/Module.h
index d2cfe787..18c4eef5 100644
--- a/Source/compositorclient/test/client-renderer/plugin/Module.h
+++ b/Source/compositorclient/test/client-renderer/plugin/Module.h
@@ -7,6 +7,7 @@
 #include <core/core.h>
 #include <messaging/messaging.h>
 #include <plugins/plugins.h>
+#include <common/common.h>
 
 #if defined(__WINDOWS__)
 #if defined(COMPOSITORCLIENT_EXPORTS)
diff --git a/Source/cryptography/CMakeLists.txt b/Source/cryptography/CMakeLists.txt
index e0c9f49c..4bedf0fc 100644
--- a/Source/cryptography/CMakeLists.txt
+++ b/Source/cryptography/CMakeLists.txt
@@ -40,6 +40,7 @@ option(INCLUDE_SOFTWARE_CRYPTOGRAPHY_LIBRARY "Include explicitly a software base
 
 find_package(CompileSettingsDebug CONFIG REQUIRED)
 find_package(${NAMESPACE}Core REQUIRED)
+find_package(${NAMESPACE}Common REQUIRED)
 find_package(${NAMESPACE}COM REQUIRED)
 
 add_subdirectory(implementation)
@@ -53,6 +54,7 @@ add_library(${TARGET}
 target_link_libraries(${TARGET}
     PRIVATE
         ${NAMESPACE}Core::${NAMESPACE}Core
+        ${NAMESPACE}Common::${NAMESPACE}Common
         ${NAMESPACE}COM::${NAMESPACE}COM
         CompileSettingsDebug::CompileSettingsDebug
 )
@@ -126,6 +128,7 @@ if(INCLUDE_SOFTWARE_CRYPTOGRAPHY_LIBRARY)
     target_link_libraries(${TARGET}Software 
         PRIVATE
             ${NAMESPACE}Core::${NAMESPACE}Core
+            ${NAMESPACE}Common::${NAMESPACE}Common
             ${NAMESPACE}COM::${NAMESPACE}COM
             OpenSSL::SSL
             OpenSSL::Crypto
diff --git a/Source/deviceinfo/DeviceInfo.cpp b/Source/deviceinfo/DeviceInfo.cpp
index 2798ab3a..a25358d5 100644
--- a/Source/deviceinfo/DeviceInfo.cpp
+++ b/Source/deviceinfo/DeviceInfo.cpp
@@ -1600,4 +1600,3 @@ void deviceinfo_dispose() {
     DeviceInfoLink::Dispose();
 }
 } // extern "C"
-
diff --git a/Source/displayinfo/CMakeLists.txt b/Source/displayinfo/CMakeLists.txt
index b1fce73b..2db65ddc 100644
--- a/Source/displayinfo/CMakeLists.txt
+++ b/Source/displayinfo/CMakeLists.txt
@@ -31,6 +31,7 @@ find_package(CompileSettingsDebug CONFIG REQUIRED)
 find_package(${NAMESPACE}Core REQUIRED)
 find_package(${NAMESPACE}COM REQUIRED)
 find_package(${NAMESPACE}Messaging REQUIRED)
+find_package(${NAMESPACE}Common REQUIRED)
 
 set(PUBLIC_HEADERS 
         "include/displayinfo.h"
@@ -46,6 +47,7 @@ target_link_libraries(${TARGET}
           ${NAMESPACE}Core::${NAMESPACE}Core
           ${NAMESPACE}COM::${NAMESPACE}COM
           ${NAMESPACE}Messaging::${NAMESPACE}Messaging
+          ${NAMESPACE}Common::${NAMESPACE}Common
           CompileSettingsDebug::CompileSettingsDebug
         )
 
diff --git a/Source/playerinfo/CMakeLists.txt b/Source/playerinfo/CMakeLists.txt
index 7f15aba8..3f935054 100644
--- a/Source/playerinfo/CMakeLists.txt
+++ b/Source/playerinfo/CMakeLists.txt
@@ -30,6 +30,7 @@ message("Setup ${TARGET} v${PROJECT_VERSION}")
 find_package(CompileSettingsDebug CONFIG REQUIRED)
 find_package(${NAMESPACE}Core REQUIRED)
 find_package(${NAMESPACE}Messaging REQUIRED)
+find_package(${NAMESPACE}Common REQUIRED)
 find_package(${NAMESPACE}COM REQUIRED)
 
 set(PUBLIC_HEADERS "include/playerinfo.h")
@@ -43,6 +44,7 @@ target_link_libraries(${TARGET}
         PUBLIC
           ${NAMESPACE}Core::${NAMESPACE}Core
           ${NAMESPACE}Messaging::${NAMESPACE}Messaging
+          ${NAMESPACE}Common::${NAMESPACE}Common
           ${NAMESPACE}COM::${NAMESPACE}COM
           CompileSettingsDebug::CompileSettingsDebug
         )