diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b94eabbee2645b09c73ac95fe87cd5624316e3a..1841b679d6e18906fbcf769f977d77af7c1b5a1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,6 +147,7 @@ SET(${PROJECT_NAME}_HEADERS
   include/fcl/intersect.h
   include/fcl/collision_object.h
   include/fcl/octree.h
+  include/fcl/fwd.hh
   )
 
 pkg_config_append_libs("fcl")
diff --git a/doc/Doxyfile.extra.in b/doc/Doxyfile.extra.in
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..16c2c547b955dd182889e191dba47249f0ec6b49 100644
--- a/doc/Doxyfile.extra.in
+++ b/doc/Doxyfile.extra.in
@@ -0,0 +1 @@
+FILE_PATTERNS          = *.h  *.hh  *.hxx
diff --git a/include/fcl/fwd.hh b/include/fcl/fwd.hh
new file mode 100644
index 0000000000000000000000000000000000000000..9fd7a87377bef41a1732c635a51c16d8e6fb6413
--- /dev/null
+++ b/include/fcl/fwd.hh
@@ -0,0 +1,46 @@
+//
+// Software License Agreement (BSD License)
+//
+//  Copyright (c) 2014, CNRS-LAAS
+//  Author: Florent Lamiraux
+//
+//  All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions
+//  are met:
+//
+//   * Redistributions of source code must retain the above copyright
+//     notice, this list of conditions and the following disclaimer.
+//   * Redistributions in binary form must reproduce the above
+//     copyright notice, this list of conditions and the following
+//     disclaimer in the documentation and/or other materials provided
+//     with the distribution.
+//   * Neither the name of CNRS-LAAS nor the names of its
+//     contributors may be used to endorse or promote products derived
+//     from this software without specific prior written permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+//  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+//  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+//  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+//  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+//  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+//  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//  POSSIBILITY OF SUCH DAMAGE.
+//
+
+namespace fcl {
+  class CollisionObject;
+  typedef boost::shared_ptr <CollisionObject> CollisionObjectPtr_t;
+  typedef boost::shared_ptr < const CollisionObject> CollisionObjectConstPtr_t;
+  class CollisionGeometry;
+  typedef boost::shared_ptr <CollisionGeometry> CollisionGeometryPtr_t;
+  typedef boost::shared_ptr <const CollisionGeometry>
+  CollisionGeometryConstPtr_t;
+  class Transform3f;
+}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9efad9f824376e242431a92ad0ad72e1aef46e30..77d81bf2810a68cdabac38355c167632fd02c8fe 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,7 +1,6 @@
 config_files(fcl_resources/config.h)
 
 macro(add_fcl_test test_name)
-  MESSAGE("add_executable ${ARGV}")
   add_executable(${ARGV})
   target_link_libraries(${test_name}
     fcl
@@ -17,10 +16,10 @@ include_directories(${Boost_INCLUDE_DIRS})
 add_fcl_test(test_fcl_collision test_fcl_collision.cpp test_fcl_utility.cpp)
 add_fcl_test(test_fcl_distance test_fcl_distance.cpp test_fcl_utility.cpp)
 add_fcl_test(test_fcl_geometric_shapes test_fcl_geometric_shapes.cpp test_fcl_utility.cpp)
-add_fcl_test(test_fcl_broadphase test_fcl_broadphase.cpp test_fcl_utility.cpp)
-add_fcl_test(test_fcl_shape_mesh_consistency test_fcl_shape_mesh_consistency.cpp test_fcl_utility.cpp)
+#add_fcl_test(test_fcl_broadphase test_fcl_broadphase.cpp test_fcl_utility.cpp)
+#add_fcl_test(test_fcl_shape_mesh_consistency test_fcl_shape_mesh_consistency.cpp test_fcl_utility.cpp)
 add_fcl_test(test_fcl_frontlist test_fcl_frontlist.cpp test_fcl_utility.cpp)
-add_fcl_test(test_fcl_math test_fcl_math.cpp test_fcl_utility.cpp)
+#add_fcl_test(test_fcl_math test_fcl_math.cpp test_fcl_utility.cpp)
 
 add_fcl_test(test_fcl_sphere_capsule test_fcl_sphere_capsule.cpp)
 add_fcl_test(test_fcl_capsule_capsule test_fcl_capsule_capsule.cpp)