diff --git a/src/Gui/InputField.h b/src/Gui/InputField.h
index 7fbab4c25..8c805cab2 100644
--- a/src/Gui/InputField.h
+++ b/src/Gui/InputField.h
@@ -32,7 +32,9 @@
 #include "SpinBox.h"
 #include "FileDialog.h"
 
+#ifdef Q_MOC_RUN
 Q_DECLARE_METATYPE(Base::Quantity)
+#endif
 
 namespace Gui {
 
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
index ec7407125..cccc19b63 100644
--- a/src/Gui/propertyeditor/PropertyItem.cpp
+++ b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -50,6 +50,7 @@
 #include <Gui/Placement.h>
 #include <Gui/FileDialog.h>
 #include <Gui/DlgPropertyLink.h>
+#include <Gui/InputField.h>
 
 #include "PropertyItem.h"
 
diff --git a/src/Gui/propertyeditor/PropertyItem.h b/src/Gui/propertyeditor/PropertyItem.h
index a17858964..f8114960f 100644
--- a/src/Gui/propertyeditor/PropertyItem.h
+++ b/src/Gui/propertyeditor/PropertyItem.h
@@ -33,15 +33,16 @@
 #include <Base/Vector3D.h>
 #include <Base/Matrix.h>
 #include <Base/Placement.h>
+#include <Base/Quantity.h>
 #include <Base/UnitsApi.h>
 #include <App/PropertyStandard.h>
 #include <Gui/Widgets.h>
-#include <Gui/InputField.h>
 
 Q_DECLARE_METATYPE(Base::Vector3f)
 Q_DECLARE_METATYPE(Base::Vector3d)
 Q_DECLARE_METATYPE(Base::Matrix4D)
 Q_DECLARE_METATYPE(Base::Placement)
+Q_DECLARE_METATYPE(Base::Quantity)
 
 namespace Gui {
 namespace Dialog { class TaskPlacement; }