diff --git a/tracetools/CMakeLists.txt b/tracetools/CMakeLists.txt
index d9784c6f..4460a2d3 100644
--- a/tracetools/CMakeLists.txt
+++ b/tracetools/CMakeLists.txt
@@ -50,7 +50,7 @@ set(SOURCES
 set(HEADERS
   include/${PROJECT_NAME}/tracetools.h
   include/${PROJECT_NAME}/utils.hpp
-  include/${PROJECT_NAME}/visibility_control.hpp
+  include/${PROJECT_NAME}/visibility_control.h
 )
 if(NOT TRACETOOLS_TRACEPOINTS_EXCLUDED)
   # We only need these if we're using LTTng
diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index ad89a061..66d06917 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -32,7 +32,7 @@
 #include <stdbool.h>
 
 #include "tracetools/config.h"
-#include "tracetools/visibility_control.hpp"
+#include "tracetools/visibility_control.h"
 
 #ifndef TRACETOOLS_DISABLED
 /**
@@ -134,7 +134,7 @@ extern "C"
 /**
  * \return `true` if tracing is enabled, `false` otherwise
  */
-TRACETOOLS_PUBLIC bool ros_trace_compile_status();
+TRACETOOLS_PUBLIC bool ros_trace_compile_status(void);
 
 /// `rcl_init`
 /**
diff --git a/tracetools/include/tracetools/visibility_control.hpp b/tracetools/include/tracetools/visibility_control.h
similarity index 93%
rename from tracetools/include/tracetools/visibility_control.hpp
rename to tracetools/include/tracetools/visibility_control.h
index 63a5a588..4a93d998 100644
--- a/tracetools/include/tracetools/visibility_control.hpp
+++ b/tracetools/include/tracetools/visibility_control.h
@@ -19,8 +19,8 @@
  * library cannot have, but the consuming code must have inorder to link.
  */
 
-#ifndef TRACETOOLS__VISIBILITY_CONTROL_HPP_
-#define TRACETOOLS__VISIBILITY_CONTROL_HPP_
+#ifndef TRACETOOLS__VISIBILITY_CONTROL_H_
+#define TRACETOOLS__VISIBILITY_CONTROL_H_
 
 // This logic was borrowed (then namespaced) from the examples on the gcc wiki:
 //     https://gcc.gnu.org/wiki/Visibility
@@ -53,4 +53,4 @@
   #define TRACETOOLS_PUBLIC_TYPE
 #endif
 
-#endif  // TRACETOOLS__VISIBILITY_CONTROL_HPP_
+#endif  // TRACETOOLS__VISIBILITY_CONTROL_H_
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index 2a7653cb..8f35ad07 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -68,7 +68,7 @@
   }
 // *INDENT-ON*
 
-bool ros_trace_compile_status()
+bool ros_trace_compile_status(void)
 {
 #ifndef TRACETOOLS_TRACEPOINTS_EXCLUDED
   return true;