diff --git a/src/MicroOcpp/Core/ConfigurationOptions.h b/src/MicroOcpp/Core/ConfigurationOptions.h
index 0e9e227f..4055bae2 100644
--- a/src/MicroOcpp/Core/ConfigurationOptions.h
+++ b/src/MicroOcpp/Core/ConfigurationOptions.h
@@ -5,6 +5,8 @@
 #ifndef MO_CONFIGURATIONOPTIONS_H
 #define MO_CONFIGURATIONOPTIONS_H
 
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #ifdef __cplusplus
diff --git a/src/MicroOcpp/Core/Configuration_c.h b/src/MicroOcpp/Core/Configuration_c.h
index 94172d07..ab7c06e8 100644
--- a/src/MicroOcpp/Core/Configuration_c.h
+++ b/src/MicroOcpp/Core/Configuration_c.h
@@ -5,6 +5,7 @@
 #ifndef MO_CONFIGURATION_C_H
 #define MO_CONFIGURATION_C_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/MicroOcpp/Model/Certificates/Certificate.h b/src/MicroOcpp/Model/Certificates/Certificate.h
index 33574351..e17fd17d 100644
--- a/src/MicroOcpp/Model/Certificates/Certificate.h
+++ b/src/MicroOcpp/Model/Certificates/Certificate.h
@@ -9,7 +9,9 @@
 
 #if MO_ENABLE_CERT_MGMT
 
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/MicroOcpp/Model/Certificates/CertificateMbedTLS.h b/src/MicroOcpp/Model/Certificates/CertificateMbedTLS.h
index e60a2734..15534da1 100644
--- a/src/MicroOcpp/Model/Certificates/CertificateMbedTLS.h
+++ b/src/MicroOcpp/Model/Certificates/CertificateMbedTLS.h
@@ -9,6 +9,10 @@
  * Built-in implementation of the Certificate interface for MbedTLS
  */
 
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include <MicroOcpp/Version.h>
 #include <MicroOcpp/Platform.h>
 
diff --git a/src/MicroOcpp/Model/Certificates/Certificate_c.h b/src/MicroOcpp/Model/Certificates/Certificate_c.h
index 3b0bc858..c301eca9 100644
--- a/src/MicroOcpp/Model/Certificates/Certificate_c.h
+++ b/src/MicroOcpp/Model/Certificates/Certificate_c.h
@@ -9,7 +9,9 @@
 
 #if MO_ENABLE_CERT_MGMT
 
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <MicroOcpp/Model/Certificates/Certificate.h>
 
diff --git a/src/MicroOcpp/Model/Transactions/Transaction.h b/src/MicroOcpp/Model/Transactions/Transaction.h
index 5dc3e869..0260d664 100644
--- a/src/MicroOcpp/Model/Transactions/Transaction.h
+++ b/src/MicroOcpp/Model/Transactions/Transaction.h
@@ -5,6 +5,10 @@
 #ifndef TRANSACTION_H
 #define TRANSACTION_H
 
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include <MicroOcpp/Version.h>
 
 /* General Tx defs */
diff --git a/src/MicroOcpp_c.h b/src/MicroOcpp_c.h
index a517ff1d..8ffaf59f 100644
--- a/src/MicroOcpp_c.h
+++ b/src/MicroOcpp_c.h
@@ -5,7 +5,9 @@
 #ifndef MO_MICROOCPP_C_H
 #define MO_MICROOCPP_C_H
 
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <MicroOcpp/Core/ConfigurationOptions.h>
 #include <MicroOcpp/Model/ConnectorBase/ChargePointStatus.h>