diff --git a/libraries/GCS_MAVLink/GCS.h b/libraries/GCS_MAVLink/GCS.h
index 1032161573..87a5d9588d 100644
--- a/libraries/GCS_MAVLink/GCS.h
+++ b/libraries/GCS_MAVLink/GCS.h
@@ -3,9 +3,7 @@
 /// @file	GCS.h
 /// @brief	Interface definition for the various Ground Control System
 // protocols.
-
-#ifndef __GCS_H
-#define __GCS_H
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Common/AP_Common.h>
@@ -345,5 +343,3 @@ private:
     // return true if this channel has hardware flow control
     bool have_flow_control(void);
 };
-
-#endif // __GCS_H
diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.h b/libraries/GCS_MAVLink/GCS_MAVLink.h
index c52e72d6a6..0577e236e4 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.h
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.h
@@ -2,9 +2,7 @@
 
 /// @file	GCS_MAVLink.h
 /// @brief	One size fits all header for MAVLink integration.
-
-#ifndef GCS_MAVLink_h
-#define GCS_MAVLink_h
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Param/AP_Param.h>
@@ -94,5 +92,3 @@ uint8_t mav_var_type(enum ap_var_type t);
 uint8_t mavlink_get_message_crc(uint8_t msgid);
 
 #pragma GCC diagnostic pop
-
-#endif // GCS_MAVLink_h
diff --git a/libraries/GCS_MAVLink/MAVLink_routing.h b/libraries/GCS_MAVLink/MAVLink_routing.h
index 2ad800e15c..f5afe32c20 100644
--- a/libraries/GCS_MAVLink/MAVLink_routing.h
+++ b/libraries/GCS_MAVLink/MAVLink_routing.h
@@ -2,9 +2,7 @@
 
 /// @file	MAVLink_routing.h
 /// @brief	handle routing of MAVLink packets by ID
-
-#ifndef __MAVLINK_ROUTING_H
-#define __MAVLINK_ROUTING_H
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Common/AP_Common.h>
@@ -63,6 +61,3 @@ private:
     // special handling for heartbeat messages
     void handle_heartbeat(mavlink_channel_t in_channel, const mavlink_message_t* msg);
 };
-
-#endif // __MAVLINK_ROUTING_H
-