diff --git a/include/boost/phoenix/core/actor.hpp b/include/boost/phoenix/core/actor.hpp
index e058365..bdaf082 100644
--- a/include/boost/phoenix/core/actor.hpp
+++ b/include/boost/phoenix/core/actor.hpp
@@ -122,10 +122,10 @@ namespace boost { namespace phoenix
     /**/
  
 #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES)
-#include <boost/phoenix/core/preprocessed/actor.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/assign.hpp>
 #else
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "preprocessed/actor_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "detail/cpp03/preprocessed/assign_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 /*==============================================================================
     Copyright (c) 2005-2010 Joel de Guzman
diff --git a/include/boost/phoenix/core/argument.hpp b/include/boost/phoenix/core/argument.hpp
index 1d2c2b9..2421001 100644
--- a/include/boost/phoenix/core/argument.hpp
+++ b/include/boost/phoenix/core/argument.hpp
@@ -71,7 +71,7 @@ namespace boost { namespace phoenix
 
 #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES)
 
-#include <boost/phoenix/core/preprocessed/argument.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument.hpp>
 
 #else
 
@@ -80,7 +80,7 @@ namespace boost { namespace phoenix
 #else
 
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "preprocessed/argument_predefined_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "detail/cpp03/preprocessed/argument_predefined_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 /*==============================================================================
     Copyright (c) 2001-2010 Joel de Guzman
@@ -111,7 +111,7 @@ namespace boost { namespace phoenix
 #endif
 
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "preprocessed/argument_no_predefined_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "detail/cpp03/preprocessed/argument_no_predefined_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 /*==============================================================================
     Copyright (c) 2001-2010 Joel de Guzman
diff --git a/include/boost/phoenix/core/detail/actor_operator.hpp b/include/boost/phoenix/core/detail/actor_operator.hpp
index d349a5b..9f26d04 100644
--- a/include/boost/phoenix/core/detail/actor_operator.hpp
+++ b/include/boost/phoenix/core/detail/actor_operator.hpp
@@ -5,7 +5,7 @@
 
 #include <boost/phoenix/support/iterate.hpp>
 
-#include <boost/phoenix/core/detail/preprocessed/actor_operator.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_operator.hpp>
 
 #endif
 #else
@@ -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: "preprocessed/actor_operator_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "cpp03/preprocessed/actor_operator_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 /*==============================================================================
     Copyright (c) 2005-2010 Joel de Guzman
diff --git a/include/boost/phoenix/core/detail/actor_result_of.hpp b/include/boost/phoenix/core/detail/actor_result_of.hpp
index 3766c09..b6907ba 100644
--- a/include/boost/phoenix/core/detail/actor_result_of.hpp
+++ b/include/boost/phoenix/core/detail/actor_result_of.hpp
@@ -5,7 +5,7 @@
 
 #include <boost/phoenix/support/iterate.hpp>
 
-#include <boost/phoenix/core/detail/preprocessed/actor_result_of.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of.hpp>
 
 #endif
 #else
@@ -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: "preprocessed/actor_result_of_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "cpp03/preprocessed/actor_result_of_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 
 /*==============================================================================
diff --git a/include/boost/phoenix/core/detail/call.hpp b/include/boost/phoenix/core/detail/call.hpp
index 1c264a7..4444034 100644
--- a/include/boost/phoenix/core/detail/call.hpp
+++ b/include/boost/phoenix/core/detail/call.hpp
@@ -3,7 +3,7 @@
 #ifndef BOOST_PHOENIX_CORE_DETAIL_CALL_HPP
 #define BOOST_PHOENIX_CORE_DETAIL_CALL_HPP
 
-#include <boost/phoenix/core/detail/preprocessed/call.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/call.hpp>
 
 #endif
 #else
@@ -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: "preprocessed/call_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "cpp03/preprocessed/call_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 
 /*==============================================================================
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_operator.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator.hpp
similarity index 64%
rename from include/boost/phoenix/core/detail/preprocessed/actor_operator.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator.hpp
index d79c6ea..7357b67 100644
--- a/include/boost/phoenix/core/detail/preprocessed/actor_operator.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator.hpp
@@ -9,15 +9,15 @@
 #define BOOST_PHOENIX_PREPROCESSED_ACTOR_OPERATOR
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/detail/preprocessed/actor_operator_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/detail/preprocessed/actor_operator_20.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/detail/preprocessed/actor_operator_30.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/detail/preprocessed/actor_operator_40.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/detail/preprocessed/actor_operator_50.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_operator_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_operator_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_10.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_operator_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_operator_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_20.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_operator_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_operator_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_30.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_operator_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_operator_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_40.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_operator_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_operator_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_operator_50.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_result_of.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of.hpp
similarity index 64%
rename from include/boost/phoenix/core/detail/preprocessed/actor_result_of.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of.hpp
index 7db720f..191b769 100644
--- a/include/boost/phoenix/core/detail/preprocessed/actor_result_of.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of.hpp
@@ -9,15 +9,15 @@
 #define BOOST_PHOENIX_PREPROCESSED_ACTOR_RESULT_OF
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/detail/preprocessed/actor_result_of_20.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/detail/preprocessed/actor_result_of_30.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/detail/preprocessed/actor_result_of_40.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/detail/preprocessed/actor_result_of_50.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_10.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_result_of_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_result_of_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_20.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_result_of_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_result_of_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_30.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_result_of_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_result_of_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_40.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/actor_result_of_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/actor_result_of_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/actor_result_of_50.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument.hpp
similarity index 54%
rename from include/boost/phoenix/core/preprocessed/argument.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument.hpp
index 7c0cf81..e32e641 100644
--- a/include/boost/phoenix/core/preprocessed/argument.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument.hpp
@@ -11,15 +11,15 @@
 #ifndef BOOST_PHOENIX_NO_PREDEFINED_TERMINALS
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/preprocessed/argument_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/preprocessed/argument_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/preprocessed/argument_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/preprocessed/argument_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/preprocessed/argument_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
@@ -27,15 +27,15 @@
 #else
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/preprocessed/argument_no_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/preprocessed/argument_no_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/preprocessed/argument_no_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/preprocessed/argument_no_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/preprocessed/argument_no_predefined_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/preprocessed/argument_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_10.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_no_predefined_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_no_predefined_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_10.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_no_predefined_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_no_predefined_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_20.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_no_predefined_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_no_predefined_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_30.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_no_predefined_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_no_predefined_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_40.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_no_predefined_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_no_predefined_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_no_predefined_50.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_predefined_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_predefined_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_10.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_predefined_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_predefined_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_20.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_predefined_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_predefined_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_30.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_predefined_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_predefined_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_40.hpp
diff --git a/include/boost/phoenix/core/preprocessed/argument_predefined_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/argument_predefined_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_50.hpp
diff --git a/include/boost/phoenix/core/preprocessed/actor.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/assign.hpp
similarity index 56%
rename from include/boost/phoenix/core/preprocessed/actor.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/assign.hpp
index e19086b..7c1e6ab 100644
--- a/include/boost/phoenix/core/preprocessed/actor.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/assign.hpp
@@ -5,19 +5,19 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_PHOENIX_PREPROCESSED_CORE_ACTOR_HPP)
-#define BOOST_PHOENIX_PREPROCESSED_CORE_ACTOR_HPP
+#if !defined(BOOST_PHOENIX_PREPROCESSED_CORE_ASSIGN_HPP)
+#define BOOST_PHOENIX_PREPROCESSED_CORE_ASSIGN_HPP
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/preprocessed/actor_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/assign_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/preprocessed/actor_20.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/assign_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/preprocessed/actor_30.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/assign_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/preprocessed/actor_40.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/assign_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/preprocessed/actor_50.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/assign_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/preprocessed/actor_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/assign_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/actor_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/assign_10.hpp
diff --git a/include/boost/phoenix/core/preprocessed/actor_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/assign_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/actor_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/assign_20.hpp
diff --git a/include/boost/phoenix/core/preprocessed/actor_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/assign_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/actor_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/assign_30.hpp
diff --git a/include/boost/phoenix/core/preprocessed/actor_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/assign_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/actor_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/assign_40.hpp
diff --git a/include/boost/phoenix/core/preprocessed/actor_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/assign_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/actor_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/assign_50.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/call.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/call.hpp
similarity index 67%
rename from include/boost/phoenix/core/detail/preprocessed/call.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/call.hpp
index ce0667f..e859d1b 100644
--- a/include/boost/phoenix/core/detail/preprocessed/call.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/call.hpp
@@ -9,15 +9,15 @@
 #define BOOST_PHOENIX_PREPROCESSED_CALL
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/detail/preprocessed/call_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/call_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/detail/preprocessed/call_20.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/call_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/detail/preprocessed/call_30.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/call_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/detail/preprocessed/call_40.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/call_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/detail/preprocessed/call_50.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/call_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/detail/preprocessed/call_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/call_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/call_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/call_10.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/call_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/call_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/call_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/call_20.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/call_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/call_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/call_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/call_30.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/call_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/call_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/call_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/call_40.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/call_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/call_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/call_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/call_50.hpp
diff --git a/include/boost/phoenix/core/preprocessed/expression.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/expression.hpp
similarity index 65%
rename from include/boost/phoenix/core/preprocessed/expression.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/expression.hpp
index 9e9393c..1ad8660 100644
--- a/include/boost/phoenix/core/preprocessed/expression.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/expression.hpp
@@ -9,15 +9,15 @@
 #define BOOST_PHOENIX_PREPROCESSED_EXPRESSION
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/preprocessed/expression_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/expression_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/preprocessed/expression_20.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/expression_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/preprocessed/expression_30.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/expression_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/preprocessed/expression_40.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/expression_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/preprocessed/expression_50.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/expression_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/preprocessed/expression_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/expression_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/expression_10.hpp
diff --git a/include/boost/phoenix/core/preprocessed/expression_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/expression_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/expression_20.hpp
diff --git a/include/boost/phoenix/core/preprocessed/expression_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/expression_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/expression_30.hpp
diff --git a/include/boost/phoenix/core/preprocessed/expression_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/expression_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/expression_40.hpp
diff --git a/include/boost/phoenix/core/preprocessed/expression_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/expression_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/expression_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/expression_50.hpp
diff --git a/include/boost/phoenix/core/preprocessed/function_equal.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal.hpp
similarity index 65%
rename from include/boost/phoenix/core/preprocessed/function_equal.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal.hpp
index 1b3a115..fa7a394 100644
--- a/include/boost/phoenix/core/preprocessed/function_equal.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal.hpp
@@ -9,15 +9,15 @@
 #define BOOST_PHOENIX_PREPROCESSED_CORE_FUNCTION_EQUAL_HPP
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/preprocessed/function_equal_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_equal_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/preprocessed/function_equal_20.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_equal_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/preprocessed/function_equal_30.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_equal_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/preprocessed/function_equal_40.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_equal_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/preprocessed/function_equal_50.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_equal_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/preprocessed/function_equal_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/function_equal_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_10.hpp
diff --git a/include/boost/phoenix/core/preprocessed/function_equal_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/function_equal_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_20.hpp
diff --git a/include/boost/phoenix/core/preprocessed/function_equal_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/function_equal_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_30.hpp
diff --git a/include/boost/phoenix/core/preprocessed/function_equal_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/function_equal_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_40.hpp
diff --git a/include/boost/phoenix/core/preprocessed/function_equal_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/preprocessed/function_equal_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_equal_50.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/function_eval.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval.hpp
similarity index 65%
rename from include/boost/phoenix/core/detail/preprocessed/function_eval.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval.hpp
index dc73352..a7b1288 100644
--- a/include/boost/phoenix/core/detail/preprocessed/function_eval.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval.hpp
@@ -9,15 +9,15 @@
 #define BOOST_PHOENIX_PREPROCESSED_CORE_DETAIL_FUNCTION_EVAL_HPP
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/detail/preprocessed/function_eval_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_eval_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/detail/preprocessed/function_eval_20.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_eval_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/detail/preprocessed/function_eval_30.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_eval_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/detail/preprocessed/function_eval_40.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_eval_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/detail/preprocessed/function_eval_50.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_eval_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/detail/preprocessed/function_eval_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/function_eval_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_10.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/function_eval_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/function_eval_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_20.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/function_eval_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/function_eval_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_30.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/function_eval_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/function_eval_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_40.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/function_eval_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/function_eval_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/function_eval_50.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/phx2_result.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result.hpp
similarity index 66%
rename from include/boost/phoenix/core/detail/preprocessed/phx2_result.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result.hpp
index 5e93465..9824036 100644
--- a/include/boost/phoenix/core/detail/preprocessed/phx2_result.hpp
+++ b/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result.hpp
@@ -9,15 +9,15 @@
 #define BOOST_PHOENIX_PREPROCESSED_CORE_DETAIL_PHX2_RESULT_HPP
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/core/detail/preprocessed/phx2_result_10.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/core/detail/preprocessed/phx2_result_20.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/core/detail/preprocessed/phx2_result_30.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/core/detail/preprocessed/phx2_result_40.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/core/detail/preprocessed/phx2_result_50.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/include/boost/phoenix/core/detail/preprocessed/phx2_result_10.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_10.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/phx2_result_10.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_10.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/phx2_result_20.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_20.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/phx2_result_20.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_20.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/phx2_result_30.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_30.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/phx2_result_30.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_30.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/phx2_result_40.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_40.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/phx2_result_40.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_40.hpp
diff --git a/include/boost/phoenix/core/detail/preprocessed/phx2_result_50.hpp b/include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_50.hpp
similarity index 100%
rename from include/boost/phoenix/core/detail/preprocessed/phx2_result_50.hpp
rename to include/boost/phoenix/core/detail/cpp03/preprocessed/phx2_result_50.hpp
diff --git a/include/boost/phoenix/core/detail/function_eval.hpp b/include/boost/phoenix/core/detail/function_eval.hpp
index 6ffea2b..8a47d19 100644
--- a/include/boost/phoenix/core/detail/function_eval.hpp
+++ b/include/boost/phoenix/core/detail/function_eval.hpp
@@ -11,7 +11,7 @@
 #include <boost/phoenix/core/detail/phx2_result.hpp>
 #include <boost/utility/result_of.hpp>
 
-#include <boost/phoenix/core/detail/preprocessed/function_eval.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_eval.hpp>
 
 #endif
 #else
@@ -30,7 +30,7 @@
 #include <boost/utility/result_of.hpp>
 
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "preprocessed/function_eval_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "cpp03/preprocessed/function_eval_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 /*=============================================================================
     Copyright (c) 2001-2007 Joel de Guzman
diff --git a/include/boost/phoenix/core/detail/phx2_result.hpp b/include/boost/phoenix/core/detail/phx2_result.hpp
index 3f7f485..748e79e 100644
--- a/include/boost/phoenix/core/detail/phx2_result.hpp
+++ b/include/boost/phoenix/core/detail/phx2_result.hpp
@@ -41,10 +41,10 @@ namespace boost { namespace phoenix {
         template <typename F, BOOST_PHOENIX_typename_A_void(BOOST_PP_DEC(BOOST_PHOENIX_COMPOSITE_LIMIT)), typename Dummy = void>
         struct phx2_result;
 #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES)
-#include <boost/phoenix/core/detail/preprocessed/phx2_result.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/phx2_result.hpp>
 #else
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "preprocessed/phx2_result_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "cpp03/preprocessed/phx2_result_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 /*=============================================================================
     Copyright (c) 2011 Thomas Heller
diff --git a/include/boost/phoenix/core/expression.hpp b/include/boost/phoenix/core/expression.hpp
index c693252..d5a00f0 100644
--- a/include/boost/phoenix/core/expression.hpp
+++ b/include/boost/phoenix/core/expression.hpp
@@ -18,12 +18,12 @@
 
 #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES)
 
-#include <boost/phoenix/core/preprocessed/expression.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/expression.hpp>
 
 #else
 
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "preprocessed/expression_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "detail/cpp03/preprocessed/expression_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 
 /*=============================================================================
diff --git a/include/boost/phoenix/core/function_equal.hpp b/include/boost/phoenix/core/function_equal.hpp
index fc1de80..705b295 100644
--- a/include/boost/phoenix/core/function_equal.hpp
+++ b/include/boost/phoenix/core/function_equal.hpp
@@ -104,10 +104,10 @@ namespace boost { namespace phoenix
 
             private:
 #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES)
-#include <boost/phoenix/core/preprocessed/function_equal.hpp>
+#include <boost/phoenix/core/detail/cpp03/preprocessed/function_equal.hpp>
 #else
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
-#pragma wave option(preserve: 2, line: 0, output: "preprocessed/function_equal_" BOOST_PHOENIX_LIMIT_STR ".hpp")
+#pragma wave option(preserve: 2, line: 0, output: "detail/cpp03/preprocessed/function_equal_" BOOST_PHOENIX_LIMIT_STR ".hpp")
 #endif
 /*==============================================================================
     Copyright (c) 2001-2010 Joel de Guzman