diff --git a/rviz_common/src/rviz_common/display.cpp b/rviz_common/src/rviz_common/display.cpp
index 76a7b80c8..0fa7a7e22 100644
--- a/rviz_common/src/rviz_common/display.cpp
+++ b/rviz_common/src/rviz_common/display.cpp
@@ -328,7 +328,7 @@ void Display::setFixedFrame(const QString & fixed_frame)
 
 void Display::emitTimeSignal(rclcpp::Time time)
 {
-  emit timeSignal(this, time);
+  Q_EMIT timeSignal(this, time);
 }
 
 void Display::reset()
diff --git a/rviz_common/src/rviz_common/frame_manager.cpp b/rviz_common/src/rviz_common/frame_manager.cpp
index db49c8900..2c7b9c1b8 100644
--- a/rviz_common/src/rviz_common/frame_manager.cpp
+++ b/rviz_common/src/rviz_common/frame_manager.cpp
@@ -98,7 +98,7 @@ void FrameManager::setFixedFrame(const std::string & frame)
   }
   if (should_emit) {
     // This emission must be kept outside of the mutex lock to avoid deadlocks.
-    emit fixedFrameChanged();
+    Q_EMIT fixedFrameChanged();
   }
 }
 
diff --git a/rviz_common/src/rviz_common/panel_dock_widget.cpp b/rviz_common/src/rviz_common/panel_dock_widget.cpp
index f15a5026a..8bdf646be 100644
--- a/rviz_common/src/rviz_common/panel_dock_widget.cpp
+++ b/rviz_common/src/rviz_common/panel_dock_widget.cpp
@@ -125,7 +125,7 @@ void PanelDockWidget::setContentWidget(QWidget * child)
 void PanelDockWidget::closeEvent(QCloseEvent * event)
 {
   Q_UNUSED(event);
-  emit closed();
+  Q_EMIT closed();
 }
 
 void PanelDockWidget::onChildDestroyed(QObject *)  // NOLINT: cpplint thinks this is a cast?
diff --git a/rviz_rendering/include/rviz_rendering/render_window.hpp b/rviz_rendering/include/rviz_rendering/render_window.hpp
index 34600835b..73d5faa43 100644
--- a/rviz_rendering/include/rviz_rendering/render_window.hpp
+++ b/rviz_rendering/include/rviz_rendering/render_window.hpp
@@ -102,7 +102,7 @@ class RVIZ_RENDERING_PUBLIC RenderWindow : public QWindow
   void
   windowMovedOrResized();
 
-public slots:
+public Q_SLOTS:
   virtual
   void
   renderLater();