Revert "Merge pull request #11 from Lastique/modularization"

This reverts commit a9a1eddba8, reversing
changes made to d6bc9845ba.

test/count_if.cpp

@@ -16,17 +16,16 @@
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/comparison.hpp>
 #include <boost/mpl/int.hpp>
+#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-#include "test.hpp"
-
 MPL_TEST_CASE()
 {
     typedef vector<int,char&,long,short,char&,long,double,long> types;
     typedef vector_c<int,1,0,5,1,7,5,0,5> values;
-
+    
     MPL_ASSERT_RELATION( (count_if< types, boost::is_float<_> >::value), ==, 1 );
     MPL_ASSERT_RELATION( (count_if< types, boost::is_same<_,char&> >::value), ==, 2 );
     MPL_ASSERT_RELATION( (count_if< types, boost::is_same<_,void*> >::value), ==, 0 );