diff --git a/src/rviz/MapCloudDisplay.h b/src/rviz/MapCloudDisplay.h
index f43ff9d6..00e507e2 100644
--- a/src/rviz/MapCloudDisplay.h
+++ b/src/rviz/MapCloudDisplay.h
@@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef MAP_CLOUD_DISPLAY_H
 #define MAP_CLOUD_DISPLAY_H
 
+#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+
 #include <deque>
 #include <queue>
 #include <vector>
@@ -42,6 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <rviz/message_filter_display.h>
 #include <rviz/default_plugin/point_cloud_transformer.h>
 
+#endif
+
 namespace rviz {
 class IntProperty;
 class BoolProperty;