diff --git a/include/etl/base64.h b/include/etl/base64.h
index 21b2641b2..4034248d6 100644
--- a/include/etl/base64.h
+++ b/include/etl/base64.h
@@ -26,13 +26,13 @@ SOFTWARE.
 #ifndef ETL_BASE64_INCLUDED
 #define ETL_BASE64_INCLUDED
 
-#include "etl/platform.h"
-#include "etl/static_assert.h"
-#include "etl/exception.h"
-#include "etl/error_handler.h"
-#include "etl/type_traits.h"
-#include "etl/enum_type.h"
-#include "etl/integral_limits.h"
+#include "platform.h"
+#include "static_assert.h"
+#include "exception.h"
+#include "error_handler.h"
+#include "type_traits.h"
+#include "enum_type.h"
+#include "integral_limits.h"
 
 #include <stdint.h>
 
diff --git a/include/etl/base64_decoder.h b/include/etl/base64_decoder.h
index 5ccc98a6b..848c7e359 100644
--- a/include/etl/base64_decoder.h
+++ b/include/etl/base64_decoder.h
@@ -28,19 +28,19 @@ SOFTWARE.
 #ifndef ETL_BASE64_DECODER_INCLUDED
 #define ETL_BASE64_DECODER_INCLUDED
 
-#include "etl/platform.h"
-#include "etl/static_assert.h"
-#include "etl/error_handler.h"
-#include "etl/type_traits.h"
-#include "etl/binary.h"
-#include "etl/algorithm.h"
-#include "etl/integral_limits.h"
-#include "etl/iterator.h"
-#include "etl/enum_type.h"
-#include "etl/delegate.h"
-#include "etl/span.h"
-
-#include "etl/base64.h"
+#include "platform.h"
+#include "static_assert.h"
+#include "error_handler.h"
+#include "type_traits.h"
+#include "binary.h"
+#include "algorithm.h"
+#include "integral_limits.h"
+#include "iterator.h"
+#include "enum_type.h"
+#include "delegate.h"
+#include "span.h"
+
+#include "base64.h"
 
 #include <stdint.h>
 
diff --git a/include/etl/base64_encoder.h b/include/etl/base64_encoder.h
index 4f6ea0b7d..cf4735e2e 100644
--- a/include/etl/base64_encoder.h
+++ b/include/etl/base64_encoder.h
@@ -28,19 +28,19 @@ SOFTWARE.
 #ifndef ETL_BASE64_ENCODER_INCLUDED
 #define ETL_BASE64_ENCODER_INCLUDED
 
-#include "etl/platform.h"
-#include "etl/static_assert.h"
-#include "etl/error_handler.h"
-#include "etl/type_traits.h"
-#include "etl/binary.h"
-#include "etl/algorithm.h"
-#include "etl/integral_limits.h"
-#include "etl/iterator.h"
-#include "etl/enum_type.h"
-#include "etl/delegate.h"
-#include "etl/span.h"
-
-#include "etl/base64.h"
+#include "platform.h"
+#include "static_assert.h"
+#include "error_handler.h"
+#include "type_traits.h"
+#include "binary.h"
+#include "algorithm.h"
+#include "integral_limits.h"
+#include "iterator.h"
+#include "enum_type.h"
+#include "delegate.h"
+#include "span.h"
+
+#include "base64.h"
 
 #include <stdint.h>
 
diff --git a/include/etl/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h
index a38cf43ee..84d0aa94e 100644
--- a/include/etl/intrusive_forward_list.h
+++ b/include/etl/intrusive_forward_list.h
@@ -489,9 +489,9 @@ namespace etl
 
       reference operator *() const
       {
-#include "etl/private/diagnostic_null_dereference_push.h"
+#include "private/diagnostic_null_dereference_push.h"
         return *static_cast<pointer>(p_value);
-#include "etl/private/diagnostic_pop.h"
+#include "private/diagnostic_pop.h"
       }
 
       pointer operator &() const
diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h
index 58c976e85..6bbd906f5 100644
--- a/include/etl/intrusive_list.h
+++ b/include/etl/intrusive_list.h
@@ -528,9 +528,9 @@ namespace etl
 
       reference operator *() const
       {
-#include "etl/private/diagnostic_null_dereference_push.h"
+#include "private/diagnostic_null_dereference_push.h"
         return *static_cast<pointer>(p_value);
-#include "etl/private/diagnostic_pop.h"
+#include "private/diagnostic_pop.h"
       }
 
       pointer operator &() const