diff --git a/evaluator/diagnostic_converter/include/diagnostic_converter/converter_node.hpp b/evaluator/diagnostic_converter/include/diagnostic_converter/converter_node.hpp
index 53c762dac0ffe..59bb02ebf301f 100644
--- a/evaluator/diagnostic_converter/include/diagnostic_converter/converter_node.hpp
+++ b/evaluator/diagnostic_converter/include/diagnostic_converter/converter_node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef CONVERTER_NODE_HPP_
-#define CONVERTER_NODE_HPP_
+#ifndef DIAGNOSTIC_CONVERTER__CONVERTER_NODE_HPP_
+#define DIAGNOSTIC_CONVERTER__CONVERTER_NODE_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -63,4 +63,4 @@ class DiagnosticConverter : public rclcpp::Node
 };
 }  // namespace diagnostic_converter
 
-#endif  // CONVERTER_NODE_HPP_
+#endif  // DIAGNOSTIC_CONVERTER__CONVERTER_NODE_HPP_
diff --git a/evaluator/diagnostic_converter/test/test_converter_node.cpp b/evaluator/diagnostic_converter/test/test_converter_node.cpp
index d6e6b21e293f2..167421f0777df 100644
--- a/evaluator/diagnostic_converter/test/test_converter_node.cpp
+++ b/evaluator/diagnostic_converter/test/test_converter_node.cpp
@@ -14,14 +14,14 @@
 
 #include "diagnostic_converter/converter_node.hpp"
 
-#include <gtest/gtest.h>
-
 #include <rclcpp/rclcpp.hpp>
 
 #include "diagnostic_msgs/msg/diagnostic_array.hpp"
 #include "tier4_simulation_msgs/msg/user_defined_value.hpp"
 #include "tier4_simulation_msgs/msg/user_defined_value_type.hpp"
 
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>