Index: exception_safety.hpp
===================================================================
--- exception_safety.hpp	(Revision 41094)
+++ exception_safety.hpp	(Arbeitskopie)
@@ -19,7 +19,8 @@
 #include <boost/test/detail/config.hpp>
 
 #include <boost/test/utils/callback.hpp>
-#include <boost/test/utils/basic_cstring/basic_cstring_fwd.hpp>
+// |69| error: default argument for 'boost::unit_test::const_string test_name' has type 'const char [1]'
+#include <boost/test/utils/basic_cstring/basic_cstring.hpp>
 
 // STL
 #include <memory>
Index: utils/runtime/cla/validation.ipp
===================================================================
--- utils/runtime/cla/validation.ipp	(Revision 41094)
+++ utils/runtime/cla/validation.ipp	(Arbeitskopie)
@@ -20,6 +20,7 @@
 
 #include <boost/test/utils/runtime/cla/argv_traverser.hpp>
 #include <boost/test/utils/runtime/cla/validation.hpp>
+#include <boost/test/utils/runtime/validation.hpp> // BOOST_RT_PARAM_NAMESPACE::logic_error
 
 // Boost
 #include <boost/test/utils/basic_cstring/io.hpp>
Index: utils/runtime/env/fwd.hpp
===================================================================
--- utils/runtime/env/fwd.hpp	(Revision 41094)
+++ utils/runtime/env/fwd.hpp	(Arbeitskopie)
@@ -24,6 +24,9 @@
 
 namespace environment {
 
+class variable_base;
+variable_base var( cstring var_name );
+
 namespace rt_env_detail {
 
 struct variable_data;
@@ -36,7 +39,6 @@
 
 }
 
-class variable_base;
 template <typename T> class variable;
 
 } // namespace environment
Index: utils/runtime/env/variable.hpp
===================================================================
--- utils/runtime/env/variable.hpp	(Revision 41094)
+++ utils/runtime/env/variable.hpp	(Arbeitskopie)
@@ -189,9 +189,10 @@
 
 namespace environment {
 
+// var is defined in environment.hpp and no template!?
 template<typename T>
 variable<T>::variable( cstring var_name )
-: variable_base( environment::var<T>( var_name ) )
+: variable_base( environment::var( var_name ) )
 {}
 
 //____________________________________________________________________________//
@@ -199,7 +200,7 @@
 template<typename T>
 template<typename Modifiers>
 variable<T>::variable( cstring var_name, Modifiers const& m )
-: variable_base( environment::var<T>( var_name, m ) )
+: variable_base( environment::var( var_name, m ) )
 {}
 
 //____________________________________________________________________________//
Index: utils/runtime/config.hpp
===================================================================
--- utils/runtime/config.hpp	(Revision 41094)
+++ utils/runtime/config.hpp	(Arbeitskopie)
@@ -28,6 +28,7 @@
 #include <boost/test/detail/config.hpp>
 #include <boost/test/utils/basic_cstring/basic_cstring.hpp>
 #include <boost/test/utils/wrap_stringstream.hpp>
+#include <boost/test/utils/basic_cstring/io.hpp> // operator<<(boost::runtime::cstring)
 
 // STL
 #include <string>
Index: utils/algorithm.hpp
===================================================================
--- utils/algorithm.hpp	(Revision 41094)
+++ utils/algorithm.hpp	(Arbeitskopie)
@@ -16,6 +16,8 @@
 #define BOOST_ALGORITHM_HPP_062304GER
 
 #include <utility>
+#include <algorithm> // std::find
+#include <functional> // std::bind1st
 
 #include <boost/test/detail/suppress_warnings.hpp>
 
Index: debug.hpp
===================================================================
--- debug.hpp	(Revision 41094)
+++ debug.hpp	(Arbeitskopie)
@@ -18,7 +18,8 @@
 // Boost.Test
 #include <boost/test/detail/config.hpp>
 #include <boost/test/utils/callback.hpp>
-#include <boost/test/utils/basic_cstring/basic_cstring_fwd.hpp>
+// error: field 'binary_path' has incomplete type
+#include <boost/test/utils/basic_cstring/basic_cstring.hpp>
 
 // STL
 #include <string>