From eb686fe2dab42ff3193164384f2e3b793269ef73 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Thu, 31 Jan 2019 21:34:26 +0100
Subject: [PATCH] Prepend HPP_ to header guards

---
 include/hpp/fcl/BV/AABB.h                            | 4 ++--
 include/hpp/fcl/BV/BV.h                              | 4 ++--
 include/hpp/fcl/BV/BV_node.h                         | 4 ++--
 include/hpp/fcl/BV/OBB.h                             | 4 ++--
 include/hpp/fcl/BV/OBBRSS.h                          | 4 ++--
 include/hpp/fcl/BV/RSS.h                             | 4 ++--
 include/hpp/fcl/BV/kDOP.h                            | 4 ++--
 include/hpp/fcl/BV/kIOS.h                            | 4 ++--
 include/hpp/fcl/BVH/BVH_front.h                      | 4 ++--
 include/hpp/fcl/BVH/BVH_internal.h                   | 4 ++--
 include/hpp/fcl/BVH/BVH_model.h                      | 4 ++--
 include/hpp/fcl/BVH/BVH_utility.h                    | 4 ++--
 include/hpp/fcl/BVH/BV_fitter.h                      | 4 ++--
 include/hpp/fcl/BVH/BV_splitter.h                    | 4 ++--
 include/hpp/fcl/collision.h                          | 4 ++--
 include/hpp/fcl/collision_data.h                     | 4 ++--
 include/hpp/fcl/collision_func_matrix.h              | 4 ++--
 include/hpp/fcl/collision_node.h                     | 4 ++--
 include/hpp/fcl/collision_object.h                   | 4 ++--
 include/hpp/fcl/collision_utility.h                  | 4 ++--
 include/hpp/fcl/data_types.h                         | 4 ++--
 include/hpp/fcl/distance.h                           | 4 ++--
 include/hpp/fcl/distance_func_matrix.h               | 4 ++--
 include/hpp/fcl/intersect.h                          | 4 ++--
 include/hpp/fcl/math/matrix_3f.h                     | 4 ++--
 include/hpp/fcl/math/tools.h                         | 4 ++--
 include/hpp/fcl/math/transform.h                     | 4 ++--
 include/hpp/fcl/math/vec_3f.h                        | 4 ++--
 include/hpp/fcl/mesh_loader/assimp.h                 | 4 ++--
 include/hpp/fcl/mesh_loader/loader.h                 | 4 ++--
 include/hpp/fcl/narrowphase/gjk.h                    | 4 ++--
 include/hpp/fcl/narrowphase/narrowphase.h            | 4 ++--
 include/hpp/fcl/octree.h                             | 4 ++--
 include/hpp/fcl/profile.h                            | 4 ++--
 include/hpp/fcl/shape/geometric_shapes.h             | 4 ++--
 include/hpp/fcl/shape/geometric_shapes_utility.h     | 4 ++--
 include/hpp/fcl/traversal/traversal_node_base.h      | 4 ++--
 include/hpp/fcl/traversal/traversal_node_bvh_shape.h | 4 ++--
 include/hpp/fcl/traversal/traversal_node_bvhs.h      | 4 ++--
 include/hpp/fcl/traversal/traversal_node_octree.h    | 4 ++--
 include/hpp/fcl/traversal/traversal_node_setup.h     | 4 ++--
 include/hpp/fcl/traversal/traversal_node_shapes.h    | 4 ++--
 include/hpp/fcl/traversal/traversal_recurse.h        | 4 ++--
 src/BV/OBB.h                                         | 6 +++---
 test/test_fcl_utility.h                              | 4 ++--
 45 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/include/hpp/fcl/BV/AABB.h b/include/hpp/fcl/BV/AABB.h
index 5831a31c..b875b3c8 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 17ceaab6..5e3f9993 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 1e4bc54c..5889b740 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 5b38777b..f3897cf3 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 bed15470..bc8d715c 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 f4f3e572..3b33b280 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 d71e56c7..72be7f89 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 5465ba8d..64550f38 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 edd4edc7..2e189728 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 8462a15f..d0a23373 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 9b53d5d2..1f29a9bb 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 9c10d90a..85110c26 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 df17f743..8a158534 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 1af8da43..7ad7bd99 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 69943a27..f673494d 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 e748379b..fcafd0f7 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 35b68787..417039ca 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 15d4a45d..23fd309d 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 4d1589bd..6dd142e8 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 78ede987..1d302c7c 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 1616d341..fb234d91 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 4ee3e3d8..87216ce6 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 2d4586ea..c5a6f44c 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 4c16d7e4..b56a6c62 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 0187b4b9..122f3291 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 ec74dbdc..cfc19640 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 a4a8ee0d..2e829f88 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 c9936878..ede7b017 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 61e64456..12f6a631 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 43ce6992..934b395e 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 c10c3112..4748e3e0 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 5a73a1b0..96a0896b 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 fe20934f..497a1e88 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 f472b68d..96d70d1c 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 ba15e675..64051f04 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 d7612069..bec2e05e 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 8d19ad3d..81e1d61c 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 bf95f234..0d9730fe 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 865dff67..972955e0 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 4a00e14a..b9c47c07 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 42c775f4..b58ea457 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 2b2e6172..5180e9dc 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 21f5d4a6..f50bd75e 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 abdbcc5d..479714d8 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 71ff2cc7..08d577a3 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>
-- 
GitLab