diff --git a/include/boost/fusion/include/unfused_lvalue_args.hpp b/include/boost/fusion/include/make_unfused.hpp
similarity index 58%
rename from include/boost/fusion/include/unfused_lvalue_args.hpp
rename to include/boost/fusion/include/make_unfused.hpp
index 17acc261..ae3b6679 100644
--- a/include/boost/fusion/include/unfused_lvalue_args.hpp
+++ b/include/boost/fusion/include/make_unfused.hpp
@@ -1,12 +1,13 @@
-/*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
+/*==============================================================================
+    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)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_UNFUSED_LVALUE_ARGS)
-#define FUSION_INCLUDE_UNFUSED_LVALUE_ARGS
 
-#include <boost/fusion/functional/adapter/unfused_lvalue_args.hpp>
+#ifndef BOOST_FUSION_INCLUDE_MAKE_UNFUSED_HPP
+#define BOOST_FUSION_INCLUDE_MAKE_UNFUSED_HPP
+
+#include <boost/fusion/functional/generation/make_unfused.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/make_unfused_generic.hpp b/include/boost/fusion/include/make_unfused_generic.hpp
deleted file mode 100644
index dcebceb1..00000000
--- a/include/boost/fusion/include/make_unfused_generic.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_UNFUSED_GENERIC)
-#define FUSION_INCLUDE_MAKE_UNFUSED_GENERIC
-
-#include <boost/fusion/functional/generation/make_unfused_generic.hpp>
-
-#endif
diff --git a/include/boost/fusion/include/make_unfused_lvalue_args.hpp b/include/boost/fusion/include/make_unfused_lvalue_args.hpp
deleted file mode 100644
index 1805bb18..00000000
--- a/include/boost/fusion/include/make_unfused_lvalue_args.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_UNFUSED_LVALUE_ARGS)
-#define FUSION_INCLUDE_MAKE_UNFUSED_LVALUE_ARGS
-
-#include <boost/fusion/functional/generation/make_unfused_lvalue_args.hpp>
-
-#endif
diff --git a/include/boost/fusion/include/make_unfused_rvalue_args.hpp b/include/boost/fusion/include/make_unfused_rvalue_args.hpp
deleted file mode 100644
index 0d546be7..00000000
--- a/include/boost/fusion/include/make_unfused_rvalue_args.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_UNFUSED_RVALUE_ARGS)
-#define FUSION_INCLUDE_MAKE_UNFUSED_RVALUE_ARGS
-
-#include <boost/fusion/functional/generation/make_unfused_rvalue_args.hpp>
-
-#endif
diff --git a/include/boost/fusion/include/unfused_generic.hpp b/include/boost/fusion/include/unfused.hpp
similarity index 63%
rename from include/boost/fusion/include/unfused_generic.hpp
rename to include/boost/fusion/include/unfused.hpp
index d377900f..e386ce5a 100644
--- a/include/boost/fusion/include/unfused_generic.hpp
+++ b/include/boost/fusion/include/unfused.hpp
@@ -1,12 +1,13 @@
 /*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
+    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)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_UNFUSED_GENERIC)
-#define FUSION_INCLUDE_UNFUSED_GENERIC
 
-#include <boost/fusion/functional/adapter/unfused_generic.hpp>
+#ifndef BOOST_FUSION_INCLUDE_UNFUSED_HPP
+#define BOOST_FUSION_INCLUDE_UNFUSED_HPP
+
+#include <boost/fusion/functional/adapter/unfused.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/unfused_rvalue_args.hpp b/include/boost/fusion/include/unfused_rvalue_args.hpp
deleted file mode 100644
index 556b2dee..00000000
--- a/include/boost/fusion/include/unfused_rvalue_args.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2007 Joel de Guzman
-
-    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)
-==============================================================================*/
-#if !defined(FUSION_INCLUDE_UNFUSED_RVALUE_ARGS)
-#define FUSION_INCLUDE_UNFUSED_RVALUE_ARGS
-
-#include <boost/fusion/functional/adapter/unfused_rvalue_args.hpp>
-
-#endif