diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25b83e821..76a44a277 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,10 @@ endif()
 
 set (CMAKE_CXX_STANDARD 17)
 
+# The vendored libzip predates C23, which promotes "bool" to a keyword and so rejects its
+# "typedef ... bool" in zipint.h. GCC 15 defaults to C23, so pin the C standard explicitly.
+set (CMAKE_C_STANDARD 17)
+
 # The location of autogenerated interfaces
 set(CMAKE_CURRENT_AUTOGENERATED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Framework/InterfacesCore)
 set(CMAKE_CURRENT_HEADERS_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Framework/HeadersCore/CppDynamic)
diff --git a/Drivers/A3200/Implementation/libmcdriver_a3200_sdk.hpp b/Drivers/A3200/Implementation/libmcdriver_a3200_sdk.hpp
index 6114592a7..eccffd7d7 100644
--- a/Drivers/A3200/Implementation/libmcdriver_a3200_sdk.hpp
+++ b/Drivers/A3200/Implementation/libmcdriver_a3200_sdk.hpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __LIBMCDRIVER_A3200_SDK
 
 #include <memory>
+#include <cstdint>
 #include <string>
 
 #ifdef _WIN32
diff --git a/Drivers/ADS/Implementation/libmcdriver_ads_sdk.hpp b/Drivers/ADS/Implementation/libmcdriver_ads_sdk.hpp
index 900bba2be..be35920d0 100644
--- a/Drivers/ADS/Implementation/libmcdriver_ads_sdk.hpp
+++ b/Drivers/ADS/Implementation/libmcdriver_ads_sdk.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <memory>
 #include <string>
+#include <cstdint>
 
 #ifdef _WIN32
 
diff --git a/Drivers/BuR/Implementation/libmcdriver_bur_journalgroup.hpp b/Drivers/BuR/Implementation/libmcdriver_bur_journalgroup.hpp
index e129a9012..55e7ef48e 100644
--- a/Drivers/BuR/Implementation/libmcdriver_bur_journalgroup.hpp
+++ b/Drivers/BuR/Implementation/libmcdriver_bur_journalgroup.hpp
@@ -39,6 +39,7 @@ Abstract: This is the class declaration of CPLCCommand
 
 
 #include <memory>
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <map>
diff --git a/Drivers/BuR/Implementation/libmcdriver_bur_journalvalue.hpp b/Drivers/BuR/Implementation/libmcdriver_bur_journalvalue.hpp
index 382f6f0f9..fca68a769 100644
--- a/Drivers/BuR/Implementation/libmcdriver_bur_journalvalue.hpp
+++ b/Drivers/BuR/Implementation/libmcdriver_bur_journalvalue.hpp
@@ -37,6 +37,7 @@ Abstract: This is the class declaration of CPLCCommand
 
 
 #include <memory>
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <map>
diff --git a/Drivers/CifX/Implementation/libmcdriver_cifx_sdk.hpp b/Drivers/CifX/Implementation/libmcdriver_cifx_sdk.hpp
index d53893dc5..ee6f186fe 100644
--- a/Drivers/CifX/Implementation/libmcdriver_cifx_sdk.hpp
+++ b/Drivers/CifX/Implementation/libmcdriver_cifx_sdk.hpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __LIBMCDRIVER_CIFX_SDK
 
 #include <memory>
+#include <cstdint>
 #include <string>
 
 #ifdef _WIN32
diff --git a/Drivers/Euler/Implementation/libmcdriver_euler_sdk.hpp b/Drivers/Euler/Implementation/libmcdriver_euler_sdk.hpp
index 3cf914b79..dd9228dee 100644
--- a/Drivers/Euler/Implementation/libmcdriver_euler_sdk.hpp
+++ b/Drivers/Euler/Implementation/libmcdriver_euler_sdk.hpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __LIBMCDRIVER_EULER_SDK
 
 #include <memory>
+#include <cstdint>
 #include <string>
 
 #ifdef _WIN32
diff --git a/Drivers/Marlin/Implementation/AMC_SerialController.hpp b/Drivers/Marlin/Implementation/AMC_SerialController.hpp
index fa8f1603f..a6edc6ec7 100644
--- a/Drivers/Marlin/Implementation/AMC_SerialController.hpp
+++ b/Drivers/Marlin/Implementation/AMC_SerialController.hpp
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <fstream>
 #include <memory>
+#include <cstdint>
 #include <vector>
 
 namespace AMC {
diff --git a/Drivers/Pylon/Implementation/libmcdriver_pylon_sdk.hpp b/Drivers/Pylon/Implementation/libmcdriver_pylon_sdk.hpp
index 848af038a..35c969ec6 100644
--- a/Drivers/Pylon/Implementation/libmcdriver_pylon_sdk.hpp
+++ b/Drivers/Pylon/Implementation/libmcdriver_pylon_sdk.hpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __LIBMCDRIVER_PYLON_SDK
 
 #include <memory>
+#include <cstdint>
 #include <string>
 
 #ifdef _WIN32
diff --git a/Drivers/Rasterizer/Implementation/libmcdriver_rasterizer_algorithm.hpp b/Drivers/Rasterizer/Implementation/libmcdriver_rasterizer_algorithm.hpp
index ca3b50c02..c94f69f52 100644
--- a/Drivers/Rasterizer/Implementation/libmcdriver_rasterizer_algorithm.hpp
+++ b/Drivers/Rasterizer/Implementation/libmcdriver_rasterizer_algorithm.hpp
@@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 #include <memory>
+#include <cstdint>
 
 #define RASTERALGORITHM_MINUNITSPERSUBPIXEL 4
 #define RASTERALGORITHM_MAXUNITSPERSUBPIXEL (1024 * 1024)
diff --git a/Drivers/RayLase/Implementation/libmcdriver_raylase_sdk.hpp b/Drivers/RayLase/Implementation/libmcdriver_raylase_sdk.hpp
index f95ba64aa..c5f1b007d 100644
--- a/Drivers/RayLase/Implementation/libmcdriver_raylase_sdk.hpp
+++ b/Drivers/RayLase/Implementation/libmcdriver_raylase_sdk.hpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __LIBMCDRIVER_RAYLASE_SDK
 
 #include <memory>
+#include <cstdint>
 #include <string>
 
 #ifdef _WIN32
diff --git a/Implementation/API/amc_api.hpp b/Implementation/API/amc_api.hpp
index b503bb67a..f8e505dd0 100644
--- a/Implementation/API/amc_api.hpp
+++ b/Implementation/API/amc_api.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_API
 #define __AMC_API
 
+#include <cstdint>
 #include "header_protection.hpp"
 #include "amc_api_types.hpp"
 
diff --git a/Implementation/API/amc_api_jsonrequest.hpp b/Implementation/API/amc_api_jsonrequest.hpp
index 0d16b2617..adb096f2b 100644
--- a/Implementation/API/amc_api_jsonrequest.hpp
+++ b/Implementation/API/amc_api_jsonrequest.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_API_JSONREQUEST
 #define __AMC_API_JSONREQUEST
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <map>
diff --git a/Implementation/API/amc_api_response.hpp b/Implementation/API/amc_api_response.hpp
index 8556d5d2d..6fc243f80 100644
--- a/Implementation/API/amc_api_response.hpp
+++ b/Implementation/API/amc_api_response.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_API_RESPONSE
 #define __AMC_API_RESPONSE
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #include "amc_api_types.hpp"
diff --git a/Implementation/API/amc_api_types.hpp b/Implementation/API/amc_api_types.hpp
index 4c61a4739..f69fd1a5f 100644
--- a/Implementation/API/amc_api_types.hpp
+++ b/Implementation/API/amc_api_types.hpp
@@ -33,6 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __AMC_API_TYPES
 
 
+
+#include <cstdint>
 namespace AMC {
 
 	enum class eAPIRequestType : uint32_t {
diff --git a/Implementation/Common/common_chrono.hpp b/Implementation/Common/common_chrono.hpp
index decf083fc..aefe9d3df 100644
--- a/Implementation/Common/common_chrono.hpp
+++ b/Implementation/Common/common_chrono.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_CHRONO
 #define __AMC_CHRONO
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/Implementation/Common/common_exportstream.hpp b/Implementation/Common/common_exportstream.hpp
index d1611484e..2babdc483 100644
--- a/Implementation/Common/common_exportstream.hpp
+++ b/Implementation/Common/common_exportstream.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMCCOMMON_EXPORTSTREAM
 #define __AMCCOMMON_EXPORTSTREAM
 
+#include <cstdint>
 #include <memory>
 
 namespace AMCCommon {
diff --git a/Implementation/Common/common_exportstream_native.hpp b/Implementation/Common/common_exportstream_native.hpp
index 647d609ca..62522395c 100644
--- a/Implementation/Common/common_exportstream_native.hpp
+++ b/Implementation/Common/common_exportstream_native.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMCCOMMON_EXPORTSTREAM_NATIVE
 #define __AMCCOMMON_EXPORTSTREAM_NATIVE
 
+#include <cstdint>
 #include "common_exportstream.hpp"
 #include <string>
 #include <iostream>
diff --git a/Implementation/Common/common_exportstream_zip.hpp b/Implementation/Common/common_exportstream_zip.hpp
index 78b05dcdc..86d97ace7 100644
--- a/Implementation/Common/common_exportstream_zip.hpp
+++ b/Implementation/Common/common_exportstream_zip.hpp
@@ -33,6 +33,7 @@ NMR_PortableZIPWriter.h defines a portable stream to write into ZIP files
 #ifndef __COMMON_EXPORTSTREAM_ZIP
 #define __COMMON_EXPORTSTREAM_ZIP
 
+#include <cstdint>
 #include "common_exportstream.hpp"
 #include "common_portablezipwriter.hpp"
 #include "Libraries/zlib/zlib.h"
diff --git a/Implementation/Common/common_importstream.hpp b/Implementation/Common/common_importstream.hpp
index 3c835f467..f89021aaa 100644
--- a/Implementation/Common/common_importstream.hpp
+++ b/Implementation/Common/common_importstream.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMCCOMMON_IMPORTSTREAM
 #define __AMCCOMMON_IMPORTSTREAM
 
+#include <cstdint>
 #include <vector>
 #include <string>
 #include <memory>
diff --git a/Implementation/Common/common_importstream_native.hpp b/Implementation/Common/common_importstream_native.hpp
index 2b4b75629..8407befe9 100644
--- a/Implementation/Common/common_importstream_native.hpp
+++ b/Implementation/Common/common_importstream_native.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMCCOMMON_IMPORTSTREAM_NATIVE
 #define __AMCCOMMON_IMPORTSTREAM_NATIVE
 
+#include <cstdint>
 #include "common_importstream.hpp"
 #include <string>
 #include <iostream>
diff --git a/Implementation/Common/common_jpeg.hpp b/Implementation/Common/common_jpeg.hpp
index 12130a964..455e725c4 100644
--- a/Implementation/Common/common_jpeg.hpp
+++ b/Implementation/Common/common_jpeg.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_JPEG
 #define __AMC_JPEG
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/Implementation/Common/common_portablezipwriter.hpp b/Implementation/Common/common_portablezipwriter.hpp
index e7d63073f..a8a482ccf 100644
--- a/Implementation/Common/common_portablezipwriter.hpp
+++ b/Implementation/Common/common_portablezipwriter.hpp
@@ -29,6 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __COMMON_PORTABLEZIPWRITER
 #define __COMMON_PORTABLEZIPWRITER
 
+#include <cstdint>
 #include <string>
 #include <list>
 
diff --git a/Implementation/Common/common_portablezipwriterentry.hpp b/Implementation/Common/common_portablezipwriterentry.hpp
index 50335fbd7..24eb2ae68 100644
--- a/Implementation/Common/common_portablezipwriterentry.hpp
+++ b/Implementation/Common/common_portablezipwriterentry.hpp
@@ -29,6 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __COMMON_PORTABLEZIPWRITERENTRY
 #define __COMMON_PORTABLEZIPWRITERENTRY
 
+#include <cstdint>
 #include <string>
 #include <list>
 #include <memory>
diff --git a/Implementation/Common/common_portablezipwritertypes.hpp b/Implementation/Common/common_portablezipwritertypes.hpp
index 4f0c7021f..8d79d33bd 100644
--- a/Implementation/Common/common_portablezipwritertypes.hpp
+++ b/Implementation/Common/common_portablezipwritertypes.hpp
@@ -30,6 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __COMMON_PORTABLEZIPWRITERTYPES
 
 
+
+#include <cstdint>
 #define ZIPFILEHEADERSIGNATURE 0x04034b50
 #define ZIPFILECENTRALHEADERSIGNATURE 0x02014b50
 #define ZIPFILEENDOFCENTRALDIRSIGNATURE 0x06054b50
diff --git a/Implementation/Common/common_utils.hpp b/Implementation/Common/common_utils.hpp
index ccc1dba51..b2ff0d03b 100644
--- a/Implementation/Common/common_utils.hpp
+++ b/Implementation/Common/common_utils.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UTILS
 #define __AMC_UTILS
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/Implementation/Core/amc_driver.hpp b/Implementation/Core/amc_driver.hpp
index 0acbcb295..be4d0818f 100644
--- a/Implementation/Core/amc_driver.hpp
+++ b/Implementation/Core/amc_driver.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_DRIVER
 #define __AMC_DRIVER
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 #include <string>
diff --git a/Implementation/Core/amc_driverhandler.hpp b/Implementation/Core/amc_driverhandler.hpp
index 61565ba98..aeab2efbb 100644
--- a/Implementation/Core/amc_driverhandler.hpp
+++ b/Implementation/Core/amc_driverhandler.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_DRIVERHANDLER
 #define __AMC_DRIVERHANDLER
 
+#include <cstdint>
 #include <map>
 #include <list>
 #include <string>
diff --git a/Implementation/Core/amc_logger.hpp b/Implementation/Core/amc_logger.hpp
index b6bae5f0d..e1e1c1e2e 100644
--- a/Implementation/Core/amc_logger.hpp
+++ b/Implementation/Core/amc_logger.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_LOGGER
 #define __AMC_LOGGER
 
+#include <cstdint>
 #include <vector>
 #include <memory>
 #include <string>
diff --git a/Implementation/Core/amc_logger_callback.hpp b/Implementation/Core/amc_logger_callback.hpp
index c258102ad..d34487b1a 100644
--- a/Implementation/Core/amc_logger_callback.hpp
+++ b/Implementation/Core/amc_logger_callback.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_LOGGER_CALLBACK
 #define __AMC_LOGGER_CALLBACK
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/Implementation/Core/amc_logger_stderr.hpp b/Implementation/Core/amc_logger_stderr.hpp
index ab523058e..0dc64b8c5 100644
--- a/Implementation/Core/amc_logger_stderr.hpp
+++ b/Implementation/Core/amc_logger_stderr.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_LOGGER_STDERR
 #define __AMC_LOGGER_STDERR
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/Implementation/Core/amc_logger_stdout.hpp b/Implementation/Core/amc_logger_stdout.hpp
index 2bbe1f30c..2f48198e7 100644
--- a/Implementation/Core/amc_logger_stdout.hpp
+++ b/Implementation/Core/amc_logger_stdout.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_LOGGER_STDOUT
 #define __AMC_LOGGER_STDOUT
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/Implementation/Core/amc_parameter.hpp b/Implementation/Core/amc_parameter.hpp
index 739ad271b..90719bef5 100644
--- a/Implementation/Core/amc_parameter.hpp
+++ b/Implementation/Core/amc_parameter.hpp
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #error Never include amc_parameter.hpp from outside of amc_parameter.cpp and amc_parametergroup.cpp
 #endif
 
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/Implementation/Core/amc_parameter_derived.hpp b/Implementation/Core/amc_parameter_derived.hpp
index 689865a37..246f1a098 100644
--- a/Implementation/Core/amc_parameter_derived.hpp
+++ b/Implementation/Core/amc_parameter_derived.hpp
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #error Never include amc_parameter.hpp from outside of amc_parameter.cpp and amc_parametergroup.cpp
 #endif
 
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/Implementation/Core/amc_parameter_valued.hpp b/Implementation/Core/amc_parameter_valued.hpp
index b8c158419..1ebb321f2 100644
--- a/Implementation/Core/amc_parameter_valued.hpp
+++ b/Implementation/Core/amc_parameter_valued.hpp
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #error Never include amc_parameter.hpp from outside of amc_parameter.cpp and amc_parametergroup.cpp
 #endif
 
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/Implementation/Core/amc_processcontroller.hpp b/Implementation/Core/amc_processcontroller.hpp
index 1d268898a..8e8f81811 100644
--- a/Implementation/Core/amc_processcontroller.hpp
+++ b/Implementation/Core/amc_processcontroller.hpp
@@ -36,6 +36,7 @@ Abstract: This is the class declaration of CProcessController
 #define __AMC_PROCESSCONTROLLER
 
 
+#include <cstdint>
 #include "Common/common_chrono.hpp"
 #include "amc_logger.hpp"
 #include "amc_processdirectory.hpp"
diff --git a/Implementation/Core/amc_processdirectory.hpp b/Implementation/Core/amc_processdirectory.hpp
index 7167a373d..dd99f9fc3 100644
--- a/Implementation/Core/amc_processdirectory.hpp
+++ b/Implementation/Core/amc_processdirectory.hpp
@@ -36,6 +36,7 @@ Abstract: This is the class declaration of CProcessController
 #define __AMC_PROCESSDIRECTORY
 
 
+#include <cstdint>
 #include "Common/common_chrono.hpp"
 #include "Common/common_exportstream_native.hpp"
 
diff --git a/Implementation/Core/amc_statemachineinstance.hpp b/Implementation/Core/amc_statemachineinstance.hpp
index 3fd4d14ae..cfea4cea9 100644
--- a/Implementation/Core/amc_statemachineinstance.hpp
+++ b/Implementation/Core/amc_statemachineinstance.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_STATEMACHINEINSTANCE
 #define __AMC_STATEMACHINEINSTANCE
 
+#include <cstdint>
 #include "amc_statemachinestate.hpp"
 #include "libmcplugin_dynamic.hpp"
 #include "libmcenv_stateenvironment.hpp"
diff --git a/Implementation/Core/amc_statemachinestate.hpp b/Implementation/Core/amc_statemachinestate.hpp
index 03e48fbf1..43cdb9f1b 100644
--- a/Implementation/Core/amc_statemachinestate.hpp
+++ b/Implementation/Core/amc_statemachinestate.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_STATEMACHINESTATE
 #define __AMC_STATEMACHINESTATE
 
+#include <cstdint>
 #include <vector>
 #include <string>
 #include <memory>
diff --git a/Implementation/Core/amc_stringresource.hpp b/Implementation/Core/amc_stringresource.hpp
index 686f1a0b4..830cb0fed 100644
--- a/Implementation/Core/amc_stringresource.hpp
+++ b/Implementation/Core/amc_stringresource.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_STRINGRESOURCE
 #define __AMC_STRINGRESOURCE
 
+#include <cstdint>
 #include <memory>
 #include <string>
 
diff --git a/Implementation/Core/amc_stringresourcehandler.hpp b/Implementation/Core/amc_stringresourcehandler.hpp
index 1d0a70188..cc3aa68f9 100644
--- a/Implementation/Core/amc_stringresourcehandler.hpp
+++ b/Implementation/Core/amc_stringresourcehandler.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_STRINGRESOURCEHANDLER
 #define __AMC_STRINGRESOURCEHANDLER
 
+#include <cstdint>
 #include "amc_stringresource.hpp"
 #include "amc_stringresourcetable.hpp"
 #include <mutex>
diff --git a/Implementation/Core/amc_stringresourcetable.hpp b/Implementation/Core/amc_stringresourcetable.hpp
index 75df1595c..1ad72c9bb 100644
--- a/Implementation/Core/amc_stringresourcetable.hpp
+++ b/Implementation/Core/amc_stringresourcetable.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_STRINGRESOURCETABLE
 #define __AMC_STRINGRESOURCETABLE
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <map>
diff --git a/Implementation/Core/amc_xmldocument.hpp b/Implementation/Core/amc_xmldocument.hpp
index 8c2e11a37..a3cda8384 100644
--- a/Implementation/Core/amc_xmldocument.hpp
+++ b/Implementation/Core/amc_xmldocument.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_XMLDOCUMENT
 #define __AMC_XMLDOCUMENT
 
+#include <cstdint>
 #include <string>
 #include <memory>
 #include <map>
diff --git a/Implementation/Core/amc_xmldocumentnode.hpp b/Implementation/Core/amc_xmldocumentnode.hpp
index f9e1f8b56..1393ba031 100644
--- a/Implementation/Core/amc_xmldocumentnode.hpp
+++ b/Implementation/Core/amc_xmldocumentnode.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_XMLDOCUMENTNODE
 #define __AMC_XMLDOCUMENTNODE
 
+#include <cstdint>
 #include <string>
 #include <memory>
 #include <vector>
diff --git a/Implementation/LibMCData/libmcdata_buildjob.hpp b/Implementation/LibMCData/libmcdata_buildjob.hpp
index fb2ec5a80..461d1c31a 100644
--- a/Implementation/LibMCData/libmcdata_buildjob.hpp
+++ b/Implementation/LibMCData/libmcdata_buildjob.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CBuildJob
 #ifndef __LIBMCDATA_BUILDJOB
 #define __LIBMCDATA_BUILDJOB
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 
 // Parent classes
diff --git a/Implementation/LibMCData/libmcdata_buildjobdata.hpp b/Implementation/LibMCData/libmcdata_buildjobdata.hpp
index ea5aae286..ba63f2f3e 100644
--- a/Implementation/LibMCData/libmcdata_buildjobdata.hpp
+++ b/Implementation/LibMCData/libmcdata_buildjobdata.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CBuildJobData
 #ifndef __LIBMCDATA_BUILDJOBDATA
 #define __LIBMCDATA_BUILDJOBDATA
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 
 // Parent classes
diff --git a/Implementation/LibMCData/libmcdata_buildjobexecution.hpp b/Implementation/LibMCData/libmcdata_buildjobexecution.hpp
index 862bb8451..2b0abc5ce 100644
--- a/Implementation/LibMCData/libmcdata_buildjobexecution.hpp
+++ b/Implementation/LibMCData/libmcdata_buildjobexecution.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CBuildJobExecution
 #ifndef __LIBMCDATA_BUILDJOBEXECUTION
 #define __LIBMCDATA_BUILDJOBEXECUTION
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 #include "libmcdata_buildjobexecutiondata.hpp"
 
diff --git a/Implementation/LibMCData/libmcdata_buildjobexecutiondata.hpp b/Implementation/LibMCData/libmcdata_buildjobexecutiondata.hpp
index 13974fb6e..9000b72b0 100644
--- a/Implementation/LibMCData/libmcdata_buildjobexecutiondata.hpp
+++ b/Implementation/LibMCData/libmcdata_buildjobexecutiondata.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CBuildJobExecutionData
 #ifndef __LIBMCDATA_BUILDJOBEXECUTIONDATA
 #define __LIBMCDATA_BUILDJOBEXECUTIONDATA
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 
 // Parent classes
diff --git a/Implementation/LibMCData/libmcdata_journalreader.hpp b/Implementation/LibMCData/libmcdata_journalreader.hpp
index b2578f7ce..cb442b575 100644
--- a/Implementation/LibMCData/libmcdata_journalreader.hpp
+++ b/Implementation/LibMCData/libmcdata_journalreader.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CJournalReader
 #ifndef __LIBMCDATA_JOURNALREADER
 #define __LIBMCDATA_JOURNALREADER
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 #include "amcdata_journalchunkdatafile.hpp"
 #include "libmcdata_journalchunkintegerdata.hpp"
diff --git a/Implementation/LibMCData/libmcdata_storage.hpp b/Implementation/LibMCData/libmcdata_storage.hpp
index 70f185c6c..601972efe 100644
--- a/Implementation/LibMCData/libmcdata_storage.hpp
+++ b/Implementation/LibMCData/libmcdata_storage.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CStorage
 #ifndef __LIBMCDATA_STORAGE
 #define __LIBMCDATA_STORAGE
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 
 // Parent classes
diff --git a/Implementation/LibMCData/libmcdata_storagestream.hpp b/Implementation/LibMCData/libmcdata_storagestream.hpp
index 8fd4ec2c5..1a5b3da44 100644
--- a/Implementation/LibMCData/libmcdata_storagestream.hpp
+++ b/Implementation/LibMCData/libmcdata_storagestream.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CStorageStream
 #ifndef __LIBMCDATA_STORAGESTREAM
 #define __LIBMCDATA_STORAGESTREAM
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 
 // Parent classes
diff --git a/Implementation/LibMCData/libmcdata_storagezipwriter.hpp b/Implementation/LibMCData/libmcdata_storagezipwriter.hpp
index 3933c4ee2..a9f0a57d2 100644
--- a/Implementation/LibMCData/libmcdata_storagezipwriter.hpp
+++ b/Implementation/LibMCData/libmcdata_storagezipwriter.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CStorageZIPWriter
 #ifndef __LIBMCDATA_STORAGEZIPWRITER
 #define __LIBMCDATA_STORAGEZIPWRITER
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 
 // Parent classes
diff --git a/Implementation/LibMCData/libmcdata_telemetryreader.hpp b/Implementation/LibMCData/libmcdata_telemetryreader.hpp
index 37aa617ce..09bd4b052 100644
--- a/Implementation/LibMCData/libmcdata_telemetryreader.hpp
+++ b/Implementation/LibMCData/libmcdata_telemetryreader.hpp
@@ -35,6 +35,7 @@ Abstract: This is the class declaration of CTelemetryReader
 #ifndef __LIBMCDATA_TELEMETRYREADER
 #define __LIBMCDATA_TELEMETRYREADER
 
+#include <cstdint>
 #include "libmcdata_interfaces.hpp"
 #include "libmcdata_telemetrychunkdata.hpp"
 
diff --git a/Implementation/LibMCEnv/libmcenv_modbustcpinstance.hpp b/Implementation/LibMCEnv/libmcenv_modbustcpinstance.hpp
index f745a8da1..bd3ecc974 100644
--- a/Implementation/LibMCEnv/libmcenv_modbustcpinstance.hpp
+++ b/Implementation/LibMCEnv/libmcenv_modbustcpinstance.hpp
@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __LIBMCDRIVER_MODBUSTCPINSTANCE
 #define __LIBMCDRIVER_MODBUSTCPINSTANCE
 
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <memory>
diff --git a/Implementation/LibMCEnv/libmcenv_tcpipinstance.hpp b/Implementation/LibMCEnv/libmcenv_tcpipinstance.hpp
index ab2c89cf1..cb0e9785f 100644
--- a/Implementation/LibMCEnv/libmcenv_tcpipinstance.hpp
+++ b/Implementation/LibMCEnv/libmcenv_tcpipinstance.hpp
@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __LIBMCDRIVER_TCPIPINSTANCE
 #define __LIBMCDRIVER_TCPIPINSTANCE
 
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <memory>
diff --git a/Implementation/UI/amc_ui_frontenddefinition.hpp b/Implementation/UI/amc_ui_frontenddefinition.hpp
index 5c8220631..c88826847 100644
--- a/Implementation/UI/amc_ui_frontenddefinition.hpp
+++ b/Implementation/UI/amc_ui_frontenddefinition.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_FRONTENDDEFINITION
 #define __AMC_UI_FRONTENDDEFINITION
 
+#include <cstdint>
 #include "common_chrono.hpp"
 
 #include "amc_ui_expression.hpp"
diff --git a/Implementation/UI/amc_ui_interfaces.hpp b/Implementation/UI/amc_ui_interfaces.hpp
index d890503cd..9a1ecf1c4 100644
--- a/Implementation/UI/amc_ui_interfaces.hpp
+++ b/Implementation/UI/amc_ui_interfaces.hpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_INTERFACES
 #define __AMC_UI_INTERFACES
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 namespace AMC {
diff --git a/Implementation/UI/amc_ui_module.hpp b/Implementation/UI/amc_ui_module.hpp
index 52893ed93..87cfad5d6 100644
--- a/Implementation/UI/amc_ui_module.hpp
+++ b/Implementation/UI/amc_ui_module.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE
 #define __AMC_UI_MODULE
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_content.hpp b/Implementation/UI/amc_ui_module_content.hpp
index e15889d05..8d987ce42 100644
--- a/Implementation/UI/amc_ui_module_content.hpp
+++ b/Implementation/UI/amc_ui_module_content.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENT
 #define __AMC_UI_MODULE_CONTENT
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem.hpp b/Implementation/UI/amc_ui_module_contentitem.hpp
index bfedf65f5..56f59475b 100644
--- a/Implementation/UI/amc_ui_module_contentitem.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM
 #define __AMC_UI_MODULE_CONTENTITEM
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_alertlist.hpp b/Implementation/UI/amc_ui_module_contentitem_alertlist.hpp
index 4915aa38c..3a7c75fa7 100644
--- a/Implementation/UI/amc_ui_module_contentitem_alertlist.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_alertlist.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_ALERTLIST
 #define __AMC_UI_MODULE_CONTENTITEM_ALERTLIST
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_buildlist.hpp b/Implementation/UI/amc_ui_module_contentitem_buildlist.hpp
index c68f468c6..8f88e7aab 100644
--- a/Implementation/UI/amc_ui_module_contentitem_buildlist.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_buildlist.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_BUILDLIST
 #define __AMC_UI_MODULE_CONTENTITEM_BUILDLIST
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_buttongroup.hpp b/Implementation/UI/amc_ui_module_contentitem_buttongroup.hpp
index a4f7a3394..83e00e740 100644
--- a/Implementation/UI/amc_ui_module_contentitem_buttongroup.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_buttongroup.hpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_BUTTONGROUP
 #define __AMC_UI_MODULE_CONTENTITEM_BUTTONGROUP
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_chart.hpp b/Implementation/UI/amc_ui_module_contentitem_chart.hpp
index dfc4194b4..0fedeb149 100644
--- a/Implementation/UI/amc_ui_module_contentitem_chart.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_chart.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_CHART
 #define __AMC_UI_MODULE_CONTENTITEM_CHART
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_configurationlist.hpp b/Implementation/UI/amc_ui_module_contentitem_configurationlist.hpp
index 5ba06d84c..7952b0954 100644
--- a/Implementation/UI/amc_ui_module_contentitem_configurationlist.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_configurationlist.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_CONFIGURATIONLIST
 #define __AMC_UI_MODULE_CONTENTITEM_CONFIGURATIONLIST
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_executionlist.hpp b/Implementation/UI/amc_ui_module_contentitem_executionlist.hpp
index 86d5aaca7..345c368a3 100644
--- a/Implementation/UI/amc_ui_module_contentitem_executionlist.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_executionlist.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_EXECUTIONLIST
 #define __AMC_UI_MODULE_CONTENTITEM_EXECUTIONLIST
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_form.hpp b/Implementation/UI/amc_ui_module_contentitem_form.hpp
index c48353a26..b7b14d37c 100644
--- a/Implementation/UI/amc_ui_module_contentitem_form.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_form.hpp
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_FORM
 #define __AMC_UI_MODULE_CONTENTITEM_FORM
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_image.hpp b/Implementation/UI/amc_ui_module_contentitem_image.hpp
index d7d7df8cc..640ee9726 100644
--- a/Implementation/UI/amc_ui_module_contentitem_image.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_image.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_IMAGE
 #define __AMC_UI_MODULE_CONTENTITEM_IMAGE
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_paragraph.hpp b/Implementation/UI/amc_ui_module_contentitem_paragraph.hpp
index a39f9dfb2..5e767843d 100644
--- a/Implementation/UI/amc_ui_module_contentitem_paragraph.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_paragraph.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_PARAGRAPH
 #define __AMC_UI_MODULE_CONTENTITEM_PARAGRAPH
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_parameterlist.hpp b/Implementation/UI/amc_ui_module_contentitem_parameterlist.hpp
index 8b9d715e0..868244ba1 100644
--- a/Implementation/UI/amc_ui_module_contentitem_parameterlist.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_parameterlist.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_PARAMETERLIST
 #define __AMC_UI_MODULE_CONTENTITEM_PARAMETERLIST
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_statemachinegraph.hpp b/Implementation/UI/amc_ui_module_contentitem_statemachinegraph.hpp
index 203e5f309..5abcc3643 100644
--- a/Implementation/UI/amc_ui_module_contentitem_statemachinegraph.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_statemachinegraph.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_STATEMACHINEGRAPH
 #define __AMC_UI_MODULE_CONTENTITEM_STATEMACHINEGRAPH
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_upload.hpp b/Implementation/UI/amc_ui_module_contentitem_upload.hpp
index 5bf22f084..9c9e46708 100644
--- a/Implementation/UI/amc_ui_module_contentitem_upload.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_upload.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_UPLOAD
 #define __AMC_UI_MODULE_CONTENTITEM_UPLOAD
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_contentitem_videostream.hpp b/Implementation/UI/amc_ui_module_contentitem_videostream.hpp
index f555a25c3..bf5f426eb 100644
--- a/Implementation/UI/amc_ui_module_contentitem_videostream.hpp
+++ b/Implementation/UI/amc_ui_module_contentitem_videostream.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CONTENTITEM_VIDEOSTREAM
 #define __AMC_UI_MODULE_CONTENTITEM_VIDEOSTREAM
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_custom.hpp b/Implementation/UI/amc_ui_module_custom.hpp
index 8a3e88328..7b09a971f 100644
--- a/Implementation/UI/amc_ui_module_custom.hpp
+++ b/Implementation/UI/amc_ui_module_custom.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CUSTOM
 #define __AMC_UI_MODULE_CUSTOM
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_customitem.hpp b/Implementation/UI/amc_ui_module_customitem.hpp
index a53d87d78..cf65b0d62 100644
--- a/Implementation/UI/amc_ui_module_customitem.hpp
+++ b/Implementation/UI/amc_ui_module_customitem.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_CUSTOMITEM
 #define __AMC_UI_MODULE_CUSTOMITEM
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_glscene.hpp b/Implementation/UI/amc_ui_module_glscene.hpp
index c41310ff8..e3cb40154 100644
--- a/Implementation/UI/amc_ui_module_glscene.hpp
+++ b/Implementation/UI/amc_ui_module_glscene.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_GLSCENE
 #define __AMC_UI_MODULE_GLSCENE
 
+#include <cstdint>
 #include "header_protection.hpp"
 #include "amc_ui_module_item.hpp"
 
diff --git a/Implementation/UI/amc_ui_module_graphic.hpp b/Implementation/UI/amc_ui_module_graphic.hpp
index 2f919d55c..2e7a48047 100644
--- a/Implementation/UI/amc_ui_module_graphic.hpp
+++ b/Implementation/UI/amc_ui_module_graphic.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_GRAPHIC
 #define __AMC_UI_MODULE_GRAPHIC
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_graphicitem.hpp b/Implementation/UI/amc_ui_module_graphicitem.hpp
index 2a2c26171..c657ab5c6 100644
--- a/Implementation/UI/amc_ui_module_graphicitem.hpp
+++ b/Implementation/UI/amc_ui_module_graphicitem.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_GRAPHICITEM
 #define __AMC_UI_MODULE_GRAPHICITEM
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_graphicitem_image.hpp b/Implementation/UI/amc_ui_module_graphicitem_image.hpp
index 71ac2cf06..fb53d0f8b 100644
--- a/Implementation/UI/amc_ui_module_graphicitem_image.hpp
+++ b/Implementation/UI/amc_ui_module_graphicitem_image.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_GRAPHICITEM_IMAGE
 #define __AMC_UI_MODULE_GRAPHICITEM_IMAGE
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_graphicitem_svgimage.hpp b/Implementation/UI/amc_ui_module_graphicitem_svgimage.hpp
index 9e5868f03..5c6bfd2f8 100644
--- a/Implementation/UI/amc_ui_module_graphicitem_svgimage.hpp
+++ b/Implementation/UI/amc_ui_module_graphicitem_svgimage.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_GRAPHICITEM_SVGIMAGE
 #define __AMC_UI_MODULE_GRAPHICITEM_SVGIMAGE
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_grid.hpp b/Implementation/UI/amc_ui_module_grid.hpp
index 4c1b17e10..b08e0fb4d 100644
--- a/Implementation/UI/amc_ui_module_grid.hpp
+++ b/Implementation/UI/amc_ui_module_grid.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_GRID
 #define __AMC_UI_MODULE_GRID
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_layerview.hpp b/Implementation/UI/amc_ui_module_layerview.hpp
index ee8fcd093..06a2589c4 100644
--- a/Implementation/UI/amc_ui_module_layerview.hpp
+++ b/Implementation/UI/amc_ui_module_layerview.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_LAYERVIEW
 #define __AMC_UI_MODULE_LAYERVIEW
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_logs.hpp b/Implementation/UI/amc_ui_module_logs.hpp
index 30db23eaa..1fe8dbd93 100644
--- a/Implementation/UI/amc_ui_module_logs.hpp
+++ b/Implementation/UI/amc_ui_module_logs.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_LOGS
 #define __AMC_UI_MODULE_LOGS
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_module_tabs.hpp b/Implementation/UI/amc_ui_module_tabs.hpp
index 3a0d970a2..546337b14 100644
--- a/Implementation/UI/amc_ui_module_tabs.hpp
+++ b/Implementation/UI/amc_ui_module_tabs.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_MODULE_TABS
 #define __AMC_UI_MODULE_TABS
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_MODULE
diff --git a/Implementation/UI/amc_ui_page.hpp b/Implementation/UI/amc_ui_page.hpp
index ed7f7825b..a91d31587 100644
--- a/Implementation/UI/amc_ui_page.hpp
+++ b/Implementation/UI/amc_ui_page.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_PAGE
 #define __AMC_UI_PAGE
 
+#include <cstdint>
 #include "header_protection.hpp"
 
 #ifndef __AMCIMPL_UI_PAGE
diff --git a/Implementation/UI/amc_ui_systemstate.hpp b/Implementation/UI/amc_ui_systemstate.hpp
index 172949522..97c4f77f1 100644
--- a/Implementation/UI/amc_ui_systemstate.hpp
+++ b/Implementation/UI/amc_ui_systemstate.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AMC_UI_SYSTEMSTATE
 #define __AMC_UI_SYSTEMSTATE
 
+#include <cstdint>
 #include "header_protection.hpp"
 #include "header_pugixml.hpp"
 #include "common_chrono.hpp"
diff --git a/Implementation/UnitTest/amc_unittest_io.hpp b/Implementation/UnitTest/amc_unittest_io.hpp
index 90e683ce6..1a855e914 100644
--- a/Implementation/UnitTest/amc_unittest_io.hpp
+++ b/Implementation/UnitTest/amc_unittest_io.hpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __AMCTEST_UNITTEST_IO
 
 
+#include <cstdint>
 #include <string>
 #include <memory>