diff --git a/libraries/AP_Mount/AP_Mount.h b/libraries/AP_Mount/AP_Mount.h
index 766e2dab25..34a924376d 100644
--- a/libraries/AP_Mount/AP_Mount.h
+++ b/libraries/AP_Mount/AP_Mount.h
@@ -19,8 +19,7 @@
 * Comments: All angles in degrees * 100, distances in meters*
 *			unless otherwise stated.						*
 ************************************************************/
-#ifndef __AP_MOUNT_H__
-#define __AP_MOUNT_H__
+#pragma once
 
 #include <AP_Math/AP_Math.h>
 #include <AP_Common/AP_Common.h>
@@ -186,5 +185,3 @@ protected:
 
     DataFlash_Class *_dataflash;
 };
-
-#endif // __AP_MOUNT_H__
diff --git a/libraries/AP_Mount/AP_Mount_Alexmos.h b/libraries/AP_Mount/AP_Mount_Alexmos.h
index 2cef5ca961..a746e19459 100644
--- a/libraries/AP_Mount/AP_Mount_Alexmos.h
+++ b/libraries/AP_Mount/AP_Mount_Alexmos.h
@@ -3,9 +3,7 @@
 /*
   Alexmos Serial controlled mount backend class
 */
-
-#ifndef __AP_MOUNT_ALEXMOS_H__
-#define __AP_MOUNT_ALEXMOS_H__
+#pragma once
 
 #include "AP_Mount.h"
 #include <AP_HAL/AP_HAL.h>
@@ -319,5 +317,3 @@ private:
     // confirmed that last command was ok
     bool _last_command_confirmed : 1;
 };
-
-#endif
diff --git a/libraries/AP_Mount/AP_Mount_Backend.h b/libraries/AP_Mount/AP_Mount_Backend.h
index 4795e1133d..4a7a929e1b 100644
--- a/libraries/AP_Mount/AP_Mount_Backend.h
+++ b/libraries/AP_Mount/AP_Mount_Backend.h
@@ -18,9 +18,7 @@
   Mount driver backend class. Each supported mount type
   needs to have an object derived from this class.
  */
-
-#ifndef __AP_MOUNT_BACKEND_H__
-#define __AP_MOUNT_BACKEND_H__
+#pragma once
 
 #include <AP_Common/AP_Common.h>
 #include "AP_Mount.h"
@@ -100,5 +98,3 @@ protected:
     uint8_t     _instance;  // this instance's number
     Vector3f    _angle_ef_target_rad;   // desired earth-frame roll, tilt and vehicle-relative pan angles in radians
 };
-
-#endif // __AP_MOUNT_BACKEND_H__
diff --git a/libraries/AP_Mount/AP_Mount_SToRM32.h b/libraries/AP_Mount/AP_Mount_SToRM32.h
index 19caceb3da..1da77aa983 100644
--- a/libraries/AP_Mount/AP_Mount_SToRM32.h
+++ b/libraries/AP_Mount/AP_Mount_SToRM32.h
@@ -3,9 +3,7 @@
 /*
   SToRM32 mount backend class
  */
-
-#ifndef __AP_MOUNT_STORM32_H__
-#define __AP_MOUNT_STORM32_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_AHRS/AP_AHRS.h>
@@ -58,5 +56,3 @@ private:
     mavlink_channel_t _chan;        // mavlink channel used to communicate with gimbal.  Currently hard-coded to Telem2
     uint32_t _last_send;            // system time of last do_mount_control sent to gimbal
 };
-
-#endif // __AP_MOUNT_STORM32_H__
diff --git a/libraries/AP_Mount/AP_Mount_SToRM32_serial.h b/libraries/AP_Mount/AP_Mount_SToRM32_serial.h
index 3575bd8cbc..1da8e49197 100644
--- a/libraries/AP_Mount/AP_Mount_SToRM32_serial.h
+++ b/libraries/AP_Mount/AP_Mount_SToRM32_serial.h
@@ -3,9 +3,7 @@
 /*
   SToRM32 mount using serial protocol backend class
  */
-
-#ifndef __AP_MOUNT_STORM32_SERIAL_H__
-#define __AP_MOUNT_STORM32_SERIAL_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_AHRS/AP_AHRS.h>
@@ -153,5 +151,3 @@ private:
     // keep the last _current_angle values
     Vector3l _current_angle;
 };
-
-#endif // __AP_MOUNT_STORM32_SERIAL_H__
diff --git a/libraries/AP_Mount/AP_Mount_Servo.h b/libraries/AP_Mount/AP_Mount_Servo.h
index d7997e2258..5f0a1310e9 100644
--- a/libraries/AP_Mount/AP_Mount_Servo.h
+++ b/libraries/AP_Mount/AP_Mount_Servo.h
@@ -3,9 +3,7 @@
 /*
   Servo controlled mount backend class
  */
-
-#ifndef __AP_MOUNT_SERVO_H__
-#define __AP_MOUNT_SERVO_H__
+#pragma once
 
 #include <AP_Math/AP_Math.h>
 #include <AP_Common/AP_Common.h>
@@ -80,5 +78,3 @@ private:
 
     uint32_t _last_check_servo_map_ms;  // system time of latest call to check_servo_map function
 };
-
-#endif // __AP_MOUNT_SERVO_H__
diff --git a/libraries/AP_Mount/AP_Mount_SoloGimbal.h b/libraries/AP_Mount/AP_Mount_SoloGimbal.h
index ebce708e12..4d985396a2 100644
--- a/libraries/AP_Mount/AP_Mount_SoloGimbal.h
+++ b/libraries/AP_Mount/AP_Mount_SoloGimbal.h
@@ -3,9 +3,7 @@
 /*
   MAVLink enabled mount backend class
  */
-
-#ifndef __AP_MOUNT_SOLOGIMBAL_H__
-#define __AP_MOUNT_SOLOGIMBAL_H__
+#pragma once
 
 
 #include <AP_HAL/AP_HAL.h>
@@ -66,5 +64,3 @@ private:
 };
 
 #endif // AP_AHRS_NAVEKF_AVAILABLE
-
-#endif // __AP_MOUNT_SOLOGIMBAL_H__
diff --git a/libraries/AP_Mount/SoloGimbal.h b/libraries/AP_Mount/SoloGimbal.h
index 2716870790..734d05511c 100644
--- a/libraries/AP_Mount/SoloGimbal.h
+++ b/libraries/AP_Mount/SoloGimbal.h
@@ -6,8 +6,7 @@
 * Author:  Arthur Benemann, Paul Riseborough;               *
 *                                                           *
 ************************************************************/
-#ifndef __SOLOGIMBAL_H__
-#define __SOLOGIMBAL_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_AHRS/AP_AHRS.h>
@@ -158,5 +157,3 @@ private:
 };
 
 #endif // AP_AHRS_NAVEKF_AVAILABLE
-
-#endif // __AP_MOUNT_H__
diff --git a/libraries/AP_Mount/SoloGimbalEKF.h b/libraries/AP_Mount/SoloGimbalEKF.h
index 874ea2a5ec..a700976dd2 100644
--- a/libraries/AP_Mount/SoloGimbalEKF.h
+++ b/libraries/AP_Mount/SoloGimbalEKF.h
@@ -17,9 +17,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#ifndef _SOLO_GIMBAL_EKF_
-#define _SOLO_GIMBAL_EKF_
+#pragma once
 
 #include <AP_Math/AP_Math.h>
 #include <AP_InertialSensor/AP_InertialSensor.h>
@@ -172,5 +170,3 @@ private:
     // Force symmmetry and non-negative diagonals on state covarinace matrix
     void fixCovariance();
 };
-
-#endif // _SOLO_GIMBAL_EKF_
diff --git a/libraries/AP_Mount/SoloGimbal_Parameters.h b/libraries/AP_Mount/SoloGimbal_Parameters.h
index 76d8ce29c7..6dc279c20a 100644
--- a/libraries/AP_Mount/SoloGimbal_Parameters.h
+++ b/libraries/AP_Mount/SoloGimbal_Parameters.h
@@ -1,5 +1,4 @@
-#ifndef __SOLOGIMBAL_PARAMETERS__
-#define __SOLOGIMBAL_PARAMETERS__
+#pragma once
 #include <AP_Math/AP_Math.h>
 #include <AP_Common/AP_Common.h>
 #include <GCS_MAVLink/GCS_MAVLink.h>
@@ -89,6 +88,3 @@ private:
 
     mavlink_channel_t _chan;
 };
-
-
-#endif // __SOLOGIMBAL_PARAMETERS__