diff --git a/include/etl/generators/message_router_cpp03_generator.h b/include/etl/generators/message_router_cpp03_generator.h
index d001e0c5..1d5aebf5 100644
--- a/include/etl/generators/message_router_cpp03_generator.h
+++ b/include/etl/generators/message_router_cpp03_generator.h
@@ -103,7 +103,7 @@ SOFTWARE.
     cog.outl("  {")
     cog.outl("    const etl::message_id_t id = msg.get_message_id();")
     cog.outl("")
-    cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+    cog.outl("#include \"diagnostic_array_bounds_push.h\"")
     cog.outl("    switch (id)")
     cog.outl("    {")
     for n in range(1, int(Handlers) + 1):
@@ -123,7 +123,7 @@ SOFTWARE.
     cog.outl("         break;")
     cog.outl("      }")
     cog.outl("    }")
-    cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("  }")
     cog.outl("")
     cog.outl("  template <typename TMessage>")
@@ -133,9 +133,9 @@ SOFTWARE.
     cog.outl("T%s>::value, void>::type" % int(Handlers))
     cog.outl("    receive(const TMessage& msg)")
     cog.outl("  {")
-    cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+    cog.outl("#include \"diagnostic_array_bounds_push.h\"")
     cog.outl("    static_cast<TDerived*>(this)->on_receive(msg);")
-    cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("  }")
     cog.outl("")
     cog.outl("  template <typename TMessage>")
@@ -151,9 +151,9 @@ SOFTWARE.
     cog.outl("    }")
     cog.outl("    else")
     cog.outl("    {")
-    cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+    cog.outl("#include \"diagnostic_array_bounds_push.h\"")
     cog.outl("      static_cast<TDerived*>(this)->on_receive_unknown(msg);")
-    cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("    }")
     cog.outl("  }")
     cog.outl("")
@@ -288,7 +288,7 @@ SOFTWARE.
         cog.outl("  {")
         cog.outl("    const etl::message_id_t id = msg.get_message_id();")
         cog.outl("")
-        cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+        cog.outl("#include \"diagnostic_array_bounds_push.h\"")
         cog.outl("    switch (id)")
         cog.outl("    {")
         for t in range(1, n + 1):
@@ -308,7 +308,7 @@ SOFTWARE.
         cog.outl("         break;")
         cog.outl("      }")
         cog.outl("    }")
-        cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("  }")
         cog.outl("")
         cog.outl("  template <typename TMessage>")
@@ -318,9 +318,9 @@ SOFTWARE.
         cog.outl("T%s>::value, void>::type" % n)
         cog.outl("    receive(const TMessage& msg)")
         cog.outl("  {")
-        cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+        cog.outl("#include \"diagnostic_array_bounds_push.h\"")
         cog.outl("    static_cast<TDerived*>(this)->on_receive(msg);")
-        cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("  }")
         cog.outl("")
         cog.outl("  template <typename TMessage>")
@@ -336,9 +336,9 @@ SOFTWARE.
         cog.outl("    }")
         cog.outl("    else")
         cog.outl("    {")
-        cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+        cog.outl("#include \"diagnostic_array_bounds_push.h\"")
         cog.outl("      static_cast<TDerived*>(this)->on_receive_unknown(msg);")
-        cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("    }")
         cog.outl("  }")
         cog.outl("")
@@ -440,12 +440,12 @@ public:
 
   void receive(const etl::imessage& msg) ETL_OVERRIDE
   {
-#include "private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     if (has_successor())
     {
       get_successor().receive(msg);
     }
-#include "private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   //**********************************************
diff --git a/include/etl/private/message_router_cpp03.h b/include/etl/private/message_router_cpp03.h
index 12dafdc0..cb8c3bd0 100644
--- a/include/etl/private/message_router_cpp03.h
+++ b/include/etl/private/message_router_cpp03.h
@@ -84,7 +84,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -116,16 +116,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -138,9 +138,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -239,7 +239,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -270,16 +270,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -292,9 +292,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -394,7 +394,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -424,16 +424,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -446,9 +446,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -548,7 +548,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -577,16 +577,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -599,9 +599,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -700,7 +700,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -728,16 +728,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -750,9 +750,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -851,7 +851,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -878,16 +878,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -900,9 +900,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -1001,7 +1001,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -1027,16 +1027,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -1049,9 +1049,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -1150,7 +1150,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -1175,16 +1175,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -1197,9 +1197,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -1297,7 +1297,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -1321,16 +1321,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -1343,9 +1343,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -1443,7 +1443,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -1466,16 +1466,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -1488,9 +1488,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -1587,7 +1587,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -1609,16 +1609,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -1631,9 +1631,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -1730,7 +1730,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -1751,16 +1751,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -1773,9 +1773,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -1871,7 +1871,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -1891,16 +1891,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -1913,9 +1913,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -2011,7 +2011,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -2030,16 +2030,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -2052,9 +2052,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -2150,7 +2150,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -2168,16 +2168,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -2190,9 +2190,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -2288,7 +2288,7 @@ public:
   {
     const etl::message_id_t id = msg.get_message_id();
 
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     switch (id)
     {
       case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
@@ -2305,16 +2305,16 @@ public:
          break;
       }
     }
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
   typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1>::value, void>::type
     receive(const TMessage& msg)
   {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   template <typename TMessage>
@@ -2327,9 +2327,9 @@ public:
     }
     else
     {
-#include "etl/private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
       static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
     }
   }
 
@@ -2422,12 +2422,12 @@ public:
 
   void receive(const etl::imessage& msg) ETL_OVERRIDE
   {
-#include "private/diagnostic_array_bounds_push.h"
+#include "diagnostic_array_bounds_push.h"
     if (has_successor())
     {
       get_successor().receive(msg);
     }
-#include "private/diagnostic_pop.h"
+#include "diagnostic_pop.h"
   }
 
   //**********************************************