diff --git a/yasmin/include/yasmin/blackboard/blackboard.hpp b/yasmin/include/yasmin/blackboard/blackboard.hpp
index d11f355..eb9dd54 100644
--- a/yasmin/include/yasmin/blackboard/blackboard.hpp
+++ b/yasmin/include/yasmin/blackboard/blackboard.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_BLACKBOARD_HPP
-#define YASMIN_BLACKBOARD_HPP
+#ifndef YASMIN__BLACKBOARD__BLACKBOARD_HPP
+#define YASMIN__BLACKBOARD__BLACKBOARD_HPP
 
 #include <exception>
 #include <map>
@@ -129,4 +129,4 @@ class Blackboard {
 } // namespace blackboard
 } // namespace yasmin
 
-#endif // YASMIN_BLACKBOARD_HPP
+#endif // YASMIN__BLACKBOARD_HPP
diff --git a/yasmin/include/yasmin/blackboard/blackboard_value.hpp b/yasmin/include/yasmin/blackboard/blackboard_value.hpp
index 49b3478..45ba24d 100644
--- a/yasmin/include/yasmin/blackboard/blackboard_value.hpp
+++ b/yasmin/include/yasmin/blackboard/blackboard_value.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_BLACKBOARD_VAL_HPP
-#define YASMIN_BLACKBOARD_VAL_HPP
+#ifndef YASMIN__BLACKBOARD__BLACKBOARD_VALUE_HPP
+#define YASMIN__BLACKBOARD__BLACKBOARD_VALUE_HPP
 
 #include <string>
 #include <typeinfo>
@@ -98,4 +98,4 @@ template <class T> class BlackboardValue : public BlackboardValueInterface {
 } // namespace blackboard
 } // namespace yasmin
 
-#endif // YASMIN_BLACKBOARD_VAL_HPP
+#endif // YASMIN__BLACKBOARD__BLACKBOARD_VALUE_HPP
diff --git a/yasmin/include/yasmin/blackboard/blackboard_value_interface.hpp b/yasmin/include/yasmin/blackboard/blackboard_value_interface.hpp
index fa30233..819637b 100644
--- a/yasmin/include/yasmin/blackboard/blackboard_value_interface.hpp
+++ b/yasmin/include/yasmin/blackboard/blackboard_value_interface.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_BLACKBOARD_VAL_IFACE_HPP
-#define YASMIN_BLACKBOARD_VAL_IFACE_HPP
+#ifndef YASMIN__BLACKBOARD__BLACKBOARD_VALUE_INTERFACE_HPP
+#define YASMIN__BLACKBOARD__BLACKBOARD_VALUE_INTERFACE_HPP
 
 #include <string>
 
@@ -47,4 +47,4 @@ class BlackboardValueInterface {
 } // namespace blackboard
 } // namespace yasmin
 
-#endif // YASMIN_BLACKBOARD_VAL_IFACE_HPP
+#endif // YASMIN__BLACKBOARD__BLACKBOARD_VALUE_INTERFACE_HPP
diff --git a/yasmin/include/yasmin/cb_state.hpp b/yasmin/include/yasmin/cb_state.hpp
index 7453bc8..e451fbe 100644
--- a/yasmin/include/yasmin/cb_state.hpp
+++ b/yasmin/include/yasmin/cb_state.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_CB_STATE_HPP
-#define YASMIN_CB_STATE_HPP
+#ifndef YASMIN__CB_STATE_HPP
+#define YASMIN__CB_STATE_HPP
 
 #include <memory>
 #include <set>
@@ -72,4 +72,4 @@ class CbState : public State {
 
 } // namespace yasmin
 
-#endif // YASMIN_CB_STATE_HPP
+#endif // YASMIN__CB_STATE_HPP
diff --git a/yasmin/include/yasmin/logs.hpp b/yasmin/include/yasmin/logs.hpp
index 555a128..74501b3 100644
--- a/yasmin/include/yasmin/logs.hpp
+++ b/yasmin/include/yasmin/logs.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_LOGS_HPP
-#define YASMIN_LOGS_HPP
+#ifndef YASMIN__LOGS_HPP
+#define YASMIN__LOGS_HPP
 
 #include <cstdarg>
 #include <cstdio>
@@ -100,4 +100,4 @@ void set_default_loggers();
 
 } // namespace yasmin
 
-#endif // YASMIN_LOGS_HPP
+#endif // YASMIN__LOGS_HPP
diff --git a/yasmin/include/yasmin/state.hpp b/yasmin/include/yasmin/state.hpp
index 0a98caf..72709e2 100644
--- a/yasmin/include/yasmin/state.hpp
+++ b/yasmin/include/yasmin/state.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_STATE_HPP
-#define YASMIN_STATE_HPP
+#ifndef YASMIN__STATE_HPP
+#define YASMIN__STATE_HPP
 
 #include <atomic>
 #include <memory>
@@ -141,4 +141,4 @@ class State {
 
 } // namespace yasmin
 
-#endif // YASMIN_STATE_HPP
+#endif // YASMIN__STATE_HPP
diff --git a/yasmin/include/yasmin/state_machine.hpp b/yasmin/include/yasmin/state_machine.hpp
index 2d5fea4..c8a41c0 100644
--- a/yasmin/include/yasmin/state_machine.hpp
+++ b/yasmin/include/yasmin/state_machine.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_STATE_MACHINE_HPP
-#define YASMIN_STATE_MACHINE_HPP
+#ifndef YASMIN__STATE_MACHINE_HPP
+#define YASMIN__STATE_MACHINE_HPP
 
 #include <atomic>
 #include <functional>
@@ -256,4 +256,4 @@ class StateMachine : public State {
 
 } // namespace yasmin
 
-#endif
+#endif // YASMIN__STATE_MACHINE_HPP
diff --git a/yasmin_ros/include/yasmin_ros/action_state.hpp b/yasmin_ros/include/yasmin_ros/action_state.hpp
index ece6500..bdb40cc 100644
--- a/yasmin_ros/include/yasmin_ros/action_state.hpp
+++ b/yasmin_ros/include/yasmin_ros/action_state.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_ROS_ACTION_STATE_HPP
-#define YASMIN_ROS_ACTION_STATE_HPP
+#ifndef YASMIN_ROS__ACTION_STATE_HPP
+#define YASMIN_ROS__ACTION_STATE_HPP
 
 #include <condition_variable>
 #include <functional>
@@ -377,4 +377,4 @@ template <typename ActionT> class ActionState : public yasmin::State {
 
 } // namespace yasmin_ros
 
-#endif // YASMIN_ROS_ACTION_STATE_HPP
+#endif // YASMIN_ROS__ACTION_STATE_HPP
diff --git a/yasmin_ros/include/yasmin_ros/basic_outcomes.hpp b/yasmin_ros/include/yasmin_ros/basic_outcomes.hpp
index dc91247..25056a8 100644
--- a/yasmin_ros/include/yasmin_ros/basic_outcomes.hpp
+++ b/yasmin_ros/include/yasmin_ros/basic_outcomes.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_ROS_BASIC_OUTCOME_HPP
-#define YASMIN_ROS_BASIC_OUTCOME_HPP
+#ifndef YASMIN_ROS__BASIC_OUTCOME_HPP
+#define YASMIN_ROS__BASIC_OUTCOME_HPP
 
 #include <string>
 
@@ -65,4 +65,4 @@ constexpr char TIMEOUT[] = "timeout";
 } // namespace basic_outcomes
 } // namespace yasmin_ros
 
-#endif // YASMIN_ROS_BASIC_OUTCOME_HPP
\ No newline at end of file
+#endif // YASMIN_ROS__BASIC_OUTCOME_HPP
\ No newline at end of file
diff --git a/yasmin_ros/include/yasmin_ros/monitor_state.hpp b/yasmin_ros/include/yasmin_ros/monitor_state.hpp
index acf88fa..a906be4 100644
--- a/yasmin_ros/include/yasmin_ros/monitor_state.hpp
+++ b/yasmin_ros/include/yasmin_ros/monitor_state.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_ROS_MONITOR_STATE_HPP
-#define YASMIN_ROS_MONITOR_STATE_HPP
+#ifndef YASMIN_ROS__MONITOR_STATE_HPP
+#define YASMIN_ROS__MONITOR_STATE_HPP
 
 #include <chrono>
 #include <functional>
@@ -215,4 +215,4 @@ template <typename MsgT> class MonitorState : public yasmin::State {
 
 } // namespace yasmin_ros
 
-#endif
+#endif // YASMIN_ROS__MONITOR_STATE_HPP
diff --git a/yasmin_ros/include/yasmin_ros/ros_logs.hpp b/yasmin_ros/include/yasmin_ros/ros_logs.hpp
index b3820b1..c29e6c0 100644
--- a/yasmin_ros/include/yasmin_ros/ros_logs.hpp
+++ b/yasmin_ros/include/yasmin_ros/ros_logs.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_ROS_LOGS_HPP
-#define YASMIN_ROS_LOGS_HPP
+#ifndef YASMIN_ROS__LOGS_HPP
+#define YASMIN_ROS__LOGS_HPP
 
 namespace yasmin_ros {
 
@@ -33,4 +33,4 @@ void set_ros_loggers();
 
 } // namespace yasmin_ros
 
-#endif // YASMIN_ROS_LOGS_HPP
+#endif // YASMIN_ROS__LOGS_HPP
diff --git a/yasmin_ros/include/yasmin_ros/service_state.hpp b/yasmin_ros/include/yasmin_ros/service_state.hpp
index 66b8e85..c5e3df9 100644
--- a/yasmin_ros/include/yasmin_ros/service_state.hpp
+++ b/yasmin_ros/include/yasmin_ros/service_state.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_ROS_SERVICE_STATE_HPP
-#define YASMIN_ROS_SERVICE_STATE_HPP
+#ifndef YASMIN_ROS__SERVICE_STATE_HPP
+#define YASMIN_ROS__SERVICE_STATE_HPP
 
 #include <functional>
 #include <memory>
@@ -214,4 +214,4 @@ template <typename ServiceT> class ServiceState : public yasmin::State {
 
 } // namespace yasmin_ros
 
-#endif // YASMIN_ROS_SERVICE_STATE_HPP
+#endif // YASMIN_ROS__SERVICE_STATE_HPP
diff --git a/yasmin_ros/include/yasmin_ros/yasmin_node.hpp b/yasmin_ros/include/yasmin_ros/yasmin_node.hpp
index 9ec17a6..f930d64 100644
--- a/yasmin_ros/include/yasmin_ros/yasmin_node.hpp
+++ b/yasmin_ros/include/yasmin_ros/yasmin_node.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_ROS_YASMIN_NODE_HPP
-#define YASMIN_ROS_YASMIN_NODE_HPP
+#ifndef YASMIN_ROS__YASMIN_NODE_HPP
+#define YASMIN_ROS__YASMIN_NODE_HPP
 
 #include <memory>
 #include <string>
@@ -85,4 +85,4 @@ class YasminNode : public rclcpp::Node {
 
 } // namespace yasmin_ros
 
-#endif // YASMIN_ROS_YASMIN_NODE_HPP
+#endif // YASMIN_ROS__YASMIN_NODE_HPP
diff --git a/yasmin_viewer/include/yasmin_viewer/yasmin_viewer_pub.hpp b/yasmin_viewer/include/yasmin_viewer/yasmin_viewer_pub.hpp
index 7858f3c..e5c8513 100644
--- a/yasmin_viewer/include/yasmin_viewer/yasmin_viewer_pub.hpp
+++ b/yasmin_viewer/include/yasmin_viewer/yasmin_viewer_pub.hpp
@@ -13,8 +13,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#ifndef YASMIN_VIEWER_PUB_HPP
-#define YASMIN_VIEWER_PUB_HPP
+#ifndef YASMIN_VIEWER__YASMIN_VIEWER_PUB_HPP
+#define YASMIN_VIEWER__YASMIN_VIEWER_PUB_HPP
 
 #include <map>
 #include <memory>
@@ -104,4 +104,4 @@ class YasminViewerPub {
 
 } // namespace yasmin_viewer
 
-#endif
+#endif // YASMIN_VIEWER__YASMIN_VIEWER_PUB_HPP