diff --git a/tracetools/include/tracetools/tp_call.h b/tracetools/include/tracetools/tp_call.h
index fe91eea..fb6c457 100644
--- a/tracetools/include/tracetools/tp_call.h
+++ b/tracetools/include/tracetools/tp_call.h
@@ -18,8 +18,8 @@
 #undef TRACEPOINT_INCLUDE
 #define TRACEPOINT_INCLUDE "tracetools/tp_call.h"
 
-#if !defined(___INCLUDE_TP_CALL_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define ___INCLUDE_TP_CALL_H
+#if !defined(TRACETOOLS__TP_CALL_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define TRACETOOLS__TP_CALL_H_
 
 #include <lttng/tracepoint.h>
 
@@ -216,6 +216,6 @@ TRACEPOINT_EVENT(
   )
 )
 
-#endif /* ___INCLUDE_TP_CALL_H */
+#endif  // TRACETOOLS__TP_CALL_H_
 
 #include <lttng/tracepoint-event.h>
diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index 93a3374..2bf082d 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -150,4 +150,4 @@ void TRACEPOINT(
 }
 #endif
 
-#endif /* TRACETOOLS__TRACETOOLS_H_ */
+#endif  // TRACETOOLS__TRACETOOLS_H_
diff --git a/tracetools/include/tracetools/utils.hpp b/tracetools/include/tracetools/utils.hpp
index a1a55a7..e73030b 100644
--- a/tracetools/include/tracetools/utils.hpp
+++ b/tracetools/include/tracetools/utils.hpp
@@ -27,7 +27,7 @@ void * get_address(std::function<T(U...)> f)
   if (fnPointer == nullptr) {
     return 0;
   }
-  return (void *)*fnPointer;
+  return reinterpret_cast<void *>(*fnPointer);
 }
 
 const char * get_symbol(void * funptr);
diff --git a/tracetools/src/tp_call.c b/tracetools/src/tp_call.c
index 778e139..6a24fba 100644
--- a/tracetools/src/tp_call.c
+++ b/tracetools/src/tp_call.c
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 #define TRACEPOINT_CREATE_PROBES
-/*
- * The header containing our TRACEPOINT_EVENTs.
- */
+
 #define TRACEPOINT_DEFINE
 #include "tracetools/tp_call.h"