diff --git a/include/hpp/fcl/BV/AABB.h b/include/hpp/fcl/BV/AABB.h
index 5831a31c301a5dd4a913cbbb727b687e7b04175f..b875b3c869016b12708968af98169204eecf7a6a 100644
--- a/include/hpp/fcl/BV/AABB.h
+++ b/include/hpp/fcl/BV/AABB.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_AABB_H
-#define FCL_AABB_H
+#ifndef HPP_FCL_AABB_H
+#define HPP_FCL_AABB_H
 
 #include <stdexcept>
 #include <hpp/fcl/math/vec_3f.h>
diff --git a/include/hpp/fcl/BV/BV.h b/include/hpp/fcl/BV/BV.h
index 17ceaab686d28b7299249a9cc311e1a20d6d8050..5e3f9993bfc28abb50adf25d3db2238536231fe0 100644
--- a/include/hpp/fcl/BV/BV.h
+++ b/include/hpp/fcl/BV/BV.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_BV_H
-#define FCL_BV_H
+#ifndef HPP_FCL_BV_H
+#define HPP_FCL_BV_H
 
 
 #include <hpp/fcl/BV/kDOP.h>
diff --git a/include/hpp/fcl/BV/BV_node.h b/include/hpp/fcl/BV/BV_node.h
index 1e4bc54c461976ef60020e7d466d0519c39834e3..5889b740367f4b97b7424e71af45642c92c3c458 100644
--- a/include/hpp/fcl/BV/BV_node.h
+++ b/include/hpp/fcl/BV/BV_node.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_BV_NODE_H
-#define FCL_BV_NODE_H
+#ifndef HPP_FCL_BV_NODE_H
+#define HPP_FCL_BV_NODE_H
 
 #include <hpp/fcl/math/vec_3f.h>
 #include <hpp/fcl/math/matrix_3f.h>
diff --git a/include/hpp/fcl/BV/OBB.h b/include/hpp/fcl/BV/OBB.h
index 5b38777ba48c7c1dbf725e3303d894e7931c272d..f3897cf37808f0d7ee54ee583ceba5159c070264 100644
--- a/include/hpp/fcl/BV/OBB.h
+++ b/include/hpp/fcl/BV/OBB.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_OBB_H
-#define FCL_OBB_H
+#ifndef HPP_FCL_OBB_H
+#define HPP_FCL_OBB_H
 
 
 #include <hpp/fcl/math/vec_3f.h>
diff --git a/include/hpp/fcl/BV/OBBRSS.h b/include/hpp/fcl/BV/OBBRSS.h
index bed154700bcfdaa0f9a26827592703cee2899124..bc8d715c95ccc5d552b8f42a04cac105902e1c20 100644
--- a/include/hpp/fcl/BV/OBBRSS.h
+++ b/include/hpp/fcl/BV/OBBRSS.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_OBBRSS_H
-#define FCL_OBBRSS_H
+#ifndef HPP_FCL_OBBRSS_H
+#define HPP_FCL_OBBRSS_H
 
 
 #include <hpp/fcl/BV/OBB.h>
diff --git a/include/hpp/fcl/BV/RSS.h b/include/hpp/fcl/BV/RSS.h
index f4f3e572ec8dc023d00f995b7a148933b22ebe56..3b33b28023ef9893ad70fae4e01d2ee3b77d3273 100644
--- a/include/hpp/fcl/BV/RSS.h
+++ b/include/hpp/fcl/BV/RSS.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_RSS_H
-#define FCL_RSS_H
+#ifndef HPP_FCL_RSS_H
+#define HPP_FCL_RSS_H
 
 #include <stdexcept>
 #include <hpp/fcl/math/vec_3f.h>
diff --git a/include/hpp/fcl/BV/kDOP.h b/include/hpp/fcl/BV/kDOP.h
index d71e56c72454ebe1ad59b747e8e5ca06f350b76a..72be7f89fa9dfaf9d0a0c2652f53ec5cbf553812 100644
--- a/include/hpp/fcl/BV/kDOP.h
+++ b/include/hpp/fcl/BV/kDOP.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_KDOP_H
-#define FCL_KDOP_H
+#ifndef HPP_FCL_KDOP_H
+#define HPP_FCL_KDOP_H
 
 #include <stdexcept>
 #include <hpp/fcl/math/vec_3f.h>
diff --git a/include/hpp/fcl/BV/kIOS.h b/include/hpp/fcl/BV/kIOS.h
index 5465ba8d1b069bffa7d8ef2ccee4d3d11bc280bc..64550f3885322617f8512ff827227e2c1bed2572 100644
--- a/include/hpp/fcl/BV/kIOS.h
+++ b/include/hpp/fcl/BV/kIOS.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_KIOS_H
-#define FCL_KIOS_H
+#ifndef HPP_FCL_KIOS_H
+#define HPP_FCL_KIOS_H
 
 #include <hpp/fcl/BV/OBB.h>
 
diff --git a/include/hpp/fcl/BVH/BVH_front.h b/include/hpp/fcl/BVH/BVH_front.h
index edd4edc7f145897c6bc4efc8a5bf53555ffdeefa..2e189728019f7211e723dcdc86b535970648bbd3 100644
--- a/include/hpp/fcl/BVH/BVH_front.h
+++ b/include/hpp/fcl/BVH/BVH_front.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_BVH_FRONT_H
-#define FCL_BVH_FRONT_H
+#ifndef HPP_FCL_BVH_FRONT_H
+#define HPP_FCL_BVH_FRONT_H
 
 
 #include <list>
diff --git a/include/hpp/fcl/BVH/BVH_internal.h b/include/hpp/fcl/BVH/BVH_internal.h
index 8462a15fb2fee09c3dec3505e73a82a05fe5de8f..d0a23373962cdeebd81bc4cff2e6e6f023168ecf 100644
--- a/include/hpp/fcl/BVH/BVH_internal.h
+++ b/include/hpp/fcl/BVH/BVH_internal.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_BVH_INTERNAL_H
-#define FCL_BVH_INTERNAL_H
+#ifndef HPP_FCL_BVH_INTERNAL_H
+#define HPP_FCL_BVH_INTERNAL_H
 
 #include <hpp/fcl/data_types.h>
 
diff --git a/include/hpp/fcl/BVH/BVH_model.h b/include/hpp/fcl/BVH/BVH_model.h
index 9b53d5d2c7c7d6f4836e56c4c021d7e7b59e005b..1f29a9bbbb8b18f3f5b34b3b605ad2c51758e386 100644
--- a/include/hpp/fcl/BVH/BVH_model.h
+++ b/include/hpp/fcl/BVH/BVH_model.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_BVH_MODEL_H
-#define FCL_BVH_MODEL_H
+#ifndef HPP_FCL_BVH_MODEL_H
+#define HPP_FCL_BVH_MODEL_H
 
 #include <hpp/fcl/collision_object.h>
 #include <hpp/fcl/BVH/BVH_internal.h>
diff --git a/include/hpp/fcl/BVH/BVH_utility.h b/include/hpp/fcl/BVH/BVH_utility.h
index 9c10d90af4f80992861048d51b370e8155d83af2..85110c265b2d383fa9b72590e69b6f121c6dd393 100644
--- a/include/hpp/fcl/BVH/BVH_utility.h
+++ b/include/hpp/fcl/BVH/BVH_utility.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_BVH_UTILITY_H
-#define FCL_BVH_UTILITY_H
+#ifndef HPP_FCL_BVH_UTILITY_H
+#define HPP_FCL_BVH_UTILITY_H
 
 #include <hpp/fcl/BVH/BVH_model.h>
 
diff --git a/include/hpp/fcl/BVH/BV_fitter.h b/include/hpp/fcl/BVH/BV_fitter.h
index df17f743beca6ba978b45fbf551f0ab9cc8d485d..8a1585343e57b2329512c1223073730737dae615 100644
--- a/include/hpp/fcl/BVH/BV_fitter.h
+++ b/include/hpp/fcl/BVH/BV_fitter.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_BV_FITTER_H
-#define FCL_BV_FITTER_H
+#ifndef HPP_FCL_BV_FITTER_H
+#define HPP_FCL_BV_FITTER_H
 
 #include <hpp/fcl/BVH/BVH_internal.h>
 #include <hpp/fcl/BV/kIOS.h>
diff --git a/include/hpp/fcl/BVH/BV_splitter.h b/include/hpp/fcl/BVH/BV_splitter.h
index 1af8da437c0e91202db763d22c86a9b242dac1d8..7ad7bd996b0d6fef5b96318256579f03f0f6cd1b 100644
--- a/include/hpp/fcl/BVH/BV_splitter.h
+++ b/include/hpp/fcl/BVH/BV_splitter.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_BV_SPLITTER_H
-#define FCL_BV_SPLITTER_H
+#ifndef HPP_FCL_BV_SPLITTER_H
+#define HPP_FCL_BV_SPLITTER_H
 
 #include <hpp/fcl/BVH/BVH_internal.h>
 #include <hpp/fcl/BV/kIOS.h>
diff --git a/include/hpp/fcl/collision.h b/include/hpp/fcl/collision.h
index 69943a274ffc28eb1f3fcf9d512cbd5cc0a348e0..f673494defbe47ff01b4217928990d7cbf84bd8f 100644
--- a/include/hpp/fcl/collision.h
+++ b/include/hpp/fcl/collision.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_COLLISION_H
-#define FCL_COLLISION_H
+#ifndef HPP_FCL_COLLISION_H
+#define HPP_FCL_COLLISION_H
 
 #include <hpp/fcl/math/vec_3f.h>
 #include <hpp/fcl/collision_object.h>
diff --git a/include/hpp/fcl/collision_data.h b/include/hpp/fcl/collision_data.h
index e748379b071b972e9b8ffa1913c660908089b516..fcafd0f78135384dbc0577dd6748a4dfbd18cf6a 100644
--- a/include/hpp/fcl/collision_data.h
+++ b/include/hpp/fcl/collision_data.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_COLLISION_DATA_H
-#define FCL_COLLISION_DATA_H
+#ifndef HPP_FCL_COLLISION_DATA_H
+#define HPP_FCL_COLLISION_DATA_H
 
 #include <hpp/fcl/collision_object.h>
 
diff --git a/include/hpp/fcl/collision_func_matrix.h b/include/hpp/fcl/collision_func_matrix.h
index 35b6878737bd074a2168a2ded62fc3cc8cbc6fbf..417039ca642447e3ecf0405861e3cf51c25fd233 100644
--- a/include/hpp/fcl/collision_func_matrix.h
+++ b/include/hpp/fcl/collision_func_matrix.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_COLLISION_FUNC_MATRIX_H
-#define FCL_COLLISION_FUNC_MATRIX_H
+#ifndef HPP_FCL_COLLISION_FUNC_MATRIX_H
+#define HPP_FCL_COLLISION_FUNC_MATRIX_H
 
 
 #include <hpp/fcl/collision_object.h>
diff --git a/include/hpp/fcl/collision_node.h b/include/hpp/fcl/collision_node.h
index 15d4a45d489e6215d33ef16e054abf52ad628387..23fd309de6da0d0281da458463727c00e40d367b 100644
--- a/include/hpp/fcl/collision_node.h
+++ b/include/hpp/fcl/collision_node.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_COLLISION_NODE_H
-#define FCL_COLLISION_NODE_H
+#ifndef HPP_FCL_COLLISION_NODE_H
+#define HPP_FCL_COLLISION_NODE_H
 
 #include <hpp/fcl/traversal/traversal_node_base.h>
 #include <hpp/fcl/traversal/traversal_node_bvhs.h>
diff --git a/include/hpp/fcl/collision_object.h b/include/hpp/fcl/collision_object.h
index 4d1589bdd94f804ac8e10bd9c6e74fa061face70..6dd142e8102435455897aa633336dd316ffbc7bc 100644
--- a/include/hpp/fcl/collision_object.h
+++ b/include/hpp/fcl/collision_object.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_COLLISION_OBJECT_BASE_H
-#define FCL_COLLISION_OBJECT_BASE_H
+#ifndef HPP_FCL_COLLISION_OBJECT_BASE_H
+#define HPP_FCL_COLLISION_OBJECT_BASE_H
 
 #include <hpp/fcl/deprecated.hh>
 #include <hpp/fcl/BV/AABB.h>
diff --git a/include/hpp/fcl/collision_utility.h b/include/hpp/fcl/collision_utility.h
index 78ede98771e0fab3bbb3dde09ca26f9783f517aa..1d302c7c346c0373fe8812e0819e60bc3935541b 100644
--- a/include/hpp/fcl/collision_utility.h
+++ b/include/hpp/fcl/collision_utility.h
@@ -14,8 +14,8 @@
 // received a copy of the GNU Lesser General Public License along with
 // hpp-fcl. If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef FCL_COLLISION_UTILITY_H
-#define FCL_COLLISION_UTILITY_H
+#ifndef HPP_FCL_COLLISION_UTILITY_H
+#define HPP_FCL_COLLISION_UTILITY_H
 
 #include <hpp/fcl/collision_object.h>
 
diff --git a/include/hpp/fcl/data_types.h b/include/hpp/fcl/data_types.h
index 1616d341213f6bd9e708e17aa74c437e6248dd91..fb234d919bacb5ba90718929719462f91be494c3 100644
--- a/include/hpp/fcl/data_types.h
+++ b/include/hpp/fcl/data_types.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_DATA_TYPES_H
-#define FCL_DATA_TYPES_H
+#ifndef HPP_FCL_DATA_TYPES_H
+#define HPP_FCL_DATA_TYPES_H
 
 #include <cstddef>
 #include <boost/cstdint.hpp>
diff --git a/include/hpp/fcl/distance.h b/include/hpp/fcl/distance.h
index 4ee3e3d8d7b4217c9cf374e99c9132ffe3777cd3..87216ce6df8a1621f7bf885f94fd243ece3c64e0 100644
--- a/include/hpp/fcl/distance.h
+++ b/include/hpp/fcl/distance.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_DISTANCE_H
-#define FCL_DISTANCE_H
+#ifndef HPP_FCL_DISTANCE_H
+#define HPP_FCL_DISTANCE_H
 
 #include <hpp/fcl/collision_object.h>
 #include <hpp/fcl/collision_data.h>
diff --git a/include/hpp/fcl/distance_func_matrix.h b/include/hpp/fcl/distance_func_matrix.h
index 2d4586ead4eed4191c9d282d2b4c018db983897b..c5a6f44cc622fdfdfd6121641b705d5634a4afb4 100644
--- a/include/hpp/fcl/distance_func_matrix.h
+++ b/include/hpp/fcl/distance_func_matrix.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_DISTANCE_FUNC_MATRIX_H
-#define FCL_DISTANCE_FUNC_MATRIX_H
+#ifndef HPP_FCL_DISTANCE_FUNC_MATRIX_H
+#define HPP_FCL_DISTANCE_FUNC_MATRIX_H
 
 #include <hpp/fcl/collision_object.h>
 #include <hpp/fcl/collision_data.h>
diff --git a/include/hpp/fcl/intersect.h b/include/hpp/fcl/intersect.h
index 4c16d7e498abb5b0ba5590830496bf3751dfe6ec..b56a6c626389fd6628ea5ef31b79a9f9a9fff38b 100644
--- a/include/hpp/fcl/intersect.h
+++ b/include/hpp/fcl/intersect.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_INTERSECT_H
-#define FCL_INTERSECT_H
+#ifndef HPP_FCL_INTERSECT_H
+#define HPP_FCL_INTERSECT_H
 
 #include <hpp/fcl/math/transform.h>
 #include <boost/math/special_functions/erf.hpp>
diff --git a/include/hpp/fcl/math/matrix_3f.h b/include/hpp/fcl/math/matrix_3f.h
index 0187b4b939160fe764b02ac26ad5e482fee834a0..122f329109d49150a81edda376ca3144ee9ebccd 100644
--- a/include/hpp/fcl/math/matrix_3f.h
+++ b/include/hpp/fcl/math/matrix_3f.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_MATRIX_3F_H
-#define FCL_MATRIX_3F_H
+#ifndef HPP_FCL_MATRIX_3F_H
+#define HPP_FCL_MATRIX_3F_H
 
 #include <hpp/fcl/math/vec_3f.h>
 
diff --git a/include/hpp/fcl/math/tools.h b/include/hpp/fcl/math/tools.h
index ec74dbdcb963023f2a026c4692cbc2a458141714..cfc19640f5d48b3aeef4c38e3707ee558fb958e1 100644
--- a/include/hpp/fcl/math/tools.h
+++ b/include/hpp/fcl/math/tools.h
@@ -35,8 +35,8 @@
 
 /** \author Joseph Mirabel */
 
-#ifndef FCL_MATH_TOOLS_H
-#define FCL_MATH_TOOLS_H
+#ifndef HPP_FCL_MATH_TOOLS_H
+#define HPP_FCL_MATH_TOOLS_H
 
 #include <hpp/fcl/deprecated.hh>
 #include <hpp/fcl/config.hh>
diff --git a/include/hpp/fcl/math/transform.h b/include/hpp/fcl/math/transform.h
index a4a8ee0da387dd6c993954ff61129ba6a4347b63..2e829f886608ef2bad3e85b770f17831410c0ef7 100644
--- a/include/hpp/fcl/math/transform.h
+++ b/include/hpp/fcl/math/transform.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_TRANSFORM_H
-#define FCL_TRANSFORM_H
+#ifndef HPP_FCL_TRANSFORM_H
+#define HPP_FCL_TRANSFORM_H
 
 #include <hpp/fcl/math/matrix_3f.h>
 #include <boost/thread/mutex.hpp>
diff --git a/include/hpp/fcl/math/vec_3f.h b/include/hpp/fcl/math/vec_3f.h
index c9936878929ded9d022dad903ebbca9440c32c1e..ede7b01705adf09f0fdd49f5046a008143282468 100644
--- a/include/hpp/fcl/math/vec_3f.h
+++ b/include/hpp/fcl/math/vec_3f.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_VEC_3F_H
-#define FCL_VEC_3F_H
+#ifndef HPP_FCL_VEC_3F_H
+#define HPP_FCL_VEC_3F_H
 
 #include <hpp/fcl/data_types.h>
 
diff --git a/include/hpp/fcl/mesh_loader/assimp.h b/include/hpp/fcl/mesh_loader/assimp.h
index 61e6445627afb9cfd3e4be8a84ca652a0514a4b6..12f6a631be3fa87e698bfb303727d25cd33d5993 100644
--- a/include/hpp/fcl/mesh_loader/assimp.h
+++ b/include/hpp/fcl/mesh_loader/assimp.h
@@ -34,8 +34,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef FCL_MESH_LOADER_ASSIMP_H
-#define FCL_MESH_LOADER_ASSIMP_H
+#ifndef HPP_FCL_MESH_LOADER_ASSIMP_H
+#define HPP_FCL_MESH_LOADER_ASSIMP_H
 
 #ifdef FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES
   #include <assimp/DefaultLogger.hpp>
diff --git a/include/hpp/fcl/mesh_loader/loader.h b/include/hpp/fcl/mesh_loader/loader.h
index 43ce699289e58069ad71f31ed7d2e9add877b2bd..934b395e6c901e66cc3780b653091dffa58ad7dc 100644
--- a/include/hpp/fcl/mesh_loader/loader.h
+++ b/include/hpp/fcl/mesh_loader/loader.h
@@ -34,8 +34,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef FCL_MESH_LOADER_LOADER_H
-#define FCL_MESH_LOADER_LOADER_H
+#ifndef HPP_FCL_MESH_LOADER_LOADER_H
+#define HPP_FCL_MESH_LOADER_LOADER_H
 
 #include <boost/shared_ptr.hpp>
 #include <hpp/fcl/fwd.hh>
diff --git a/include/hpp/fcl/narrowphase/gjk.h b/include/hpp/fcl/narrowphase/gjk.h
index c10c3112b8022dcfad01cb0ee672efdc490f2e2d..4748e3e087efa12a8238d0df311eec54ec7b544c 100644
--- a/include/hpp/fcl/narrowphase/gjk.h
+++ b/include/hpp/fcl/narrowphase/gjk.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_GJK_H
-#define FCL_GJK_H
+#ifndef HPP_FCL_GJK_H
+#define HPP_FCL_GJK_H
 
 #include <hpp/fcl/shape/geometric_shapes.h>
 #include <hpp/fcl/math/transform.h>
diff --git a/include/hpp/fcl/narrowphase/narrowphase.h b/include/hpp/fcl/narrowphase/narrowphase.h
index 5a73a1b066112888aa92a9e8c1f1606095f93ef1..96a0896b4f6c349500b325c3834ccbe6b0872400 100644
--- a/include/hpp/fcl/narrowphase/narrowphase.h
+++ b/include/hpp/fcl/narrowphase/narrowphase.h
@@ -36,8 +36,8 @@
 
 /** \author Jia Pan, Florent Lamiraux */
 
-#ifndef FCL_NARROWPHASE_H
-#define FCL_NARROWPHASE_H
+#ifndef HPP_FCL_NARROWPHASE_H
+#define HPP_FCL_NARROWPHASE_H
 
 #include <hpp/fcl/narrowphase/gjk.h>
 
diff --git a/include/hpp/fcl/octree.h b/include/hpp/fcl/octree.h
index fe20934f8a478c5be95d7abac438307883796cd6..497a1e88600397ee596805fc503a98b7e8d26430 100644
--- a/include/hpp/fcl/octree.h
+++ b/include/hpp/fcl/octree.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_OCTREE_H
-#define FCL_OCTREE_H
+#ifndef HPP_FCL_OCTREE_H
+#define HPP_FCL_OCTREE_H
 
 
 #include <boost/shared_ptr.hpp>
diff --git a/include/hpp/fcl/profile.h b/include/hpp/fcl/profile.h
index f472b68d82848e7a27aa8cc72ba62654f76c20bf..96d70d1cf8ec02916c1a608c3aef439c03d24155 100644
--- a/include/hpp/fcl/profile.h
+++ b/include/hpp/fcl/profile.h
@@ -36,8 +36,8 @@
 
 /* Author Ioan Sucan */
 
-#ifndef FCL_UTIL_PROFILER
-#define FCL_UTIL_PROFILER
+#ifndef HPP_FCL_UTIL_PROFILER
+#define HPP_FCL_UTIL_PROFILER
 
 #define ENABLE_PROFILING 1
 
diff --git a/include/hpp/fcl/shape/geometric_shapes.h b/include/hpp/fcl/shape/geometric_shapes.h
index ba15e675127801cf8881b69c41b1ec4469405203..64051f04f0bb02fed0666f7a34bfdc3ecccc67ea 100644
--- a/include/hpp/fcl/shape/geometric_shapes.h
+++ b/include/hpp/fcl/shape/geometric_shapes.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_GEOMETRIC_SHAPES_H
-#define FCL_GEOMETRIC_SHAPES_H
+#ifndef HPP_FCL_GEOMETRIC_SHAPES_H
+#define HPP_FCL_GEOMETRIC_SHAPES_H
 
 #include <boost/math/constants/constants.hpp>
 
diff --git a/include/hpp/fcl/shape/geometric_shapes_utility.h b/include/hpp/fcl/shape/geometric_shapes_utility.h
index d76120691fb1abca80272aaf07edc105d5bbed85..bec2e05e97fb9212cbb017e7747f8ba6c0b4624b 100644
--- a/include/hpp/fcl/shape/geometric_shapes_utility.h
+++ b/include/hpp/fcl/shape/geometric_shapes_utility.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_GEOMETRIC_SHAPES_UTILITY_H
-#define FCL_GEOMETRIC_SHAPES_UTILITY_H
+#ifndef HPP_FCL_GEOMETRIC_SHAPES_UTILITY_H
+#define HPP_FCL_GEOMETRIC_SHAPES_UTILITY_H
 
 #include <vector>
 #include <hpp/fcl/shape/geometric_shapes.h>
diff --git a/include/hpp/fcl/traversal/traversal_node_base.h b/include/hpp/fcl/traversal/traversal_node_base.h
index 8d19ad3d54b636fe1895987098533f235d7ae908..81e1d61c8e6f6419c34787a4c6a92def8b5d4699 100644
--- a/include/hpp/fcl/traversal/traversal_node_base.h
+++ b/include/hpp/fcl/traversal/traversal_node_base.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_TRAVERSAL_NODE_BASE_H
-#define FCL_TRAVERSAL_NODE_BASE_H
+#ifndef HPP_FCL_TRAVERSAL_NODE_BASE_H
+#define HPP_FCL_TRAVERSAL_NODE_BASE_H
 
 #include <hpp/fcl/data_types.h>
 #include <hpp/fcl/math/transform.h>
diff --git a/include/hpp/fcl/traversal/traversal_node_bvh_shape.h b/include/hpp/fcl/traversal/traversal_node_bvh_shape.h
index bf95f234f37910ea486a6aaba38d0f653678924e..0d9730fe7341ad4409c01470c6f660b77dfc5ced 100644
--- a/include/hpp/fcl/traversal/traversal_node_bvh_shape.h
+++ b/include/hpp/fcl/traversal/traversal_node_bvh_shape.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_TRAVERSAL_NODE_MESH_SHAPE_H
-#define FCL_TRAVERSAL_NODE_MESH_SHAPE_H
+#ifndef HPP_FCL_TRAVERSAL_NODE_MESH_SHAPE_H
+#define HPP_FCL_TRAVERSAL_NODE_MESH_SHAPE_H
 
 #include <hpp/fcl/collision_data.h>
 #include <hpp/fcl/shape/geometric_shapes.h>
diff --git a/include/hpp/fcl/traversal/traversal_node_bvhs.h b/include/hpp/fcl/traversal/traversal_node_bvhs.h
index 865dff6705ff97cec2d883fb4db9610d1d4cf73f..972955e0f6f74ef0d69ba6509f77c82ccdf24228 100644
--- a/include/hpp/fcl/traversal/traversal_node_bvhs.h
+++ b/include/hpp/fcl/traversal/traversal_node_bvhs.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_TRAVERSAL_NODE_MESHES_H
-#define FCL_TRAVERSAL_NODE_MESHES_H
+#ifndef HPP_FCL_TRAVERSAL_NODE_MESHES_H
+#define HPP_FCL_TRAVERSAL_NODE_MESHES_H
 
 #include <hpp/fcl/collision_data.h>
 #include <hpp/fcl/traversal/traversal_node_base.h>
diff --git a/include/hpp/fcl/traversal/traversal_node_octree.h b/include/hpp/fcl/traversal/traversal_node_octree.h
index 4a00e14ac93ab560e2e80f00a7c62f19d5996f1a..b9c47c07afb8f37ac7a8be75cb4a53e95e33a7e8 100644
--- a/include/hpp/fcl/traversal/traversal_node_octree.h
+++ b/include/hpp/fcl/traversal/traversal_node_octree.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef FCL_TRAVERSAL_NODE_OCTREE_H
-#define FCL_TRAVERSAL_NODE_OCTREE_H
+#ifndef HPP_FCL_TRAVERSAL_NODE_OCTREE_H
+#define HPP_FCL_TRAVERSAL_NODE_OCTREE_H
 
 #include <hpp/fcl/collision_data.h>
 #include <hpp/fcl/traversal/traversal_node_base.h>
diff --git a/include/hpp/fcl/traversal/traversal_node_setup.h b/include/hpp/fcl/traversal/traversal_node_setup.h
index 42c775f47078f371d05e186159773c0abd11b5c3..b58ea4572b2debf0266eb63a87f2e712d1b60853 100644
--- a/include/hpp/fcl/traversal/traversal_node_setup.h
+++ b/include/hpp/fcl/traversal/traversal_node_setup.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_TRAVERSAL_NODE_SETUP_H
-#define FCL_TRAVERSAL_NODE_SETUP_H
+#ifndef HPP_FCL_TRAVERSAL_NODE_SETUP_H
+#define HPP_FCL_TRAVERSAL_NODE_SETUP_H
 
 #include <hpp/fcl/traversal/traversal_node_bvhs.h>
 #include <hpp/fcl/traversal/traversal_node_shapes.h>
diff --git a/include/hpp/fcl/traversal/traversal_node_shapes.h b/include/hpp/fcl/traversal/traversal_node_shapes.h
index 2b2e61728ace0c53b1a9c7ea5285a4675c87939b..5180e9dcb43fe097e3be7730be259ee6e2feea8a 100644
--- a/include/hpp/fcl/traversal/traversal_node_shapes.h
+++ b/include/hpp/fcl/traversal/traversal_node_shapes.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_TRAVERSAL_NODE_SHAPES_H
-#define FCL_TRAVERSAL_NODE_SHAPES_H
+#ifndef HPP_FCL_TRAVERSAL_NODE_SHAPES_H
+#define HPP_FCL_TRAVERSAL_NODE_SHAPES_H
 
 #include <hpp/fcl/collision_data.h>
 #include <hpp/fcl/traversal/traversal_node_base.h>
diff --git a/include/hpp/fcl/traversal/traversal_recurse.h b/include/hpp/fcl/traversal/traversal_recurse.h
index 21f5d4a641b292105d9c911c600171197928856d..f50bd75e2bbb05a5b214f6edefd50e614556d8ea 100644
--- a/include/hpp/fcl/traversal/traversal_recurse.h
+++ b/include/hpp/fcl/traversal/traversal_recurse.h
@@ -36,8 +36,8 @@
 /** \author Jia Pan */
 
 
-#ifndef FCL_TRAVERSAL_RECURSE_H
-#define FCL_TRAVERSAL_RECURSE_H
+#ifndef HPP_FCL_TRAVERSAL_RECURSE_H
+#define HPP_FCL_TRAVERSAL_RECURSE_H
 
 #include <hpp/fcl/traversal/traversal_node_base.h>
 #include <hpp/fcl/traversal/traversal_node_bvhs.h>
diff --git a/src/BV/OBB.h b/src/BV/OBB.h
index abdbcc5d1379738c4faf688768dc3572bdd19d7e..479714d8e6c120e03f339f727c353a207b801ab2 100644
--- a/src/BV/OBB.h
+++ b/src/BV/OBB.h
@@ -33,8 +33,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef FCL_SRC_OBB_H
-# define FCL_SRC_OBB_H
+#ifndef HPP_FCL_SRC_OBB_H
+# define HPP_FCL_SRC_OBB_H
 
 namespace hpp
 {
@@ -52,4 +52,4 @@ namespace fcl
 
 } // namespace hpp
 
-#endif // FCL_SRC_OBB_H
+#endif // HPP_FCL_SRC_OBB_H
diff --git a/test/test_fcl_utility.h b/test/test_fcl_utility.h
index 71ff2cc7d904ca600c9af28270edec3340f53a80..08d577a3e1b16f64d0cefd26e23cc5bf343a9f22 100644
--- a/test/test_fcl_utility.h
+++ b/test/test_fcl_utility.h
@@ -35,8 +35,8 @@
 
 /** \author Jia Pan */
 
-#ifndef TEST_FCL_UTILITY_H
-#define TEST_FCL_UTILITY_H
+#ifndef TEST_HPP_FCL_UTILITY_H
+#define TEST_HPP_FCL_UTILITY_H
 
 #include <hpp/fcl/math/transform.h>
 #include <hpp/fcl/collision_data.h>