+// -*- 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/tokenizer.hpp>