diff --git a/rviz_common/src/rviz_common/logging.cpp b/rviz_common/src/rviz_common/logging.cpp
index 156e74c6a..f76047946 100644
--- a/rviz_common/src/rviz_common/logging.cpp
+++ b/rviz_common/src/rviz_common/logging.cpp
@@ -38,44 +38,44 @@
 
 namespace
 {
-
+// *INDENT-OFF*
 static rviz_common::LoggingHandler __debug_logging_handler = [](
   const std::string & message,
   const std::string & file_name,
   size_t line_number)
-  {
-    printf(
-      "[rviz_common:debug] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
-  };
+{
+  printf(
+    "[rviz_common:debug] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
+};
 static rviz_common::LoggingHandler __info_logging_handler = [](
   const std::string & message,
   const std::string & file_name,
   size_t line_number)
-  {
-    printf(
-      "[rviz_common:info] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
-  };
+{
+  printf(
+    "[rviz_common:info] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
+};
 static rviz_common::LoggingHandler __warning_logging_handler = [](
   const std::string & message,
   const std::string & file_name,
   size_t line_number)
-  {
-    fprintf(
-      stderr,
-      "[rviz_common:warning] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
-  };
+{
+  fprintf(
+    stderr,
+    "[rviz_common:warning] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
+};
 static rviz_common::LoggingHandler __error_logging_handler = [](
   const std::string & message,
   const std::string & file_name,
   size_t line_number)
-  {
-    fprintf(
-      stderr,
-      "[rviz_common:error] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
-  };
+{
+  fprintf(
+    stderr,
+    "[rviz_common:error] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
+};
 
 static std::mutex __logging_mutex;
-
+// *INDENT-ON*
 }  // namespace
 
 namespace rviz_common
diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/interactive_markers/interactive_marker_namespace_property.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/interactive_markers/interactive_marker_namespace_property.hpp
index 5aba02781..dc241567e 100644
--- a/rviz_default_plugins/include/rviz_default_plugins/displays/interactive_markers/interactive_marker_namespace_property.hpp
+++ b/rviz_default_plugins/include/rviz_default_plugins/displays/interactive_markers/interactive_marker_namespace_property.hpp
@@ -26,10 +26,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+// *INDENT-OFF*
 #ifndef /* NOLINT */ \
   RVIZ_DEFAULT_PLUGINS__DISPLAYS__INTERACTIVE_MARKERS__INTERACTIVE_MARKER_NAMESPACE_PROPERTY_HPP_
 #define /* NOLINT */ \
   RVIZ_DEFAULT_PLUGINS__DISPLAYS__INTERACTIVE_MARKERS__INTERACTIVE_MARKER_NAMESPACE_PROPERTY_HPP_
+// *INDENT-ON*
 
 #include <string>
 
diff --git a/rviz_rendering/src/rviz_rendering/logging.cpp b/rviz_rendering/src/rviz_rendering/logging.cpp
index dca11e4e9..bb0037674 100644
--- a/rviz_rendering/src/rviz_rendering/logging.cpp
+++ b/rviz_rendering/src/rviz_rendering/logging.cpp
@@ -38,44 +38,44 @@
 
 namespace
 {
-
+// *INDENT-OFF*
 static rviz_rendering::LoggingHandler __debug_logging_handler = [](
   const std::string & message,
   const std::string & file_name,
   size_t line_number)
-  {
-    printf(
-      "[rviz_rendering:debug] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
-  };
+{
+  printf(
+    "[rviz_rendering:debug] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
+};
 static rviz_rendering::LoggingHandler __info_logging_handler = [](
   const std::string & message,
   const std::string & file_name,
   size_t line_number)
-  {
-    printf(
-      "[rviz_rendering:info] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
-  };
+{
+  printf(
+    "[rviz_rendering:info] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
+};
 static rviz_rendering::LoggingHandler __warning_logging_handler = [](
   const std::string & message,
   const std::string & file_name,
   size_t line_number)
-  {
-    fprintf(
-      stderr,
-      "[rviz_rendering:warning] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
-  };
+{
+  fprintf(
+    stderr,
+    "[rviz_rendering:warning] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
+};
 static rviz_rendering::LoggingHandler __error_logging_handler = [](
   const std::string & message,
   const std::string & file_name,
   size_t line_number)
-  {
-    fprintf(
-      stderr,
-      "[rviz_rendering:error] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
-  };
+{
+  fprintf(
+    stderr,
+    "[rviz_rendering:error] %s, at %s:%zu\n", message.c_str(), file_name.c_str(), line_number);
+};
 
 static std::mutex __logging_mutex;
-
+// *INDENT-ON*
 }  // namespace
 
 namespace rviz_rendering