diff -up ./gazebo/math/Helpers.hh.fixmoc ./gazebo/math/Helpers.hh
--- ./gazebo/math/Helpers.hh.fixmoc	2016-10-11 10:14:46.000000000 -0400
+++ ./gazebo/math/Helpers.hh	2016-11-23 15:06:07.920296600 -0500
@@ -17,8 +17,10 @@
 #ifndef _GAZEBO_MATH_FUNCTIONS_HH_
 #define _GAZEBO_MATH_FUNCTIONS_HH_
 
+#ifndef Q_MOC_RUN
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/math/special_functions/round.hpp>
+#endif
 #include <algorithm>
 #include <cmath>
 #include <limits>
diff -up ./plugins/CessnaGUIPlugin.hh.fixmoc ./plugins/CessnaGUIPlugin.hh
--- ./plugins/CessnaGUIPlugin.hh.fixmoc	2016-11-23 19:32:54.294386115 -0500
+++ ./plugins/CessnaGUIPlugin.hh	2016-11-23 19:33:08.061916558 -0500
@@ -18,9 +18,9 @@
 #define _GAZEBO_GUI_CESSNA_PLUGIN_HH_
 
 #include <mutex>
-#include <gazebo/common/Plugin.hh>
-#include <gazebo/gui/GuiPlugin.hh>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+# include <gazebo/common/Plugin.hh>
+# include <gazebo/gui/GuiPlugin.hh>
 # include <gazebo/transport/transport.hh>
 # include <gazebo/gui/gui.hh>
 #endif
diff -up ./plugins/KeyboardGUIPlugin.hh.fixmoc ./plugins/KeyboardGUIPlugin.hh
--- ./plugins/KeyboardGUIPlugin.hh.fixmoc	2016-11-23 19:32:17.612972834 -0500
+++ ./plugins/KeyboardGUIPlugin.hh	2016-11-23 19:32:30.723477963 -0500
@@ -18,10 +18,10 @@
 #define GAZEBO_PLUGINS_KEYBOARDGUIPLUGIN_HH_
 
 #include <memory>
-#include <gazebo/common/Plugin.hh>
 
 // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #ifndef Q_MOC_RUN
+# include <gazebo/common/Plugin.hh>
 # include <gazebo/gui/gui.hh>
 #endif
 
diff -up ./plugins/TimerGUIPlugin.hh.fixmoc ./plugins/TimerGUIPlugin.hh
--- ./plugins/TimerGUIPlugin.hh.fixmoc	2016-11-23 15:06:17.002650328 -0500
+++ ./plugins/TimerGUIPlugin.hh	2016-11-23 19:14:31.337506795 -0500
@@ -22,10 +22,10 @@
 #include <boost/thread/mutex.hpp>
 
 #include <gazebo/common/Events.hh>
-#include <gazebo/common/Plugin.hh>
 #include <gazebo/common/Timer.hh>
-#include <gazebo/gui/GuiPlugin.hh>
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+# include <gazebo/gui/GuiPlugin.hh>
+# include <gazebo/common/Plugin.hh>
 # include <gazebo/transport/transport.hh>
 # include <gazebo/gui/gui.hh>
 #endif