diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 712a2c8b899c139792d54702d0605dbc7eb63de8..08adbffca8114eda6fc3625622d5992e5bce97c0 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -406,7 +406,7 @@ HEADERS += \
     src/ui/linechart/LinechartPlot.h \
     src/ui/linechart/Scrollbar.h \
     src/ui/linechart/ScrollZoomer.h \
-    src/configuration.h \
+    src/QGCConfig.h \
     src/ui/uas/UASView.h \
     src/ui/CameraView.h \
     src/comm/MAVLinkSimulationLink.h \
diff --git a/src/QGC.h b/src/QGC.h
index c0a548a5e8db33b39259ad787e654c2623a0609b..6c822c176d62864a09de1ae5b11fd21d100deb28 100644
--- a/src/QGC.h
+++ b/src/QGC.h
@@ -28,7 +28,7 @@
 #include <QColor>
 #include <QThread>
 
-#include "configuration.h"
+#include "QGCConfig.h"
 
 
 /* Windows fixes */
diff --git a/src/configuration.h b/src/QGCConfig.h
similarity index 100%
rename from src/configuration.h
rename to src/QGCConfig.h
diff --git a/src/comm/OpalLink.h b/src/comm/OpalLink.h
index 6a67f0a70b85ca75cd9e96fdb11c0a4f85efea2f..e9edbdb2a1c93eeb121ad9fe1e43792acce82221 100644
--- a/src/comm/OpalLink.h
+++ b/src/comm/OpalLink.h
@@ -44,7 +44,7 @@ This file is part of the QGROUNDCONTROL project
 #include "LinkManager.h"
 #include "MG.h"
 #include "QGCMAVLink.h"
-#include "configuration.h"
+#include "QGCConfig.h"
 #include "OpalRT.h"
 #include "ParameterList.h"
 #include "Parameter.h"
diff --git a/src/comm/QGCFlightGearLink.h b/src/comm/QGCFlightGearLink.h
index a86de732662654124c0acce6e4f8a80e1ad31dab..39890ff9913f860087e14f55599e90ed33b913db 100644
--- a/src/comm/QGCFlightGearLink.h
+++ b/src/comm/QGCFlightGearLink.h
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QTimer>
 #include <QProcess>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 #include "UASInterface.h"
 #include "QGCHilLink.h"
 #include <QGCHilFlightGearConfiguration.h>
diff --git a/src/comm/QGCJSBSimLink.h b/src/comm/QGCJSBSimLink.h
index b4825da570b0436c4caa11a5631c426c484edf93..bb293cd511fb444ae6b67a8d3eada46a85dc220a 100644
--- a/src/comm/QGCJSBSimLink.h
+++ b/src/comm/QGCJSBSimLink.h
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QTimer>
 #include <QProcess>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 #include "UASInterface.h"
 #include "QGCHilLink.h"
 
diff --git a/src/comm/QGCXPlaneLink.h b/src/comm/QGCXPlaneLink.h
index ae4497432da0a51d824d9e438b9270f0871491b6..a95c8917d2b802d4e5670f4d670494f6accf555f 100644
--- a/src/comm/QGCXPlaneLink.h
+++ b/src/comm/QGCXPlaneLink.h
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QTimer>
 #include <QProcess>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 #include "UASInterface.h"
 #include "QGCHilLink.h"
 
diff --git a/src/comm/SerialLink.h b/src/comm/SerialLink.h
index 0534417697879010b2aa3fce0cd032a886d32133..5e96b71df3f4cc1983dd837c1807e1bf300023fe 100644
--- a/src/comm/SerialLink.h
+++ b/src/comm/SerialLink.h
@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QThread>
 #include <QMutex>
 #include <QString>
-#include <configuration.h>
+#include "QGCConfig.h"
 #include "SerialLinkInterface.h"
 
 // We use QSerialPort::SerialPortError in a signal so we must declare it as a meta type
@@ -67,7 +67,7 @@ public:
                int stopBits=1);
     ~SerialLink();
 
-    static const int poll_interval = SERIAL_POLL_INTERVAL; ///< Polling interval, defined in configuration.h
+    static const int poll_interval = SERIAL_POLL_INTERVAL; ///< Polling interval, defined in QGCConfig.h
 
     /** @brief Get a list of the currently available ports */
     QList<QString> getCurrentPorts();
diff --git a/src/comm/TCPLink.h b/src/comm/TCPLink.h
index 9a7888c5094f1b097d57b298849cbedd525bf65c..f97db7fbe977ad8ed81befd1ddb06d1a482355e1 100644
--- a/src/comm/TCPLink.h
+++ b/src/comm/TCPLink.h
@@ -35,7 +35,7 @@
 #include <QMutex>
 #include <QHostAddress>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 
 // Even though QAbstractSocket::SocketError is used in a signal by Qt, Qt doesn't declare it as a meta type.
 // This in turn causes debug output to be kicked out about not being able to queue the signal. We declare it
diff --git a/src/comm/UDPLink.h b/src/comm/UDPLink.h
index a2e4f0e5ce47dcf82d1913bfe89caa1dcaa7e0cb..00cf92097d9515b5d80c638796adc2be26db9964 100644
--- a/src/comm/UDPLink.h
+++ b/src/comm/UDPLink.h
@@ -37,7 +37,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QMutex>
 #include <QUdpSocket>
 #include <LinkInterface.h>
-#include <configuration.h>
+#include "QGCConfig.h"
 
 class UDPLink : public LinkInterface
 {
diff --git a/src/ui/configuration/terminalconsole.cpp b/src/ui/configuration/terminalconsole.cpp
index 86df9e4f8f16500a27ead0990c9d6e45646f04f7..72e929f928989ffe9d42283e68d83eee225081fb 100644
--- a/src/ui/configuration/terminalconsole.cpp
+++ b/src/ui/configuration/terminalconsole.cpp
@@ -37,7 +37,7 @@ This file is part of the APM_PLANNER project
 #include "terminalconsole.h"
 #include "ui_terminalconsole.h"
 #include "console.h"
-#include "configuration.h"
+#include "QGCConfig.h"
 
 #include <QDebug>
 #include <QSettings>