diff --git a/rviz_common/src/rviz_common/add_display_dialog.cpp b/rviz_common/src/rviz_common/add_display_dialog.cpp
index 5ec60796f..93a4e7c4e 100644
--- a/rviz_common/src/rviz_common/add_display_dialog.cpp
+++ b/rviz_common/src/rviz_common/add_display_dialog.cpp
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./add_display_dialog.hpp"
+#include "add_display_dialog.hpp"
 
 #include <algorithm>
 #include <map>
@@ -52,7 +52,7 @@
 
 #include "rcl/validate_topic_name.h"
 
-#include "./display_factory.hpp"
+#include "display_factory.hpp"
 #include "rviz_common/load_resource.hpp"
 #include "rviz_common/logging.hpp"
 #include "rviz_common/ros_integration/ros_node_abstraction.hpp"
diff --git a/rviz_common/src/rviz_common/display_factory.cpp b/rviz_common/src/rviz_common/display_factory.cpp
index 54721c468..d912b8650 100644
--- a/rviz_common/src/rviz_common/display_factory.cpp
+++ b/rviz_common/src/rviz_common/display_factory.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./display_factory.hpp"
+#include "display_factory.hpp"
 
 #include <string>
 
diff --git a/rviz_common/src/rviz_common/displays_panel.cpp b/rviz_common/src/rviz_common/displays_panel.cpp
index 9d0c57003..077fb3cf8 100644
--- a/rviz_common/src/rviz_common/displays_panel.cpp
+++ b/rviz_common/src/rviz_common/displays_panel.cpp
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./displays_panel.hpp"
+#include "displays_panel.hpp"
 
 #include <string>
 
@@ -41,9 +41,9 @@
 #include <QTimer>  // NOLINT: cpplint is unable to handle the include order here
 #include <QVBoxLayout>  // NOLINT: cpplint is unable to handle the include order here
 
-#include "./display_factory.hpp"
+#include "display_factory.hpp"
 #include "rviz_common/display.hpp"
-#include "./add_display_dialog.hpp"
+#include "add_display_dialog.hpp"
 #include "rviz_common/properties/property.hpp"
 #include "rviz_common/properties/property_tree_widget.hpp"
 #include "rviz_common/properties/property_tree_with_help.hpp"
diff --git a/rviz_common/src/rviz_common/failed_display.cpp b/rviz_common/src/rviz_common/failed_display.cpp
index 0cbcdda94..f8dc311b0 100644
--- a/rviz_common/src/rviz_common/failed_display.cpp
+++ b/rviz_common/src/rviz_common/failed_display.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./failed_display.hpp"
+#include "failed_display.hpp"
 
 #include <QColor>  // NOLINT: cpplint is unable to handle the include order here
 
diff --git a/rviz_common/src/rviz_common/failed_panel.cpp b/rviz_common/src/rviz_common/failed_panel.cpp
index a0f2a9de5..ccd810cfa 100644
--- a/rviz_common/src/rviz_common/failed_panel.cpp
+++ b/rviz_common/src/rviz_common/failed_panel.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./failed_panel.hpp"
+#include "failed_panel.hpp"
 
 #include <cstdio>
 
diff --git a/rviz_common/src/rviz_common/failed_tool.cpp b/rviz_common/src/rviz_common/failed_tool.cpp
index 3e8601682..75f173f29 100644
--- a/rviz_common/src/rviz_common/failed_tool.cpp
+++ b/rviz_common/src/rviz_common/failed_tool.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./failed_tool.hpp"
+#include "failed_tool.hpp"
 
 #include <QMessageBox>
 
diff --git a/rviz_common/src/rviz_common/failed_view_controller.cpp b/rviz_common/src/rviz_common/failed_view_controller.cpp
index 685a609ec..5ebca8d3c 100644
--- a/rviz_common/src/rviz_common/failed_view_controller.cpp
+++ b/rviz_common/src/rviz_common/failed_view_controller.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./failed_view_controller.hpp"
+#include "failed_view_controller.hpp"
 
 #include <QMessageBox>
 
diff --git a/rviz_common/src/rviz_common/help_panel.cpp b/rviz_common/src/rviz_common/help_panel.cpp
index f52d0723d..48ad101e5 100644
--- a/rviz_common/src/rviz_common/help_panel.cpp
+++ b/rviz_common/src/rviz_common/help_panel.cpp
@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./help_panel.hpp"
+#include "help_panel.hpp"
 
 #include <string>
 
diff --git a/rviz_common/src/rviz_common/loading_dialog.cpp b/rviz_common/src/rviz_common/loading_dialog.cpp
index fc10b59e3..3bb215aa6 100644
--- a/rviz_common/src/rviz_common/loading_dialog.cpp
+++ b/rviz_common/src/rviz_common/loading_dialog.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./loading_dialog.hpp"
+#include "loading_dialog.hpp"
 
 #include <QApplication>
 #include <QLabel>
diff --git a/rviz_common/src/rviz_common/new_object_dialog.cpp b/rviz_common/src/rviz_common/new_object_dialog.cpp
index 09ee718bc..bea9984f3 100644
--- a/rviz_common/src/rviz_common/new_object_dialog.cpp
+++ b/rviz_common/src/rviz_common/new_object_dialog.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./new_object_dialog.hpp"
+#include "new_object_dialog.hpp"
 
 #include <algorithm>
 #include <map>
diff --git a/rviz_common/src/rviz_common/panel_factory.cpp b/rviz_common/src/rviz_common/panel_factory.cpp
index 8000f75ef..5bffb3404 100644
--- a/rviz_common/src/rviz_common/panel_factory.cpp
+++ b/rviz_common/src/rviz_common/panel_factory.cpp
@@ -29,17 +29,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./panel_factory.hpp"
+#include "panel_factory.hpp"
 
 #include <string>
 
-#include "./displays_panel.hpp"
-#include "./help_panel.hpp"
-#include "./selection_panel.hpp"
-#include "./time_panel.hpp"
-#include "./tool_properties_panel.hpp"
-#include "./transformation_panel.hpp"
-#include "./views_panel.hpp"
+#include "displays_panel.hpp"
+#include "help_panel.hpp"
+#include "selection_panel.hpp"
+#include "time_panel.hpp"
+#include "tool_properties_panel.hpp"
+#include "transformation_panel.hpp"
+#include "views_panel.hpp"
 #include "rviz_common/visualization_manager.hpp"
 #include "rviz_common/ros_integration/ros_node_abstraction_iface.hpp"
 
diff --git a/rviz_common/src/rviz_common/scaled_image_widget.cpp b/rviz_common/src/rviz_common/scaled_image_widget.cpp
index 72f92f556..bfe3a1cd5 100644
--- a/rviz_common/src/rviz_common/scaled_image_widget.cpp
+++ b/rviz_common/src/rviz_common/scaled_image_widget.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./scaled_image_widget.hpp"
+#include "scaled_image_widget.hpp"
 
 #include <QPainter>
 #include <QWidget>
diff --git a/rviz_common/src/rviz_common/screenshot_dialog.cpp b/rviz_common/src/rviz_common/screenshot_dialog.cpp
index f0d454011..b73ca15e9 100644
--- a/rviz_common/src/rviz_common/screenshot_dialog.cpp
+++ b/rviz_common/src/rviz_common/screenshot_dialog.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./screenshot_dialog.hpp"
+#include "screenshot_dialog.hpp"
 
 #include <utility>
 
@@ -47,7 +47,7 @@
 #include <QVBoxLayout>  // NOLINT: cpplint is unable to handle the include order here
 #include <QWindow>  // NOLINT: cpplint is unable to handle the include order here
 
-#include "./scaled_image_widget.hpp"
+#include "scaled_image_widget.hpp"
 
 namespace rviz_common
 {
diff --git a/rviz_common/src/rviz_common/time_panel.cpp b/rviz_common/src/rviz_common/time_panel.cpp
index dec5721cb..88e154c91 100644
--- a/rviz_common/src/rviz_common/time_panel.cpp
+++ b/rviz_common/src/rviz_common/time_panel.cpp
@@ -27,6 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "time_panel.hpp"
+
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
@@ -41,8 +43,6 @@
 
 #include "rviz_common/display_group.hpp"
 
-#include "./time_panel.hpp"
-
 namespace rviz_common
 {
 
diff --git a/rviz_common/src/rviz_common/transformation/identity_frame_transformer.cpp b/rviz_common/src/rviz_common/transformation/identity_frame_transformer.cpp
index e832ec935..f92207529 100644
--- a/rviz_common/src/rviz_common/transformation/identity_frame_transformer.cpp
+++ b/rviz_common/src/rviz_common/transformation/identity_frame_transformer.cpp
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./identity_frame_transformer.hpp"
+#include "identity_frame_transformer.hpp"
 
 #include <future>
 #include <memory>
diff --git a/rviz_common/src/rviz_common/views_panel.cpp b/rviz_common/src/rviz_common/views_panel.cpp
index 18fbc194f..c39ebbcd6 100644
--- a/rviz_common/src/rviz_common/views_panel.cpp
+++ b/rviz_common/src/rviz_common/views_panel.cpp
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./views_panel.hpp"
+#include "views_panel.hpp"
 
 #include <QComboBox>
 #include <QHBoxLayout>
diff --git a/rviz_common/src/rviz_common/widget_geometry_change_detector.cpp b/rviz_common/src/rviz_common/widget_geometry_change_detector.cpp
index 71063aefa..9b29bfd2c 100644
--- a/rviz_common/src/rviz_common/widget_geometry_change_detector.cpp
+++ b/rviz_common/src/rviz_common/widget_geometry_change_detector.cpp
@@ -30,7 +30,7 @@
 
 #include <QEvent>
 
-#include "./widget_geometry_change_detector.hpp"
+#include "widget_geometry_change_detector.hpp"
 
 namespace rviz_common
 {
diff --git a/rviz_rendering/src/rviz_rendering/mesh_loader.cpp b/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
index 4382dfbf7..475580529 100644
--- a/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
+++ b/rviz_rendering/src/rviz_rendering/mesh_loader.cpp
@@ -32,16 +32,16 @@
 
 #include <string>
 
-#include <OgreHardwareBufferManager.h>
-#include <OgreMaterial.h>
-#include <OgreMaterialManager.h>
-#include <OgreMeshManager.h>
-#include <OgreMeshSerializer.h>
-#include <OgrePass.h>
-#include <OgreSubMesh.h>
-#include <OgreTechnique.h>
-#include <OgreTextureManager.h>
-#include <OgreVector3.h>
+#include "OgreHardwareBufferManager.h"
+#include "OgreMaterial.h"
+#include "OgreMaterialManager.h"
+#include "OgreMeshManager.h"
+#include "OgreMeshSerializer.h"
+#include "OgrePass.h"
+#include "OgreSubMesh.h"
+#include "OgreTechnique.h"
+#include "OgreTextureManager.h"
+#include "OgreVector3.h"
 
 #include <QDir>  // NOLINT cpplint cannot handle include order here
 #include <QFileInfo>  // NOLINT cpplint cannot handle include order here
@@ -49,17 +49,17 @@
 
 #define ASSIMP_UNIFIED_HEADER_NAMES 1
 #if defined(ASSIMP_UNIFIED_HEADER_NAMES)
-#include <assimp/Importer.hpp>
-#include <assimp/scene.h>
-#include <assimp/postprocess.h>
-#include <assimp/IOStream.hpp>
-#include <assimp/IOSystem.hpp>
+#include "assimp/Importer.hpp"
+#include "assimp/scene.h"
+#include "assimp/postprocess.h"
+#include "assimp/IOStream.hpp"
+#include "assimp/IOSystem.hpp"
 #else
-#include <assimp/assimp.hpp>
-#include <assimp/aiScene.h>
-#include <assimp/aiPostProcess.h>
-#include <assimp/IOStream.h>
-#include <assimp/IOSystem.h>
+#include "assimp/assimp.hpp"
+#include "assimp/aiScene.h"
+#include "assimp/aiPostProcess.h"
+#include "assimp/IOStream.h"
+#include "assimp/IOSystem.h"
 #endif
 
 #include "resource_retriever/retriever.hpp"
diff --git a/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp b/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
index 34adb38bb..337a5f870 100644
--- a/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
+++ b/rviz_rendering/src/rviz_rendering/mesh_loader_helpers/assimp_loader.hpp
@@ -35,8 +35,8 @@
 #include <string>
 #include <vector>
 
-#include <OgreHardwareBufferManager.h>
-#include <OgreMesh.h>
+#include "OgreHardwareBufferManager.h"
+#include "OgreMesh.h"
 
 #include <QDir>  // NOLINT cpplint cannot handle include order here
 #include <QFileInfo>  // NOLINT cpplint cannot handle include order here
@@ -44,10 +44,10 @@
 
 #define ASSIMP_UNIFIED_HEADER_NAMES 1
 #if defined(ASSIMP_UNIFIED_HEADER_NAMES)
-#include <assimp/Importer.hpp>
-#include <assimp/scene.h>
+#include "assimp/Importer.hpp"
+#include "assimp/scene.h"
 #else
-#include <assimp/aiScene.h>
+#include "assimp/aiScene.h"
 #endif
 
 #include "resource_retriever/retriever.hpp"
diff --git a/rviz_rendering/src/rviz_rendering/ogre_render_window_impl.cpp b/rviz_rendering/src/rviz_rendering/ogre_render_window_impl.cpp
index ab2cdc446..6c064bfa9 100644
--- a/rviz_rendering/src/rviz_rendering/ogre_render_window_impl.cpp
+++ b/rviz_rendering/src/rviz_rendering/ogre_render_window_impl.cpp
@@ -28,22 +28,22 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "./ogre_render_window_impl.hpp"
+#include "ogre_render_window_impl.hpp"
 
 #include <cstdlib>
 #include <functional>
 
-#include <OgreEntity.h>
-#include <OgreCamera.h>
-#include <OgreGpuProgramManager.h>
-#include <OgreMaterialManager.h>
-#include <OgreRenderWindow.h>
-#include <OgreRoot.h>
-#include <OgreSceneNode.h>
-#include <OgreStringConverter.h>
-#include <OgreTechnique.h>
-#include <OgreTextureManager.h>
-#include <OgreViewport.h>
+#include "OgreEntity.h"
+#include "OgreCamera.h"
+#include "OgreGpuProgramManager.h"
+#include "OgreMaterialManager.h"
+#include "OgreRenderWindow.h"
+#include "OgreRoot.h"
+#include "OgreSceneNode.h"
+#include "OgreStringConverter.h"
+#include "OgreTechnique.h"
+#include "OgreTextureManager.h"
+#include "OgreViewport.h"
 
 #include "rviz_rendering/orthographic.hpp"
 #include "rviz_rendering/render_system.hpp"
diff --git a/rviz_rendering/test/rviz_rendering/string_helper_test.cpp b/rviz_rendering/test/rviz_rendering/string_helper_test.cpp
index d995e0225..103beaaca 100644
--- a/rviz_rendering/test/rviz_rendering/string_helper_test.cpp
+++ b/rviz_rendering/test/rviz_rendering/string_helper_test.cpp
@@ -27,13 +27,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
 #include <string>
 #include <vector>
 
-#include "../../src/rviz_rendering/string_helper.cpp"
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+
+#include "../../src/rviz_rendering/string_helper.cpp"  // NOLINT (build/include)
 
 using namespace ::testing;  // NOLINT