diff --git a/include/boost/typeof/compliant/concatenate.hpp b/include/boost/typeof/compliant/encode_decode_params.hpp
similarity index 81%
rename from include/boost/typeof/compliant/concatenate.hpp
rename to include/boost/typeof/compliant/encode_decode_params.hpp
index b09f76b..33f225f 100755
--- a/include/boost/typeof/compliant/concatenate.hpp
+++ b/include/boost/typeof/compliant/encode_decode_params.hpp
@@ -1,9 +1,9 @@
-// Copyright (C) 2004 Arkadiy Vertleyb
+// Copyright (C) 2005 Arkadiy Vertleyb
 // Use, modification and distribution is subject to the Boost Software
 // License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_TYPEOF_CONCATENATE_HPP_INCLUDED
-#define BOOST_TYPEOF_CONCATENATE_HPP_INCLUDED
+#ifndef BOOST_TYPEOF_COMPLIANT_ENCODE_DECODE_PARAMS_HPP_INCLUDED
+#define BOOST_TYPEOF_COMPLIANT_ENCODE_DECODE_PARAMS_HPP_INCLUDED
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repetition/repeat.hpp>
@@ -31,4 +31,4 @@
     typename mpl::push_back<V, mpl::size_t<ID> >::type      \
     BOOST_PP_REPEAT(n, BOOST_TYPEOF_ENCODE_PARAMS_END, ~)
 
-#endif//BOOST_TYPEOF_CONCATENATE_HPP_INCLUDED
+#endif//BOOST_TYPEOF_COMPLIANT_ENCODE_DECODE_PARAMS_HPP_INCLUDED
diff --git a/include/boost/typeof/compliant/modifiers.hpp b/include/boost/typeof/compliant/modifiers.hpp
index a12e85c..5854721 100755
--- a/include/boost/typeof/compliant/modifiers.hpp
+++ b/include/boost/typeof/compliant/modifiers.hpp
@@ -6,7 +6,6 @@
 #define BOOST_TYPEOF_COMPLIANT_MODIFIERS_HPP_INCLUDED
 
 #include <boost/typeof/compliant/encode_decode.hpp>
-#include <boost/typeof/compliant/concatenate.hpp>
 
 #include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
 
diff --git a/include/boost/typeof/compliant/pointers_data_members.hpp b/include/boost/typeof/compliant/pointers_data_members.hpp
index 2ec7589..8621633 100755
--- a/include/boost/typeof/compliant/pointers_data_members.hpp
+++ b/include/boost/typeof/compliant/pointers_data_members.hpp
@@ -5,7 +5,7 @@
 #ifndef BOOST_TYPEOF_COMPLIANT_POINTERS_DATA_MEMBERS_HPP_INCLUDED
 #define BOOST_TYPEOF_COMPLIANT_POINTERS_DATA_MEMBERS_HPP_INCLUDED
 
-#include <boost/typeof/compliant/concatenate.hpp>
+#include <boost/typeof/compliant/encode_decode_params.hpp>
 #include <boost/typeof/compliant/encode_decode.hpp>
 
 #include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
diff --git a/include/boost/typeof/compliant/register_functions_iterate.hpp b/include/boost/typeof/compliant/register_functions_iterate.hpp
index eb9e49a..391c59a 100755
--- a/include/boost/typeof/compliant/register_functions_iterate.hpp
+++ b/include/boost/typeof/compliant/register_functions_iterate.hpp
@@ -2,6 +2,8 @@
 // Use, modification and distribution is subject to the Boost Software
 // License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/typeof/compliant/encode_decode_params.hpp>
+
 #define n BOOST_PP_ITERATION()
 
 namespace
diff --git a/include/boost/typeof/compliant/register_mem_functions.hpp b/include/boost/typeof/compliant/register_mem_functions.hpp
index f1d3f64..86bbfee 100755
--- a/include/boost/typeof/compliant/register_mem_functions.hpp
+++ b/include/boost/typeof/compliant/register_mem_functions.hpp
@@ -2,6 +2,8 @@
 // Use, modification and distribution is subject to the Boost Software
 // License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/typeof/compliant/encode_decode_params.hpp>
+
 // member functions
 
 template<class V, class T, class R BOOST_PP_ENUM_TRAILING_PARAMS(n, class P)> 
diff --git a/include/boost/typeof/compliant/type_encoding.hpp b/include/boost/typeof/compliant/type_encoding.hpp
index 650081f..f9b1d88 100755
--- a/include/boost/typeof/compliant/type_encoding.hpp
+++ b/include/boost/typeof/compliant/type_encoding.hpp
@@ -5,8 +5,6 @@
 #ifndef BOOST_TYPEOF_COMPLIANT_TYPE_ENCODING_HPP_INCLUDED
 #define BOOST_TYPEOF_COMPLIANT_TYPE_ENCODING_HPP_INCLUDED
 
-#include <boost/typeof/compliant/concatenate.hpp>
-
 #define BOOST_TYPEOF_REGISTER_TYPE_IMPL(T, Id)                          \
                                                                         \
     template<class V> struct encode_type_impl<V, T >                    \
diff --git a/test/compliant/typeof.vcproj b/test/compliant/typeof.vcproj
index 673208c..fa1fe6a 100755
--- a/test/compliant/typeof.vcproj
+++ b/test/compliant/typeof.vcproj
@@ -269,6 +269,9 @@
 				<File
 					RelativePath="..\..\..\..\boost\typeof\compliant\encode_decode.hpp">
 				</File>
+				<File
+					RelativePath="..\..\..\..\boost\typeof\compliant\encode_decode_params.hpp">
+				</File>
 				<File
 					RelativePath="..\..\..\..\boost\typeof\compliant\int_encoding.hpp">
 				</File>