diff --git a/src/comm/BluetoothLink.h b/src/comm/BluetoothLink.h
index b3407a3fd74a72d155f5601fce65392b72097a62..6503afee1e5cb41d502bd71a8bec00757e2a08cd 100644
--- a/src/comm/BluetoothLink.h
+++ b/src/comm/BluetoothLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -15,8 +15,7 @@
  *
  */
 
-#ifndef BTLINK_H
-#define BTLINK_H
+#pragma once
 
 #include <QString>
 #include <QList>
@@ -194,4 +193,3 @@ private:
 
 };
 
-#endif // BTLINK_H
diff --git a/src/comm/CallConv.h b/src/comm/CallConv.h
index 6c13955cf42c75340822aba1910537368bc282b9..52f292895edbd8cb7ea9d8c635f13f4972a0a445 100644
--- a/src/comm/CallConv.h
+++ b/src/comm/CallConv.h
@@ -1,11 +1,8 @@
-#ifndef _CALLCONV_H_
-#define _CALLCONV_H_
+#pragma once
 
 #ifdef Q_OS_WIN
 #define CALLTYPEXBEE __stdcall
 #else // Q_OS_WIN
 #define CALLTYPEXBEE
-#endif // Q_OS_WIN
 
 
-#endif // _CALLCONV_H_
\ No newline at end of file
diff --git a/src/comm/LinkConfiguration.h b/src/comm/LinkConfiguration.h
index e4027313b498f80a58ad0137afcfc0e3d5cd10e1..68227be0dadc54a2fd9a2db4e17b1e40c1f5eb3d 100644
--- a/src/comm/LinkConfiguration.h
+++ b/src/comm/LinkConfiguration.h
@@ -1,14 +1,13 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
  *
  ****************************************************************************/
 
-#ifndef LINKCONFIGURATION_H
-#define LINKCONFIGURATION_H
+#pragma once
 
 #include <QSettings>
 
@@ -208,4 +207,3 @@ private:
 
 typedef QSharedPointer<LinkConfiguration> SharedLinkConfigurationPointer;
 
-#endif // LINKCONFIGURATION_H
diff --git a/src/comm/LinkInterface.h b/src/comm/LinkInterface.h
index 58b8a27d5544477fac71b383012732df9a2a2a64..36c01fb72f6edefb2c9d6a2074428959bc28cb61 100644
--- a/src/comm/LinkInterface.h
+++ b/src/comm/LinkInterface.h
@@ -1,14 +1,13 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
  *
  ****************************************************************************/
 
-#ifndef _LINKINTERFACE_H_
-#define _LINKINTERFACE_H_
+#pragma once
 
 #include <QThread>
 #include <QDateTime>
@@ -308,4 +307,3 @@ private:
 
 typedef QSharedPointer<LinkInterface> SharedLinkInterfacePointer;
 
-#endif // _LINKINTERFACE_H_
diff --git a/src/comm/LinkManager.h b/src/comm/LinkManager.h
index 83474b6ba90d39dcf1c79dab6a5bb79571223aec..7aeb62e9b8cde6b8edc44017023688d64c567ead 100644
--- a/src/comm/LinkManager.h
+++ b/src/comm/LinkManager.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -11,8 +11,7 @@
 /// @file
 ///     @author Lorenz Meier <mavteam@student.ethz.ch>
 
-#ifndef _LINKMANAGER_H_
-#define _LINKMANAGER_H_
+#pragma once
 
 #include <QList>
 #include <QMultiMap>
@@ -244,4 +243,3 @@ private:
 #endif
 };
 
-#endif
diff --git a/src/comm/LogReplayLink.h b/src/comm/LogReplayLink.h
index 1ae85d5c9ea878ac55d7df99cb53e709f4ef791a..c28f55b66a8c7aa703343477f509c60d62305f81 100644
--- a/src/comm/LogReplayLink.h
+++ b/src/comm/LogReplayLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -8,8 +8,7 @@
  ****************************************************************************/
 
 
-#ifndef LogReplayLink_H
-#define LogReplayLink_H
+#pragma once
 
 #include "LinkInterface.h"
 #include "LinkConfiguration.h"
@@ -155,4 +154,3 @@ private:
     static const int cbTimestamp = sizeof(quint64);
 };
 
-#endif
diff --git a/src/comm/MAVLinkProtocol.h b/src/comm/MAVLinkProtocol.h
index cd2a30568511b0aaa31ded882cdc7c0224e549b3..b2ec5589b00a36f1b51a809fe1aa7a49faf9f4c0 100644
--- a/src/comm/MAVLinkProtocol.h
+++ b/src/comm/MAVLinkProtocol.h
@@ -1,14 +1,13 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
  *
  ****************************************************************************/
 
-#ifndef MAVLINKPROTOCOL_H_
-#define MAVLINKPROTOCOL_H_
+#pragma once
 
 #include <QObject>
 #include <QMutex>
@@ -171,4 +170,3 @@ private:
     MultiVehicleManager*    _multiVehicleManager;
 };
 
-#endif // MAVLINKPROTOCOL_H_
diff --git a/src/comm/MavlinkMessagesTimer.h b/src/comm/MavlinkMessagesTimer.h
index 0e4010d3b4dd2d4d24b497e1e2b91086aa9cd336..850e2f7d128850cd110499d96d45acebdcd7234d 100644
--- a/src/comm/MavlinkMessagesTimer.h
+++ b/src/comm/MavlinkMessagesTimer.h
@@ -7,8 +7,7 @@
  *
  ****************************************************************************/
 
-#ifndef _MAVLINKMESSAGESTIMER_H_
-#define _MAVLINKMESSAGESTIMER_H_
+#pragma once
 
 #include <QTimer>
 #include <QObject>
@@ -103,4 +102,3 @@ private:
     static const int    _messageReceivedTimeoutMSecs = 3500;  // Signal connection lost after 3.5 seconds of no messages
 };
 
-#endif // _MAVLINKMESSAGESTIMER_H_
diff --git a/src/comm/MockLink.h b/src/comm/MockLink.h
index 105839a0d2a761874f336ddee07bb1f7b394b070..4c6de83084bc4897bb9e2f688504714f60633dcb 100644
--- a/src/comm/MockLink.h
+++ b/src/comm/MockLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -8,8 +8,7 @@
  ****************************************************************************/
 
 
-#ifndef MOCKLINK_H
-#define MOCKLINK_H
+#pragma once
 
 #include <QMap>
 #include <QLoggingCategory>
@@ -259,4 +258,3 @@ private:
     static const char*  _failParam;
 };
 
-#endif
diff --git a/src/comm/MockLinkFileServer.h b/src/comm/MockLinkFileServer.h
index 81e77e6618dc50084dc47528393c333e28f7d277..7b3084e279011bd783063e8219b624ddf37089e1 100644
--- a/src/comm/MockLinkFileServer.h
+++ b/src/comm/MockLinkFileServer.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -11,8 +11,7 @@
 /// @file
 ///     @author Don Gagne <don@thegagnes.com>
 
-#ifndef MockLinkFileServer_H
-#define MockLinkFileServer_H
+#pragma once
 
 #include "FileManager.h"
 
@@ -110,4 +109,3 @@ private:
     bool _randomDropsEnabled;
 };
 
-#endif
diff --git a/src/comm/MockLinkMissionItemHandler.h b/src/comm/MockLinkMissionItemHandler.h
index bc40a68dabe916fcb5fbe377d2af70daf2bbff56..b25f22e014bc760a3189e9f2225ff7c120b1e80d 100644
--- a/src/comm/MockLinkMissionItemHandler.h
+++ b/src/comm/MockLinkMissionItemHandler.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -8,8 +8,7 @@
  ****************************************************************************/
 
 
-#ifndef MockLinkMissionItemHandler_H
-#define MockLinkMissionItemHandler_H
+#pragma once
 
 #include <QObject>
 #include <QMap>
@@ -115,4 +114,3 @@ private:
     bool                _failWriteMissionCountFirstResponse;
 };
 
-#endif
diff --git a/src/comm/QGCFlightGearLink.h b/src/comm/QGCFlightGearLink.h
index 6545119575aa722d4ff59c3450651f53f44fdcf1..e9c94aa1bdd2340657689be2181fdbe8b7c763cb 100644
--- a/src/comm/QGCFlightGearLink.h
+++ b/src/comm/QGCFlightGearLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -15,8 +15,7 @@
  *
  */
 
-#ifndef QGCFLIGHTGEARLINK_H
-#define QGCFLIGHTGEARLINK_H
+#pragma once
 
 #include <QString>
 #include <QList>
@@ -160,4 +159,3 @@ private:
     float barometerOffsetkPa;
 };
 
-#endif // QGCFLIGHTGEARLINK_H
diff --git a/src/comm/QGCHilLink.h b/src/comm/QGCHilLink.h
index 9ac69813a53d465683bfacd366bb465915a603f3..3d1ead78b36d1ae38bcfc2c90bc4fb7a7ff9c1ac 100644
--- a/src/comm/QGCHilLink.h
+++ b/src/comm/QGCHilLink.h
@@ -1,5 +1,4 @@
-#ifndef QGCHILLINK_H
-#define QGCHILLINK_H
+#pragma once
 
 #include <QThread>
 #include <QProcess>
@@ -148,4 +147,3 @@ signals:
     void _invokeWriteBytes(QByteArray);
 };
 
-#endif // QGCHILLINK_H
diff --git a/src/comm/QGCJSBSimLink.h b/src/comm/QGCJSBSimLink.h
index 0cf65f8079e2c08cf22a64112f0fe8e42a6f3026..336eb979302d378246a121e28cd97f5a1491eaa5 100644
--- a/src/comm/QGCJSBSimLink.h
+++ b/src/comm/QGCJSBSimLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -15,8 +15,7 @@
  *
  */
 
-#ifndef QGCJSBSIMLINK_H
-#define QGCJSBSIMLINK_H
+#pragma once
 
 #include <QString>
 #include <QList>
@@ -147,4 +146,3 @@ private:
     void setName(QString name);
 };
 
-#endif // QGCJSBSimLink_H
diff --git a/src/comm/QGCMAVLink.h b/src/comm/QGCMAVLink.h
index 5b656c2218cbcc3ddeb20439c806351f098d6fe2..6c3ed82f582cdec51c28b396859ecaaf0eec632c 100644
--- a/src/comm/QGCMAVLink.h
+++ b/src/comm/QGCMAVLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -14,8 +14,7 @@
  *   @author Lorenz Meier <pixhawk@switched.com>
  */
 
-#ifndef QGCMAVLINK_H
-#define QGCMAVLINK_H
+#pragma once
 
 #define MAVLINK_USE_MESSAGE_INFO
 #define MAVLINK_EXTERNAL_RX_STATUS  // Single m_mavlink_status instance is in QGCApplication.cc
@@ -33,5 +32,4 @@ public:
     static bool isVTOL(MAV_TYPE mavType);
 };
 
-#endif // QGCMAVLINK_H
 
diff --git a/src/comm/QGCSerialPortInfo.h b/src/comm/QGCSerialPortInfo.h
index 6937ac728f314fa78e8022ec72600e9e03436dd2..85d78ec68235f1a4e5467090b18c148a5347f1d9 100644
--- a/src/comm/QGCSerialPortInfo.h
+++ b/src/comm/QGCSerialPortInfo.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -8,8 +8,7 @@
  ****************************************************************************/
 
 
-#ifndef QGCSerialPortInfo_H
-#define QGCSerialPortInfo_H
+#pragma once
 
 #ifdef __android__
     #include "qserialportinfo.h"
@@ -91,4 +90,3 @@ private:
     static QList<BoardFallback_t>               _boardFallbackList;
 };
 
-#endif
diff --git a/src/comm/QGCXPlaneLink.h b/src/comm/QGCXPlaneLink.h
index e6f9222107cd92a49bd94eae31fdfdde706c8a9f..466f187ba950ee0bf14c68aad3ed44a5e0960088 100644
--- a/src/comm/QGCXPlaneLink.h
+++ b/src/comm/QGCXPlaneLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -15,8 +15,7 @@
  *
  */
 
-#ifndef QGCXPLANESIMULATIONLINK_H
-#define QGCXPLANESIMULATIONLINK_H
+#pragma once
 
 #include <QString>
 #include <QList>
@@ -235,4 +234,3 @@ protected:
     void sendDataRef(QString ref, float value);
 };
 
-#endif // QGCXPLANESIMULATIONLINK_H
diff --git a/src/comm/SerialInterface.h b/src/comm/SerialInterface.h
index afecc2b4a39d94de054684bc5ce12c740866f7f7..5fcef72ec3cb10de88ae8c91dca1bb0529f0701f 100644
--- a/src/comm/SerialInterface.h
+++ b/src/comm/SerialInterface.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef SERIALINTERFACE_H
-#define SERIALINTERFACE_H
+#pragma once
 
 #include <QIODevice>
 #include <QtSerialPort/QSerialPort>
@@ -201,6 +200,5 @@ public:
     }
 };
 
-#endif // SERIALINTERFACE_H
 
 // vim:ts=4:sw=4:tw=78:expandtab:
diff --git a/src/comm/SerialLink.h b/src/comm/SerialLink.h
index 82fe598d8cc5667839e1d134a95e7abca0440878..47f502063af6d4dc4024ad85d1c4cdb79fe8ac3e 100644
--- a/src/comm/SerialLink.h
+++ b/src/comm/SerialLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -16,8 +16,7 @@
  *
  */
 
-#ifndef SERIALLINK_H
-#define SERIALLINK_H
+#pragma once
 
 class LinkInterface;
 class SerialConfiguration;
@@ -194,4 +193,3 @@ signals:
 
 };
 
-#endif // SERIALLINK_H
diff --git a/src/comm/TCPLink.h b/src/comm/TCPLink.h
index 907af9cbc5dfe0aa2ee6d479a114b066ce97826f..35a3c22c8a47b7222041764ce86ff83a5d0b03d5 100644
--- a/src/comm/TCPLink.h
+++ b/src/comm/TCPLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -13,8 +13,7 @@
 ///
 ///     @author Don Gagne <don@thegagnes.com>
 
-#ifndef TCPLINK_H
-#define TCPLINK_H
+#pragma once
 
 #include <QString>
 #include <QList>
@@ -188,4 +187,3 @@ private:
     QMutex  _statisticsMutex;
 };
 
-#endif // TCPLINK_H
diff --git a/src/comm/UDPLink.h b/src/comm/UDPLink.h
index e88782e04c884fcca9c2746bad1972f2b7eb4da8..1f76b9e2698e7deb9017da9ff3d4ca1df6dca26f 100644
--- a/src/comm/UDPLink.h
+++ b/src/comm/UDPLink.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *   (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -15,8 +15,7 @@
  *
  */
 
-#ifndef UDPLINK_H
-#define UDPLINK_H
+#pragma once
 
 #include <QString>
 #include <QList>
@@ -204,4 +203,3 @@ private:
 
 };
 
-#endif // UDPLINK_H