--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/pch.h	2006-02-13 11:46:38.000000000 -0600
@@ -17,7 +17,12 @@
 #include <boost/signals/connection.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 #include <boost/tokenizer.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>
--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
+++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-13 11:55:22.000000000 -0600
@@ -38,7 +38,13 @@
 
 #include <boost/assert.hpp>
 #include <boost/filesystem/operations.hpp>
+// Not sure about this one (?) -- Rex
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/cregex.hpp>
+#else
 #include <boost/regex.hpp>
+#endif
 
 #include <fcntl.h>
 
--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/support/pch.h	2006-02-13 11:50:33.000000000 -0600
@@ -10,7 +10,12 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 #include <boost/tokenizer.hpp>
 #include <boost/utility.hpp>
 
--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
+++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-13 11:47:16.000000000 -0600
@@ -14,7 +14,12 @@
 
 #include <iostream>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 
 #ifdef DEBUG
 # define TEMPORARY_DEBUG_MACRO DEBUG