diff --git a/libraries/RC_Channel/RC_Channel.h b/libraries/RC_Channel/RC_Channel.h
index ff010dbae6..0e827c72ad 100644
--- a/libraries/RC_Channel/RC_Channel.h
+++ b/libraries/RC_Channel/RC_Channel.h
@@ -2,9 +2,7 @@
 
 /// @file	RC_Channel.h
 /// @brief	RC_Channel manager, with EEPROM-backed storage of constants.
-
-#ifndef __RC_CHANNEL_H__
-#define __RC_CHANNEL_H__
+#pragma once
 
 #include <AP_Common/AP_Common.h>
 #include <AP_Param/AP_Param.h>
@@ -162,5 +160,3 @@ protected:
 
 // This is ugly, but it fixes poorly architected library
 #include "RC_Channel_aux.h"
-
-#endif
diff --git a/libraries/RC_Channel/RC_Channel_aux.h b/libraries/RC_Channel/RC_Channel_aux.h
index d986d57788..895b606484 100644
--- a/libraries/RC_Channel/RC_Channel_aux.h
+++ b/libraries/RC_Channel/RC_Channel_aux.h
@@ -3,9 +3,7 @@
 /// @file	RC_Channel_aux.h
 /// @brief	RC_Channel manager for auxiliary channels (5..8), with EEPROM-backed storage of constants.
 /// @author Amilcar Lucas
-
-#ifndef __RC_CHANNEL_AUX_H__
-#define __RC_CHANNEL_AUX_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include "RC_Channel.h"
@@ -151,5 +149,3 @@ private:
 
     void aux_servo_function_setup(void);
 };
-
-#endif /* RC_CHANNEL_AUX_H_ */