+// -*- C++ -*-
#include <config.h>
#include <boost/assert.hpp>
#include <boost/crc.hpp>
-#include <boost/format.hpp>
-#include <boost/function/function0.hpp>
-#include <boost/iterator/indirect_iterator.hpp>
+// #include <boost/format.hpp> // mult def symbols problem (_1,_2 etc)
#include <boost/regex.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/signals/signal0.hpp>
-#include <boost/signals/signal2.hpp>
+#include <boost/signal.hpp>
#include <boost/signals/trackable.hpp>
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 103300
+# include <boost/test/detail/nullstream.hpp>
+#else
+# include <boost/test/utils/nullstream.hpp>
+#endif
+
#include <boost/tokenizer.hpp>
#include <boost/utility.hpp>
#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
#include <time.h>
-#include <unistd.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#ifndef _WIN32
+# include <sys/un.h>
+# include <sys/wait.h>
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
+#endif
#include <algorithm>
#include <cctype>