diff --git a/QGCApplication.pro b/QGCApplication.pro
index f135cd6881eda50c91013bd3f3157c8e58017c7b..f32186ca295398c22ae02db366304c2c95c6f3f1 100644
--- a/QGCApplication.pro
+++ b/QGCApplication.pro
@@ -235,6 +235,8 @@ HEADERS += \
     src/comm/LinkInterface.h \
     src/comm/LinkManager.h \
     src/comm/MAVLinkProtocol.h \
+    src/comm/MockLink.h \
+    src/comm/MockLinkMissionItemHandler.h \
     src/comm/ProtocolInterface.h \
     src/comm/QGCFlightGearLink.h \
     src/comm/QGCHilLink.h \
@@ -353,12 +355,6 @@ HEADERS += \
     src/ViewWidgets/ViewWidgetController.h \
     src/Waypoint.h \
 
-DebugBuild {
-HEADERS += \
-    src/comm/MockLink.h \
-    src/comm/MockLinkMissionItemHandler.h
-}
-
 !AndroidBuild {
 HEADERS += \
     src/input/JoystickInput.h \
@@ -374,6 +370,8 @@ SOURCES += \
     src/comm/LinkConfiguration.cc \
     src/comm/LinkManager.cc \
     src/comm/MAVLinkProtocol.cc \
+    src/comm/MockLink.cc \
+    src/comm/MockLinkMissionItemHandler.cc \
     src/comm/QGCFlightGearLink.cc \
     src/comm/QGCJSBSimLink.cc \
     src/comm/QGCXPlaneLink.cc \
@@ -484,12 +482,6 @@ SOURCES += \
     src/ViewWidgets/ViewWidgetController.cc \
     src/Waypoint.cc \
 
-DebugBuild {
-SOURCES += \
-    src/comm/MockLink.cc \
-    src/comm/MockLinkMissionItemHandler.cc
-}
-
 !AndroidBuild {
 SOURCES += \
     src/input/JoystickInput.cc \
diff --git a/src/comm/LinkConfiguration.h b/src/comm/LinkConfiguration.h
index c45c12a6a9f09e795fb43fc49bf2aa5ccdeb2786..34639bc60d44f3936adfe1552aaa0dae60c40d18 100644
--- a/src/comm/LinkConfiguration.h
+++ b/src/comm/LinkConfiguration.h
@@ -48,9 +48,7 @@ public:
         TypeXbee,       ///< XBee Proprietary Link
         TypeOpal,       ///< Opal-RT Link
 #endif
-#ifdef QT_DEBUG
         TypeMock,       ///< Mock Link for Unitesting
-#endif
         TypeLast        // Last type value (type >= TypeLast == invalid)
     };