From 4e8d8caee59aded6ace9adee9257903627e425e4 Mon Sep 17 00:00:00 2001 From: nxtumUbun Date: Mon, 25 May 2026 02:40:53 -0700 Subject: [PATCH] linux working --- BridgeLink/CMakeLists.txt | 2 ++ BridgeLink/Module.h | 1 + DeviceIdentification/CMakeLists.txt | 4 +++- DeviceIdentification/Module.h | 1 + DeviceInfo/CMakeLists.txt | 2 ++ DeviceInfo/Module.h | 1 + DisplayInfo/CMakeLists.txt | 3 +++ DisplayInfo/Module.h | 1 + LocationSync/CMakeLists.txt | 2 ++ LocationSync/Module.h | 1 + MessageControl/CMakeLists.txt | 2 ++ MessageControl/Module.h | 1 + Messenger/CMakeLists.txt | 2 ++ Messenger/Module.h | 1 + Monitor/CMakeLists.txt | 2 ++ Monitor/Module.h | 1 + OpenCDMi/CMakeLists.txt | 4 +++- OpenCDMi/Module.h | 1 + Packager/CMakeLists.txt | 2 ++ Packager/Module.h | 1 + PerformanceMetrics/CMakeLists.txt | 4 +++- PerformanceMetrics/Module.h | 1 + PlayerInfo/CMakeLists.txt | 5 ++++- PlayerInfo/Module.h | 1 + RustBridge/CMakeLists.txt | 4 +++- RustBridge/Module.h | 1 + SecurityAgent/CMakeLists.txt | 4 +++- SecurityAgent/Module.h | 1 + WebBridge/CMakeLists.txt | 4 +++- WebBridge/Module.h | 1 + WebKitBrowser/CMakeLists.txt | 3 +++ WebKitBrowser/Module.h | 1 + 32 files changed, 58 insertions(+), 7 deletions(-) diff --git a/BridgeLink/CMakeLists.txt b/BridgeLink/CMakeLists.txt index e61f3b4d..b5fe4204 100644 --- a/BridgeLink/CMakeLists.txt +++ b/BridgeLink/CMakeLists.txt @@ -4,6 +4,7 @@ set(MODULE_NAME ${NAMESPACE}${PROJECT_NAME}) message("Setting up ${PROJECT_NAME}") find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) @@ -20,6 +21,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions) string(TOLOWER ${NAMESPACE} STORAGENAME) diff --git a/BridgeLink/Module.h b/BridgeLink/Module.h index d7f62e33..ff72ba1f 100644 --- a/BridgeLink/Module.h +++ b/BridgeLink/Module.h @@ -6,6 +6,7 @@ #endif #include +#include #include #undef EXTERNAL diff --git a/DeviceIdentification/CMakeLists.txt b/DeviceIdentification/CMakeLists.txt index 993c6f3a..de8b2fbf 100644 --- a/DeviceIdentification/CMakeLists.txt +++ b/DeviceIdentification/CMakeLists.txt @@ -48,6 +48,7 @@ find_package(BCM_HOST QUIET) find_package(MFRFWLibs QUIET) find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) add_library(${MODULE_NAME} SHARED @@ -122,7 +123,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug - ${NAMESPACE}Plugins::${NAMESPACE}Plugins) + ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common) target_include_directories(${MODULE_NAME} PRIVATE diff --git a/DeviceIdentification/Module.h b/DeviceIdentification/Module.h index b13b179d..3afcf5d7 100644 --- a/DeviceIdentification/Module.h +++ b/DeviceIdentification/Module.h @@ -25,6 +25,7 @@ #endif #include +#include #undef EXTERNAL #define EXTERNAL diff --git a/DeviceInfo/CMakeLists.txt b/DeviceInfo/CMakeLists.txt index 4f3e7b74..b43609c7 100644 --- a/DeviceInfo/CMakeLists.txt +++ b/DeviceInfo/CMakeLists.txt @@ -35,6 +35,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) @@ -52,6 +53,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions) install(TARGETS ${MODULE_NAME} diff --git a/DeviceInfo/Module.h b/DeviceInfo/Module.h index e7d6e677..b5968001 100644 --- a/DeviceInfo/Module.h +++ b/DeviceInfo/Module.h @@ -25,6 +25,7 @@ #endif #include +#include #include #undef EXTERNAL diff --git a/DisplayInfo/CMakeLists.txt b/DisplayInfo/CMakeLists.txt index 25ff6e73..ecc64d5c 100644 --- a/DisplayInfo/CMakeLists.txt +++ b/DisplayInfo/CMakeLists.txt @@ -43,6 +43,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) find_package(BCM_HOST QUIET) @@ -62,6 +63,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions) if (PLUGIN_DISPLAYINFO_BCM_VERSION_MAJOR) @@ -78,6 +80,7 @@ if (USE_DEVICESETTINGS) ../helpers) target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${IARMBUS_LIBRARIES} ${DS_LIBRARIES}) target_sources(${MODULE_NAME} diff --git a/DisplayInfo/Module.h b/DisplayInfo/Module.h index 1dfa8ee7..00701867 100644 --- a/DisplayInfo/Module.h +++ b/DisplayInfo/Module.h @@ -25,6 +25,7 @@ #include #include +#include #undef EXTERNAL #define EXTERNAL diff --git a/LocationSync/CMakeLists.txt b/LocationSync/CMakeLists.txt index e662fc6b..8d602b25 100644 --- a/LocationSync/CMakeLists.txt +++ b/LocationSync/CMakeLists.txt @@ -37,6 +37,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) @@ -55,6 +56,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions) install(TARGETS ${MODULE_NAME} diff --git a/LocationSync/Module.h b/LocationSync/Module.h index 4319f672..30da602c 100644 --- a/LocationSync/Module.h +++ b/LocationSync/Module.h @@ -25,6 +25,7 @@ #endif #include +#include #undef EXTERNAL #define EXTERNAL diff --git a/MessageControl/CMakeLists.txt b/MessageControl/CMakeLists.txt index 6659b487..fcbac2f9 100644 --- a/MessageControl/CMakeLists.txt +++ b/MessageControl/CMakeLists.txt @@ -44,6 +44,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) find_package(${NAMESPACE}Messaging REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) @@ -61,6 +62,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions ${NAMESPACE}Messaging::${NAMESPACE}Messaging) diff --git a/MessageControl/Module.h b/MessageControl/Module.h index 0623a8c2..daba5bec 100644 --- a/MessageControl/Module.h +++ b/MessageControl/Module.h @@ -25,6 +25,7 @@ #include #include +#include #include #include diff --git a/Messenger/CMakeLists.txt b/Messenger/CMakeLists.txt index bb4a3ef5..ebd24134 100644 --- a/Messenger/CMakeLists.txt +++ b/Messenger/CMakeLists.txt @@ -42,6 +42,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) @@ -59,6 +60,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions) install(TARGETS ${MODULE_NAME} diff --git a/Messenger/Module.h b/Messenger/Module.h index c711ca1f..5e653a38 100644 --- a/Messenger/Module.h +++ b/Messenger/Module.h @@ -24,6 +24,7 @@ #endif #include +#include #include #undef EXTERNAL diff --git a/Monitor/CMakeLists.txt b/Monitor/CMakeLists.txt index 1b58567f..4e792674 100644 --- a/Monitor/CMakeLists.txt +++ b/Monitor/CMakeLists.txt @@ -78,6 +78,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) @@ -96,6 +97,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions) install(TARGETS ${MODULE_NAME} diff --git a/Monitor/Module.h b/Monitor/Module.h index b936af45..5a6a419d 100644 --- a/Monitor/Module.h +++ b/Monitor/Module.h @@ -25,6 +25,7 @@ #endif #include +#include #include #undef EXTERNAL diff --git a/OpenCDMi/CMakeLists.txt b/OpenCDMi/CMakeLists.txt index 3de1a1f4..e6375dea 100644 --- a/OpenCDMi/CMakeLists.txt +++ b/OpenCDMi/CMakeLists.txt @@ -44,6 +44,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) add_library(${MODULE_NAME} SHARED @@ -64,7 +65,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug - ${NAMESPACE}Plugins::${NAMESPACE}Plugins ) + ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ) # Library definition section install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime) diff --git a/OpenCDMi/Module.h b/OpenCDMi/Module.h index 171d13ff..dde82060 100644 --- a/OpenCDMi/Module.h +++ b/OpenCDMi/Module.h @@ -25,6 +25,7 @@ #endif #include +#include #include #undef EXTERNAL diff --git a/Packager/CMakeLists.txt b/Packager/CMakeLists.txt index 2cc20eb4..572906cf 100644 --- a/Packager/CMakeLists.txt +++ b/Packager/CMakeLists.txt @@ -44,6 +44,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(libprovision QUIET) find_package(LibOPKG REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) @@ -59,6 +60,7 @@ target_include_directories(${MODULE_NAME} PRIVATE target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common LibOPKG::LibOPKG) if (libprovision_FOUND) diff --git a/Packager/Module.h b/Packager/Module.h index 50509ac2..6ea346e3 100644 --- a/Packager/Module.h +++ b/Packager/Module.h @@ -26,6 +26,7 @@ #include #include +#include #undef EXTERNAL #define EXTERNAL diff --git a/PerformanceMetrics/CMakeLists.txt b/PerformanceMetrics/CMakeLists.txt index bf428850..6d4a3006 100644 --- a/PerformanceMetrics/CMakeLists.txt +++ b/PerformanceMetrics/CMakeLists.txt @@ -43,6 +43,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) add_library(${MODULE_NAME} SHARED @@ -70,7 +71,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug - ${NAMESPACE}Plugins::${NAMESPACE}Plugins) + ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime) diff --git a/PerformanceMetrics/Module.h b/PerformanceMetrics/Module.h index 616d5609..644f3c73 100644 --- a/PerformanceMetrics/Module.h +++ b/PerformanceMetrics/Module.h @@ -23,6 +23,7 @@ #endif #include +#include #undef EXTERNAL #define EXTERNAL diff --git a/PlayerInfo/CMakeLists.txt b/PlayerInfo/CMakeLists.txt index de4e4398..852f0c66 100644 --- a/PlayerInfo/CMakeLists.txt +++ b/PlayerInfo/CMakeLists.txt @@ -39,6 +39,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) @@ -54,7 +55,8 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Definitions::${NAMESPACE}Definitions - ${NAMESPACE}Plugins::${NAMESPACE}Plugins) + ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common) find_package(GStreamer REQUIRED) if (GStreamer_FOUND) @@ -72,6 +74,7 @@ if (GStreamer_FOUND) ../helpers) target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${IARMBUS_LIBRARIES} ${DS_LIBRARIES}) target_sources(${MODULE_NAME} diff --git a/PlayerInfo/Module.h b/PlayerInfo/Module.h index 35e6076a..ef499c8f 100644 --- a/PlayerInfo/Module.h +++ b/PlayerInfo/Module.h @@ -24,6 +24,7 @@ #endif #include +#include #undef EXTERNAL #define EXTERNAL diff --git a/RustBridge/CMakeLists.txt b/RustBridge/CMakeLists.txt index f57c56fa..e7d6ac12 100644 --- a/RustBridge/CMakeLists.txt +++ b/RustBridge/CMakeLists.txt @@ -32,6 +32,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) add_library(${MODULE_NAME} SHARED @@ -46,7 +47,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug - ${NAMESPACE}Plugins::${NAMESPACE}Plugins) + ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime) diff --git a/RustBridge/Module.h b/RustBridge/Module.h index 560713d6..6d267f21 100644 --- a/RustBridge/Module.h +++ b/RustBridge/Module.h @@ -24,6 +24,7 @@ #endif #include +#include #undef EXTERNAL #define EXTERNAL diff --git a/SecurityAgent/CMakeLists.txt b/SecurityAgent/CMakeLists.txt index 9aacc0f9..09688def 100644 --- a/SecurityAgent/CMakeLists.txt +++ b/SecurityAgent/CMakeLists.txt @@ -37,6 +37,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) find_library(SECAPI NAMES ${SECAPI_LIB}) @@ -62,7 +63,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug - ${NAMESPACE}Plugins::${NAMESPACE}Plugins) + ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common) if (SECAPI) target_link_libraries(${MODULE_NAME} PRIVATE ${SECAPI_LIB}) diff --git a/SecurityAgent/Module.h b/SecurityAgent/Module.h index bd0b37d9..aee5cd13 100644 --- a/SecurityAgent/Module.h +++ b/SecurityAgent/Module.h @@ -25,6 +25,7 @@ #endif #include +#include #include "Tracing.h" #undef EXTERNAL diff --git a/WebBridge/CMakeLists.txt b/WebBridge/CMakeLists.txt index 06121e16..21a3fa62 100644 --- a/WebBridge/CMakeLists.txt +++ b/WebBridge/CMakeLists.txt @@ -33,6 +33,7 @@ if(BUILD_REFERENCE) endif() find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) add_library(${MODULE_NAME} SHARED @@ -46,7 +47,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug - ${NAMESPACE}Plugins::${NAMESPACE}Plugins) + ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime) diff --git a/WebBridge/Module.h b/WebBridge/Module.h index 0a50d4c1..ee436f36 100644 --- a/WebBridge/Module.h +++ b/WebBridge/Module.h @@ -24,6 +24,7 @@ #endif #include +#include #undef EXTERNAL #define EXTERNAL diff --git a/WebKitBrowser/CMakeLists.txt b/WebKitBrowser/CMakeLists.txt index daa9ffff..d97ca0ab 100644 --- a/WebKitBrowser/CMakeLists.txt +++ b/WebKitBrowser/CMakeLists.txt @@ -226,6 +226,7 @@ set(PLUGIN_AMAZON_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT ${PLUGIN_WEBKITBR set(PLUGIN_AMAZON_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_POLLINTERVAL} CACHE STRING "Amazon App Memory Pressure Networkprocess Poll Interval") find_package(${NAMESPACE}Plugins REQUIRED) +find_package(${NAMESPACE}Common REQUIRED) find_package(${NAMESPACE}Definitions REQUIRED) find_package(ClientCryptography REQUIRED) find_package(CompileSettingsDebug CONFIG REQUIRED) @@ -248,6 +249,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE CompileSettingsDebug::CompileSettingsDebug ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions) add_library(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION} SHARED @@ -259,6 +261,7 @@ add_library(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION} SHARED target_link_libraries(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins + ${NAMESPACE}Common::${NAMESPACE}Common ${NAMESPACE}Definitions::${NAMESPACE}Definitions ClientCryptography::ClientCryptography WPEBackend::WPEBackend diff --git a/WebKitBrowser/Module.h b/WebKitBrowser/Module.h index 8f47b9a6..436be8b6 100644 --- a/WebKitBrowser/Module.h +++ b/WebKitBrowser/Module.h @@ -26,6 +26,7 @@ #include #include +#include #include #undef EXTERNAL