diff --git a/include/sot/core/binary-op.hh b/include/sot/core/binary-op.hh
index 402d7f0d7e22b3c4d7a3797ba82ce8fe37d8bb66..ea2593f446fb31a75c53f1d34a095ff5c8859c42 100644
--- a/include/sot/core/binary-op.hh
+++ b/include/sot/core/binary-op.hh
@@ -18,8 +18,8 @@
  * with sot-core.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SOT_BINARYOP_H__
-#define __SOT_BINARYOP_H__
+#ifndef SOT_CORE_BINARYOP_HH
+#define SOT_CORE_BINARYOP_HH
 
 /* --------------------------------------------------------------------- */
 /* --- INCLUDE --------------------------------------------------------- */
@@ -97,4 +97,4 @@ namespace dynamicgraph {
 } // namespace dynamicgraph
 
 
-#endif // #ifndef __SOT_BINARYOP_H__
+#endif // #ifndef SOT_CORE_BINARYOP_HH
diff --git a/include/sot/core/unary-op.hh b/include/sot/core/unary-op.hh
index 07e23aafd55590492226bec4ea78e5649f7a9649..4b9e5c5477c97d256eb5f4a282fd07dd946b2cc9 100644
--- a/include/sot/core/unary-op.hh
+++ b/include/sot/core/unary-op.hh
@@ -18,8 +18,8 @@
  * with sot-core.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SOT_BINARYOP_H__
-#define __SOT_BINARYOP_H__
+#ifndef SOT_CORE_UNARYOP_HH
+#define SOT_CORE_UNARYOP_HH
 
 /* --------------------------------------------------------------------- */
 /* --- INCLUDE --------------------------------------------------------- */
@@ -88,4 +88,4 @@ namespace dynamicgraph {
   } /* namespace sot */
 } /* namespace dynamicgraph */
 
-#endif // #ifndef __SOT_BINARYOP_H__
+#endif // #ifndef SOT_CORE_UNARYOP_HH