diff --git a/kernel/ethosu_core_interface.h b/kernel/ethosu_core_interface.h
index a3a21e0..4e7a864 100644
--- a/kernel/ethosu_core_interface.h
+++ b/kernel/ethosu_core_interface.h
@@ -27,6 +27,10 @@
 #include <stdint.h>
 #endif
 
+#ifdef __cplusplus
+namespace EthosU {
+#endif
+
 /** Maximum number of IFM/OFM buffers per inference */
 #define ETHOSU_CORE_BUFFER_MAX 16
 
@@ -143,5 +147,8 @@
 	uint32_t type;     /* optional use of extra error code */
 	char     msg[128];
 };
+#ifdef __cplusplus
+} /*namespace EthosU */
+#endif
 
 #endif
diff --git a/kernel/uapi/ethosu.h b/kernel/uapi/ethosu.h
index 0127033..1e53c91 100644
--- a/kernel/uapi/ethosu.h
+++ b/kernel/uapi/ethosu.h
@@ -28,6 +28,10 @@
 #include <linux/ioctl.h>
 #include <linux/types.h>
 
+#ifdef __cplusplus
+namespace EthosU {
+#endif
+
 /****************************************************************************
  * Defines
  ****************************************************************************/
@@ -148,4 +152,7 @@
 	struct ethosu_uapi_pmu_counts pmu_count;
 };
 
+#ifdef __cplusplus
+} /* namespace EthosU */
+#endif
 #endif