diff --git a/image_proc/src/rectify.cpp b/image_proc/src/rectify.cpp
index 2c658d79f..54257f047 100644
--- a/image_proc/src/rectify.cpp
+++ b/image_proc/src/rectify.cpp
@@ -81,14 +81,14 @@ void RectifyNode::imageCb(
   TRACEPOINT(
     image_proc_rectify_init,
     static_cast<const void *>(this),
-    static_cast<const void *> (&(*image_msg)),
+    static_cast<const void *>(&(*image_msg)),
     static_cast<const void *>(&(*info_msg)));
 
   if (pub_rect_.getNumSubscribers() < 1) {
     TRACEPOINT(
       image_proc_rectify_fini,
       static_cast<const void *>(this),
-      static_cast<const void *> (&(*image_msg)),
+      static_cast<const void *>(&(*image_msg)),
       static_cast<const void *>(&(*info_msg)));
 
     return;
@@ -102,7 +102,7 @@ void RectifyNode::imageCb(
     TRACEPOINT(
       image_proc_rectify_fini,
       static_cast<const void *>(this),
-      static_cast<const void *> (&(*image_msg)),
+      static_cast<const void *>(&(*image_msg)),
       static_cast<const void *>(&(*info_msg)));
     return;
   }
@@ -123,7 +123,7 @@ void RectifyNode::imageCb(
     TRACEPOINT(
       image_proc_rectify_fini,
       static_cast<const void *>(this),
-      static_cast<const void *> (&(*image_msg)),
+      static_cast<const void *>(&(*image_msg)),
       static_cast<const void *>(&(*info_msg)));
     return;
   }
@@ -146,7 +146,7 @@ void RectifyNode::imageCb(
   TRACEPOINT(
     image_proc_rectify_fini,
     static_cast<const void *>(this),
-    static_cast<const void *> (&(*image_msg)),
+    static_cast<const void *>(&(*image_msg)),
     static_cast<const void *>(&(*info_msg)));
 }
 
diff --git a/image_proc/src/resize.cpp b/image_proc/src/resize.cpp
index af709c8ef..974f92ab6 100644
--- a/image_proc/src/resize.cpp
+++ b/image_proc/src/resize.cpp
@@ -81,7 +81,7 @@ void ResizeNode::imageCb(
   TRACEPOINT(
     image_proc_resize_init,
     static_cast<const void *>(this),
-    static_cast<const void *> (&(*image_msg)),
+    static_cast<const void *>(&(*image_msg)),
     static_cast<const void *>(&(*info_msg)));
 
   cv_bridge::CvImagePtr cv_ptr;
@@ -92,7 +92,7 @@ void ResizeNode::imageCb(
     TRACEPOINT(
       image_proc_resize_fini,
       static_cast<const void *>(this),
-      static_cast<const void *> (&(*image_msg)),
+      static_cast<const void *>(&(*image_msg)),
       static_cast<const void *>(&(*info_msg)));
     RCLCPP_ERROR(this->get_logger(), "cv_bridge exception: %s", e.what());
     return;
@@ -142,9 +142,8 @@ void ResizeNode::imageCb(
   TRACEPOINT(
     image_proc_resize_fini,
     static_cast<const void *>(this),
-    static_cast<const void *> (&(*image_msg)),
+    static_cast<const void *>(&(*image_msg)),
     static_cast<const void *>(&(*info_msg)));
-
 }
 
 }  // namespace image_proc
diff --git a/tracetools_image_pipeline/include/tracetools_image_pipeline/visibility_control.hpp b/tracetools_image_pipeline/include/tracetools_image_pipeline/visibility_control.hpp
index 17402cdf6..b6ba91f6d 100644
--- a/tracetools_image_pipeline/include/tracetools_image_pipeline/visibility_control.hpp
+++ b/tracetools_image_pipeline/include/tracetools_image_pipeline/visibility_control.hpp
@@ -20,8 +20,8 @@
  * library cannot have, but the consuming code must have inorder to link.
  */
 
-#ifndef TRACETOOLS__VISIBILITY_CONTROL_IMAGE_PIPELINE_HPP_
-#define TRACETOOLS__VISIBILITY_CONTROL_IMAGE_PIPELINE_HPP_
+#ifndef TRACETOOLS_IMAGE_PIPELINE__VISIBILITY_CONTROL_HPP_
+#define TRACETOOLS_IMAGE_PIPELINE__VISIBILITY_CONTROL_HPP_
 
 // This logic was borrowed (then namespaced) from the examples on the gcc wiki:
 //     https://gcc.gnu.org/wiki/Visibility
@@ -54,4 +54,4 @@
   #define TRACETOOLS_PUBLIC_TYPE
 #endif
 
-#endif  // TRACETOOLS__VISIBILITY_CONTROL_IMAGE_PIPELINE_HPP_
+#endif  // TRACETOOLS_IMAGE_PIPELINE__VISIBILITY_CONTROL_HPP_
diff --git a/tracetools_image_pipeline/src/tracetools.c b/tracetools_image_pipeline/src/tracetools.c
index 6218076e9..fd7e3d326 100644
--- a/tracetools_image_pipeline/src/tracetools.c
+++ b/tracetools_image_pipeline/src/tracetools.c
@@ -44,9 +44,9 @@ bool ros_trace_compile_status()
 
 void TRACEPOINT(
   image_proc_resize_init,
-    const void * resize_node_arg,
-    const void * resize_image_msg_arg,
-    const void * resize_info_msg_arg)
+  const void * resize_node_arg,
+  const void * resize_image_msg_arg,
+  const void * resize_info_msg_arg)
 {
   CONDITIONAL_TP(
     image_proc_resize_init,
@@ -57,9 +57,9 @@ void TRACEPOINT(
 
 void TRACEPOINT(
   image_proc_resize_fini,
-    const void * resize_node_arg,
-    const void * resize_image_msg_arg,
-    const void * resize_info_msg_arg)
+  const void * resize_node_arg,
+  const void * resize_image_msg_arg,
+  const void * resize_info_msg_arg)
 {
   CONDITIONAL_TP(
     image_proc_resize_fini,
@@ -70,9 +70,9 @@ void TRACEPOINT(
 
 void TRACEPOINT(
   image_proc_rectify_init,
-    const void * rectify_node_arg,
-    const void * rectify_image_msg_arg,
-    const void * rectify_info_msg_arg)
+  const void * rectify_node_arg,
+  const void * rectify_image_msg_arg,
+  const void * rectify_info_msg_arg)
 {
   CONDITIONAL_TP(
     image_proc_rectify_init,
@@ -83,9 +83,9 @@ void TRACEPOINT(
 
 void TRACEPOINT(
   image_proc_rectify_fini,
-    const void * rectify_node_arg,
-    const void * rectify_image_msg_arg,
-    const void * rectify_info_msg_arg)
+  const void * rectify_node_arg,
+  const void * rectify_image_msg_arg,
+  const void * rectify_info_msg_arg)
 {
   CONDITIONAL_TP(
     image_proc_rectify_fini,