diff --git a/include/boost/fusion/adapted/class/adapt_assoc_class_named.hpp b/include/boost/fusion/adapted/class/adapt_assoc_class_named.hpp
index 81930556..e73b1fe2 100644
--- a/include/boost/fusion/adapted/class/adapt_assoc_class_named.hpp
+++ b/include/boost/fusion/adapted/class/adapt_assoc_class_named.hpp
@@ -14,7 +14,7 @@
 #define BOOST_FUSION_ADAPT_ASSOC_CLASS_NAMED_NS(                                \
     WRAPPED_TYPE, NAMESPACE_SEQ, NAME, ATTRIBUTES)                              \
                                                                                 \
-    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE(                                \
+    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE_IMPL(                           \
         WRAPPED_TYPE,(0)NAMESPACE_SEQ,NAME)                                     \
                                                                                 \
     BOOST_FUSION_ADAPT_ASSOC_CLASS(                                             \
diff --git a/include/boost/fusion/adapted/class/adapt_class_named.hpp b/include/boost/fusion/adapted/class/adapt_class_named.hpp
index 8f7ebfd7..4dec9064 100644
--- a/include/boost/fusion/adapted/class/adapt_class_named.hpp
+++ b/include/boost/fusion/adapted/class/adapt_class_named.hpp
@@ -16,7 +16,7 @@
 #define BOOST_FUSION_ADAPT_CLASS_NAMED_NS(                                      \
     WRAPPED_TYPE, NAMESPACE_SEQ, NAME, ATTRIBUTES)                              \
                                                                                 \
-    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE(                                \
+    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE_IMPL(                           \
         WRAPPED_TYPE,(0)NAMESPACE_SEQ,NAME)                                     \
                                                                                 \
     BOOST_FUSION_ADAPT_CLASS(                                                   \
diff --git a/include/boost/fusion/adapted/struct.hpp b/include/boost/fusion/adapted/struct.hpp
index 9c38bb48..f184a0d3 100644
--- a/include/boost/fusion/adapted/struct.hpp
+++ b/include/boost/fusion/adapted/struct.hpp
@@ -14,5 +14,7 @@
 #include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct_named.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/adapted/struct/define_assoc_struct.hpp>
+#include <boost/fusion/adapted/struct/define_struct.hpp>
 
 #endif
diff --git a/include/boost/fusion/adapted/struct/adapt_assoc_struct_named.hpp b/include/boost/fusion/adapted/struct/adapt_assoc_struct_named.hpp
index 7cefc517..d4c3cdc2 100644
--- a/include/boost/fusion/adapted/struct/adapt_assoc_struct_named.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_assoc_struct_named.hpp
@@ -20,7 +20,7 @@
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_NS(                               \
     WRAPPED_TYPE, NAMESPACE_SEQ, NAME, ATTRIBUTES)                              \
                                                                                 \
-    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE(                                \
+    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE_IMPL(                           \
         WRAPPED_TYPE,(0)NAMESPACE_SEQ,NAME)                                     \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_BASE(                                             \
diff --git a/include/boost/fusion/adapted/struct/adapt_struct_named.hpp b/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
index 86bd8725..37ea1af1 100644
--- a/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_struct_named.hpp
@@ -23,7 +23,7 @@
 #define BOOST_FUSION_ADAPT_STRUCT_NAMED_NS(                                     \
     WRAPPED_TYPE, NAMESPACE_SEQ, NAME, ATTRIBUTES)                              \
                                                                                 \
-    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE(                                \
+    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE_IMPL(                           \
         WRAPPED_TYPE,(0)NAMESPACE_SEQ,NAME)                                     \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_BASE(                                             \
diff --git a/include/boost/fusion/adapted/struct/detail/proxy_type.hpp b/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
index 1ebc5087..062f24a1 100644
--- a/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
+++ b/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
@@ -11,7 +11,7 @@
 
 #include <boost/fusion/adapted/struct/detail/namespace.hpp>
 
-#define BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE(                            \
+#define BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE_IMPL(                       \
     WRAPPED_TYPE,NAMESPACE_SEQ,NAME)                                            \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DEFINITION_BEGIN(NAMESPACE_SEQ)         \
@@ -27,4 +27,10 @@
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DEFINITION_END(NAMESPACE_SEQ)
 
+#define BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE(                            \
+    WRAPPED_TYPE, NAMESPACE_SEQ, NAME)                                          \
+                                                                                \
+    BOOST_FUSION_ADAPT_STRUCT_DEFINE_PROXY_TYPE_IMPL(                           \
+        WRAPPED_TYPE, (0)NAMESPACE_SEQ, NAME)
+
 #endif
diff --git a/include/boost/fusion/include/proxy_type.hpp b/include/boost/fusion/include/proxy_type.hpp
new file mode 100644
index 00000000..31e8dce0
--- /dev/null
+++ b/include/boost/fusion/include/proxy_type.hpp
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2010 Christopher Schmidt
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+
+#ifndef BOOST_FUSION_INCLUDE_PROXY_TYPE_HPP
+#define BOOST_FUSION_INCLUDE_PROXY_TYPE_HPP
+
+#include <boost/fusion/adapted/struct/detail/proxy_type.hpp>
+
+#endif