diff --git a/include/boost/phoenix/core/actor.hpp b/include/boost/phoenix/core/actor.hpp
index 7f22e6c..0db977c 100644
--- a/include/boost/phoenix/core/actor.hpp
+++ b/include/boost/phoenix/core/actor.hpp
@@ -88,7 +88,7 @@ namespace boost { namespace phoenix
     }
 
     // Bring in the result_of::actor<>
-    #include <boost/phoenix/core/detail/actor_result_of.hpp>
+    #include <boost/phoenix/core/detail/cpp03/actor_result_of.hpp>
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -211,7 +211,7 @@ namespace boost { namespace phoenix
         }
         
         // Bring in the rest
-        #include <boost/phoenix/core/detail/actor_operator.hpp>
+        #include <boost/phoenix/core/detail/cpp03/actor_operator.hpp>
     };
 
 }}
diff --git a/include/boost/phoenix/core/call.hpp b/include/boost/phoenix/core/call.hpp
index 3667547..d5ccb2d 100644
--- a/include/boost/phoenix/core/call.hpp
+++ b/include/boost/phoenix/core/call.hpp
@@ -62,7 +62,7 @@ namespace boost { namespace phoenix
         {};
     };
 
-    #include <boost/phoenix/core/detail/call.hpp>
+    #include <boost/phoenix/core/detail/cpp03/call.hpp>
 
 }
     namespace proto
diff --git a/include/boost/phoenix/core/detail/actor_operator.hpp b/include/boost/phoenix/core/detail/cpp03/actor_operator.hpp
similarity index 97%
rename from include/boost/phoenix/core/detail/actor_operator.hpp
rename to include/boost/phoenix/core/detail/cpp03/actor_operator.hpp
index 9f26d04..fb590f5 100644
--- a/include/boost/phoenix/core/detail/actor_operator.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/actor_operator.hpp
@@ -18,7 +18,7 @@
 #include <boost/phoenix/support/iterate.hpp>
 
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "cpp03/preprocessed/actor_operator_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "preprocessed/actor_operator_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 /*==============================================================================
     Copyright (c) 2005-2010 Joel de Guzman
@@ -38,7 +38,7 @@
 
 #define BOOST_PHOENIX_ITERATION_PARAMS                                          \
         (3, (1, BOOST_PHOENIX_ACTOR_LIMIT,                                      \
-        <boost/phoenix/core/detail/actor_operator.hpp>))
+        <boost/phoenix/core/detail/cpp03/actor_operator.hpp>))
 #include BOOST_PHOENIX_ITERATE()
 
 #undef M0
diff --git a/include/boost/phoenix/core/detail/actor_result_of.hpp b/include/boost/phoenix/core/detail/cpp03/actor_result_of.hpp
similarity index 94%
rename from include/boost/phoenix/core/detail/actor_result_of.hpp
rename to include/boost/phoenix/core/detail/cpp03/actor_result_of.hpp
index b6907ba..537ae67 100644
--- a/include/boost/phoenix/core/detail/actor_result_of.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/actor_result_of.hpp
@@ -18,7 +18,7 @@
 #include <boost/phoenix/support/iterate.hpp>
 
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "cpp03/preprocessed/actor_result_of_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "preprocessed/actor_result_of_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 
 /*==============================================================================
@@ -70,7 +70,7 @@
 
 #define BOOST_PHOENIX_ITERATION_PARAMS                                          \
     (3, (1, BOOST_PHOENIX_ACTOR_LIMIT,                                          \
-    <boost/phoenix/core/detail/actor_result_of.hpp>))
+    <boost/phoenix/core/detail/cpp03/actor_result_of.hpp>))
 #include BOOST_PHOENIX_ITERATE()
 
     }
diff --git a/include/boost/phoenix/core/detail/call.hpp b/include/boost/phoenix/core/detail/cpp03/call.hpp
similarity index 94%
rename from include/boost/phoenix/core/detail/call.hpp
rename to include/boost/phoenix/core/detail/cpp03/call.hpp
index 4444034..e06b571 100644
--- a/include/boost/phoenix/core/detail/call.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/call.hpp
@@ -14,7 +14,7 @@
 #define BOOST_PHOENIX_CORE_DETAIL_CALL_HPP
 
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "cpp03/preprocessed/call_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "preprocessed/call_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 
 /*==============================================================================
@@ -45,7 +45,7 @@
     {
 #define BOOST_PHOENIX_ITERATION_PARAMS                                          \
     (3, (1, BOOST_PHOENIX_LIMIT,                                                \
-    <boost/phoenix/core/detail/call.hpp>))
+    <boost/phoenix/core/detail/cpp03/call.hpp>))
 #include BOOST_PHOENIX_ITERATE()
     }