diff --git a/src/rviz/default_plugin/camera_display.h b/src/rviz/default_plugin/camera_display.h
index afe88b2a11..9bfb57c71e 100644
--- a/src/rviz/default_plugin/camera_display.h
+++ b/src/rviz/default_plugin/camera_display.h
@@ -37,8 +37,10 @@
 
 #include <sensor_msgs/CameraInfo.h>
 
+#ifndef Q_MOC_RUN
 #include <message_filters/subscriber.h>
 #include <tf/message_filter.h>
+#endif
 
 #include "rviz/image/image_display_base.h"
 #include "rviz/image/ros_image_texture.h"
diff --git a/src/rviz/default_plugin/depth_cloud_display.h b/src/rviz/default_plugin/depth_cloud_display.h
index 0dcce87e9b..027b904293 100644
--- a/src/rviz/default_plugin/depth_cloud_display.h
+++ b/src/rviz/default_plugin/depth_cloud_display.h
@@ -36,10 +36,12 @@
 #include <ros/ros.h>
 #include <image_transport/image_transport.h>
 #include <image_transport/subscriber_filter.h>
+#ifndef Q_MOC_RUN
 #include <message_filters/subscriber.h>
 #include <message_filters/synchronizer.h>
 #include <message_filters/sync_policies/approximate_time.h>
 #include <tf/message_filter.h>
+#endif
 
 #include "rviz/properties/enum_property.h"
 #include "rviz/properties/float_property.h"
diff --git a/src/rviz/default_plugin/grid_cells_display.h b/src/rviz/default_plugin/grid_cells_display.h
index 9b6d729b3d..abc195bc2e 100644
--- a/src/rviz/default_plugin/grid_cells_display.h
+++ b/src/rviz/default_plugin/grid_cells_display.h
@@ -36,8 +36,10 @@
 #include <nav_msgs/GridCells.h>
 #include <nav_msgs/MapMetaData.h>
 
+#ifndef Q_MOC_RUN
 #include <message_filters/subscriber.h>
 #include <tf/message_filter.h>
+#endif
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/src/rviz/default_plugin/interactive_marker_display.h b/src/rviz/default_plugin/interactive_marker_display.h
index 181b8188a8..0b162e0fb3 100644
--- a/src/rviz/default_plugin/interactive_marker_display.h
+++ b/src/rviz/default_plugin/interactive_marker_display.h
@@ -37,13 +37,15 @@
 #include <visualization_msgs/InteractiveMarkerUpdate.h>
 #include <visualization_msgs/InteractiveMarkerInit.h>
 
+#ifndef Q_MOC_RUN
 #include <message_filters/subscriber.h>
 #include <tf/message_filter.h>
+#include <interactive_markers/interactive_marker_client.h>
+#endif
 
 #include "rviz/display.h"
 #include "rviz/selection/forwards.h"
 
-#include <interactive_markers/interactive_marker_client.h>
 #include "rviz/default_plugin/interactive_markers/interactive_marker.h"
 
 namespace rviz
diff --git a/src/rviz/default_plugin/marker_display.h b/src/rviz/default_plugin/marker_display.h
index e061f97812..2d99afd274 100644
--- a/src/rviz/default_plugin/marker_display.h
+++ b/src/rviz/default_plugin/marker_display.h
@@ -36,9 +36,10 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/shared_ptr.hpp>
 
+#ifndef Q_MOC_RUN
 #include <tf/message_filter.h>
-
 #include <message_filters/subscriber.h>
+#endif
 
 #include <visualization_msgs/Marker.h>
 #include <visualization_msgs/MarkerArray.h>
diff --git a/src/rviz/default_plugin/odometry_display.h b/src/rviz/default_plugin/odometry_display.h
index af25127922..d8608fe7d7 100644
--- a/src/rviz/default_plugin/odometry_display.h
+++ b/src/rviz/default_plugin/odometry_display.h
@@ -36,8 +36,11 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
+#ifndef Q_MOC_RUN
 #include <message_filters/subscriber.h>
 #include <tf/message_filter.h>
+#endif
+
 #include <nav_msgs/Odometry.h>
 
 #include "rviz/display.h"
diff --git a/src/rviz/default_plugin/pose_display.h b/src/rviz/default_plugin/pose_display.h
index 32d9c5e733..7e6d977654 100644
--- a/src/rviz/default_plugin/pose_display.h
+++ b/src/rviz/default_plugin/pose_display.h
@@ -33,8 +33,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <message_filters/subscriber.h>
-
 #include <geometry_msgs/PoseStamped.h>
 
 #include "rviz/message_filter_display.h"
diff --git a/src/rviz/frame_manager.h b/src/rviz/frame_manager.h
index 65b1fb0340..9547551f9a 100644
--- a/src/rviz/frame_manager.h
+++ b/src/rviz/frame_manager.h
@@ -43,7 +43,9 @@
 
 #include <geometry_msgs/Pose.h>
 
+#ifndef Q_MOC_RUN
 #include <tf/message_filter.h>
+#endif
 
 namespace tf
 {
diff --git a/src/rviz/image/image_display_base.h b/src/rviz/image/image_display_base.h
index 2e2831d749..2c05c8c645 100644
--- a/src/rviz/image/image_display_base.h
+++ b/src/rviz/image/image_display_base.h
@@ -31,8 +31,10 @@
 
 #include <QObject>
 
+#ifndef Q_MOC_RUN
 #include <message_filters/subscriber.h>
 #include <tf/message_filter.h>
+#endif
 #include <sensor_msgs/Image.h>
 
 #include <image_transport/image_transport.h>
diff --git a/src/rviz/message_filter_display.h b/src/rviz/message_filter_display.h
index c21dc93d90..229e0c5513 100644
--- a/src/rviz/message_filter_display.h
+++ b/src/rviz/message_filter_display.h
@@ -32,8 +32,10 @@
 #include <OGRE/OgreSceneManager.h>
 #include <OGRE/OgreSceneNode.h>
 
+#ifndef Q_MOC_RUN
 #include <message_filters/subscriber.h>
 #include <tf/message_filter.h>
+#endif
 
 #include "rviz/display_context.h"
 #include "rviz/frame_manager.h"