diff --git a/src/comm/LinkConfiguration.cc b/src/comm/LinkConfiguration.cc
index 3231c57..c306990 100644
--- a/src/comm/LinkConfiguration.cc
+++ b/src/comm/LinkConfiguration.cc
@@ -30,7 +30,10 @@ This file is part of the QGROUNDCONTROL project
 #include "LinkConfiguration.h"
 #include "SerialLink.h"
 #include "UDPLink.h"
+
+#ifdef UNITTEST_BUILD
 #include "MockLink.h"
+#endif
 
 #define LINK_SETTING_ROOT "LinkConfigurations"
 
@@ -81,9 +84,11 @@ LinkConfiguration* LinkConfiguration::createSettings(int type, const QString& na
         case LinkConfiguration::TypeUdp:
             config = new UDPConfiguration(name);
             break;
+#ifdef UNITTEST_BUILD
         case LinkConfiguration::TypeMock:
             config = new MockConfiguration(name);
             break;
+#endif
     }
     return config;
 }
@@ -102,9 +107,11 @@ LinkConfiguration* LinkConfiguration::duplicateSettings(LinkConfiguration* sourc
         case TypeUdp:
             dupe = new UDPConfiguration(dynamic_cast<UDPConfiguration*>(source));
             break;
+#ifdef UNITTEST_BUILD
         case TypeMock:
             dupe = new MockConfiguration(dynamic_cast<MockConfiguration*>(source));
             break;
+#endif
     }
     return dupe;
 }
diff --git a/src/comm/LinkConfiguration.h b/src/comm/LinkConfiguration.h
index d47fee6..0c09ba7 100644
--- a/src/comm/LinkConfiguration.h
+++ b/src/comm/LinkConfiguration.h
@@ -41,7 +41,6 @@ public:
     enum {
         TypeSerial,     ///< Serial Link
         TypeUdp,        ///< UDP Link
-        TypeMock,       ///< Mock Link for Unitesting
         // TODO Below is not yet implemented
 #if 0
         TypeTcp,        ///< TCP Link
@@ -50,6 +49,9 @@ public:
         TypeXbee,       ///< XBee Proprietary Link
         TypeOpal,       ///< Opal-RT Link
 #endif
+#ifdef UNITTEST_BUILD
+        TypeMock,       ///< Mock Link for Unitesting
+#endif
         TypeLast        // Last type value (type >= TypeLast == invalid)
     };
 
diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index 6a27ccc..f51747b 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -79,9 +79,11 @@ LinkInterface* LinkManager::createLink(LinkConfiguration* config)
         case LinkConfiguration::TypeUdp:
             pLink = new UDPLink(dynamic_cast<UDPConfiguration*>(config));
             break;
+#ifdef UNITTEST_BUILD
         case LinkConfiguration::TypeMock:
             pLink = new MockLink(dynamic_cast<MockConfiguration*>(config));
             break;
+#endif
     }
     if(pLink) {
         addLink(pLink);
@@ -373,10 +375,12 @@ void LinkManager::loadLinkConfigurationList()
                                     pLink = (LinkConfiguration*)new UDPConfiguration(name);
                                     pLink->setPreferred(preferred);
                                     break;
+#ifdef UNITTEST_BUILD
                                 case LinkConfiguration::TypeMock:
                                     pLink = (LinkConfiguration*)new MockConfiguration(name);
                                     pLink->setPreferred(false);
                                     break;
+#endif
                             }
                             if(pLink) {
                                 // Have the instance load its own values
diff --git a/src/comm/LinkManager.h b/src/comm/LinkManager.h
index d2ae000..ad4e7d6 100644
--- a/src/comm/LinkManager.h
+++ b/src/comm/LinkManager.h
@@ -37,7 +37,10 @@ This file is part of the PIXHAWK project
 // Links
 #include "SerialLink.h"
 #include "UDPLink.h"
+
+#ifdef UNITTEST_BUILD
 #include "MockLink.h"
+#endif
 
 #include "ProtocolInterface.h"
 #include "QGCSingleton.h"
diff --git a/src/ui/QGCCommConfiguration.cc b/src/ui/QGCCommConfiguration.cc
index 868c149..3ed5615 100644
--- a/src/ui/QGCCommConfiguration.cc
+++ b/src/ui/QGCCommConfiguration.cc
@@ -96,12 +96,14 @@ void QGCCommConfiguration::_loadTypeConfigWidget(int type)
             _ui->typeCombo->setCurrentIndex(_ui->typeCombo->findData(LinkConfiguration::TypeUdp));
         }
         break;
+#ifdef UNITTEST_BUILD
         case LinkConfiguration::TypeMock: {
             _ui->linkScrollArea->setWidget(NULL);
             _ui->linkGroupBox->setTitle(tr("Mock Link"));
             _ui->typeCombo->setCurrentIndex(_ui->typeCombo->findData(LinkConfiguration::TypeMock));
         }
         break;
+#endif
         // Cannot be the case, but in case it gets here, we cannot continue.
         default:
             reject();
diff --git a/src/ui/QGCLinkConfiguration.cc b/src/ui/QGCLinkConfiguration.cc
index 3968d92..c9c1cc6 100644
--- a/src/ui/QGCLinkConfiguration.cc
+++ b/src/ui/QGCLinkConfiguration.cc
@@ -142,10 +142,12 @@ void QGCLinkConfiguration::on_addLinkButton_clicked()
                         config->setName(
                             QString("UDP Link on Port %1").arg(dynamic_cast<UDPConfiguration*>(config)->localPort()));
                         break;
+#ifdef UNITTEST_BUILD
                     case LinkConfiguration::TypeMock:
                         config->setName(
                             QString("Mock Link"));
                         break;
+#endif
                 }
             }
             _viewModel->beginChange();