Index: boost/logging/ts/ts.hpp
===================================================================
--- boost/logging/ts/ts.hpp	(Revision 40606)
+++ boost/logging/ts/ts.hpp	(Arbeitskopie)
@@ -37,7 +37,7 @@
 
 #else
     // no threads
-    #include <boost/log/ts/ts_none.hpp>
+    #include <boost/logging/ts/ts_none.hpp>
 #endif
 
 
Index: boost/logging/format/destination/rolling_file.hpp
===================================================================
--- boost/logging/format/destination/rolling_file.hpp	(Revision 40606)
+++ boost/logging/format/destination/rolling_file.hpp	(Arbeitskopie)
@@ -103,7 +103,7 @@
 
         template<class msg_type> void write( const msg_type& msg) {
             convert_dest::write(msg, (*m_out) );
-            if ( m_out->tellg() > m_flags.max_size_bytes()) {
+            if ( m_out->tellp() > m_flags.max_size_bytes()) {
                 m_cur_idx = (m_cur_idx + 1) % m_flags.file_count();
                 recreate_file();
             }            
@@ -138,7 +138,8 @@
     rolling_file_t(const std::string & name_prefix, rolling_file_settings flags = rolling_file_settings() ) : non_const_context_base(name_prefix, flags) {}
 
     template<class msg_type> void operator()( const msg_type & msg) const {
-        non_const_context::context().write(msg);
+	// error: ‘template<class context_type> struct boost::logging::manipulator::non_const_context’ used without template parameters
+        non_const_context<detail::rolling_file_info<convert_dest> >::context().write(msg);
     }
 
     bool operator==(const rolling_file_t & other) const {
Index: boost/logging/format/formatter/time.hpp
===================================================================
--- boost/logging/format/formatter/time.hpp	(Revision 40606)
+++ boost/logging/format/formatter/time.hpp	(Arbeitskopie)
@@ -23,6 +23,7 @@
 
 #include <boost/logging/detail/fwd.hpp>
 #include <boost/logging/format/formatter/convert_format.hpp>
+#include <boost/logging/detail/manipulator.hpp> // is_generic
 #include <stdio.h>
 #include <time.h>
 
Index: boost/logging/format/formatter/thread_id.hpp
===================================================================
--- boost/logging/format/formatter/thread_id.hpp	(Revision 40606)
+++ boost/logging/format/formatter/thread_id.hpp	(Arbeitskopie)
@@ -22,6 +22,9 @@
 #endif
 
 #include <boost/logging/detail/fwd.hpp>
+#include <boost/logging/format/formatter/convert_format.hpp> // do_convert_format
+#include <boost/logging/detail/manipulator.hpp> // is_generic
+#include <sstream> // std::basic_ostringstream
 
 namespace boost { namespace logging { namespace formatter {
 
Index: boost/logging/format/formatter/defaults.hpp
===================================================================
--- boost/logging/format/formatter/defaults.hpp	(Revision 40606)
+++ boost/logging/format/formatter/defaults.hpp	(Arbeitskopie)
@@ -24,6 +24,7 @@
 #include <boost/logging/detail/fwd.hpp>
 #include <boost/logging/detail/manipulator.hpp>
 #include <boost/logging/format/formatter/time.hpp>
+#include <sstream> // std::basic_ostringstream
 #include <stdio.h>
 #include <time.h>
 
Index: boost/logging/format/array.hpp
===================================================================
--- boost/logging/format/array.hpp	(Revision 40606)
+++ boost/logging/format/array.hpp	(Arbeitskopie)
@@ -22,6 +22,7 @@
 
 #include <boost/logging/detail/fwd.hpp>
 #include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace boost { namespace logging {
 
Index: boost/logging/detail/manipulator.hpp
===================================================================
--- boost/logging/detail/manipulator.hpp	(Revision 40606)
+++ boost/logging/detail/manipulator.hpp	(Arbeitskopie)
@@ -28,6 +28,10 @@
 
 #include <boost/logging/detail/fwd.hpp>
 #include <boost/logging/detail/format_msg_type.hpp>
+#include <boost/logging/format/op_equal.hpp>
+#include <boost/logging/detail/forward_constructor.hpp> // BOOST_LOGGING_FORWARD_CONSTRUCTOR_WITH_NEW
+#include <boost/shared_ptr.hpp>
+#include <boost/type_traits/remove_const.hpp>
 
 namespace boost { namespace logging {
 
Index: boost/logging/writer/on_dedicated_thread.hpp
===================================================================
--- boost/logging/writer/on_dedicated_thread.hpp	(Revision 40606)
+++ boost/logging/writer/on_dedicated_thread.hpp	(Arbeitskopie)
@@ -23,6 +23,8 @@
 
 #include <boost/logging/detail/fwd.hpp>
 #include <boost/logging/detail/forward_constructor.hpp>
+#include <boost/logging/detail/manipulator.hpp> // boost::logging::manipulator
+
 #include <vector>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/xtime.hpp>
Index: boost/logging/writer/ts_write.hpp
===================================================================
--- boost/logging/writer/ts_write.hpp	(Revision 40606)
+++ boost/logging/writer/ts_write.hpp	(Arbeitskopie)
@@ -70,8 +70,8 @@
 
 @sa on_dedicated_thread
 */
-    template<class base_type> struct ts_write : base_type, non_const_context<detail::ts_write_context> {
-        typedef non_const_context<detail::ts_write_context> non_const_context_base;
+    template<class base_type> struct ts_write : base_type, manipulator::non_const_context<detail::ts_write_context> {
+        typedef manipulator::non_const_context<detail::ts_write_context> non_const_context_base;
 
         BOOST_LOGGING_FORWARD_CONSTRUCTOR(ts_write,base_type)
 
Index: boost/logging/writer/format_write.hpp
===================================================================
--- boost/logging/writer/format_write.hpp	(Revision 40606)
+++ boost/logging/writer/format_write.hpp	(Arbeitskopie)
@@ -23,6 +23,7 @@
 
 #include <boost/logging/detail/fwd.hpp>
 #include <boost/type_traits/is_base_of.hpp>
+#include <boost/logging/format.hpp> // format_and_write::simple
 
 namespace boost { namespace logging {
 
@@ -118,7 +119,7 @@
 template<
         class formatter_base, 
         class destination_base, 
-        class apply_format_and_write = boost::logging::format_and_write::simple<typename formatter_base::raw_param>,
+        class apply_format_and_write = format_and_write::simple<typename formatter_base::raw_param>,
         class router_type = msg_route::simple<formatter_base, destination_base> ,
         class formatter_array = array::shared_ptr_holder<formatter_base> , 
         class destination_array = array::shared_ptr_holder<destination_base> >