diff --git a/libraries/DataFlash/DFMessageWriter.h b/libraries/DataFlash/DFMessageWriter.h
index 53f37e5565c..0dd2fae6d79 100644
--- a/libraries/DataFlash/DFMessageWriter.h
+++ b/libraries/DataFlash/DFMessageWriter.h
@@ -1,5 +1,4 @@
-#ifndef DF_LOGSTARTUP_H
-#define DF_LOGSTARTUP_H
+#pragma once
 
 #include "DataFlash_Backend.h"
 
@@ -112,6 +111,3 @@ private:
     DFMessageWriter_WriteSysInfo _writesysinfo;
     DFMessageWriter_WriteEntireMission _writeentiremission;
 };
-
-#endif
-
diff --git a/libraries/DataFlash/DataFlash.h b/libraries/DataFlash/DataFlash.h
index 8c7d5e1d97c..98b34ba363d 100644
--- a/libraries/DataFlash/DataFlash.h
+++ b/libraries/DataFlash/DataFlash.h
@@ -3,8 +3,7 @@
 /* ************************************************************ */
 /* Test for DataFlash Log library                               */
 /* ************************************************************ */
-#ifndef DataFlash_h
-#define DataFlash_h
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Common/AP_Common.h>
@@ -179,5 +178,3 @@ private:
     DataFlash_Backend *backends[DATAFLASH_MAX_BACKENDS];
     const char *_firmware_string;
 };
-
-#endif
diff --git a/libraries/DataFlash/DataFlash_Backend.h b/libraries/DataFlash/DataFlash_Backend.h
index b89a7b17516..51fc3317420 100644
--- a/libraries/DataFlash/DataFlash_Backend.h
+++ b/libraries/DataFlash/DataFlash_Backend.h
@@ -1,5 +1,4 @@
-#ifndef DATAFLASH_BACKEND_H
-#define DATAFLASH_BACKEND_H
+#pragma once
 
 #include "DataFlash.h"
 
@@ -134,5 +133,3 @@ private:
     uint32_t _last_periodic_1Hz;
     uint32_t _last_periodic_10Hz;
 };
-
-#endif
diff --git a/libraries/DataFlash/DataFlash_Block.h b/libraries/DataFlash/DataFlash_Block.h
index 3eb10231dd2..796c7624f9c 100644
--- a/libraries/DataFlash/DataFlash_Block.h
+++ b/libraries/DataFlash/DataFlash_Block.h
@@ -3,9 +3,7 @@
 /* 
    DataFlash logging - block oriented variant
  */
-
-#ifndef DataFlash_block_h
-#define DataFlash_block_h
+#pragma once
 
 #include "DataFlash_Backend.h"
 
@@ -125,6 +123,3 @@ protected:
 
 
 #include "DataFlash_SITL.h"
-
-#endif // DataFlash_block_h
-
diff --git a/libraries/DataFlash/DataFlash_File.h b/libraries/DataFlash/DataFlash_File.h
index cf76ccc9717..13771a4e9d1 100644
--- a/libraries/DataFlash/DataFlash_File.h
+++ b/libraries/DataFlash/DataFlash_File.h
@@ -6,9 +6,7 @@
    This uses posix file IO to create log files called logNN.dat in the
    given directory
  */
-
-#ifndef DataFlash_File_h
-#define DataFlash_File_h
+#pragma once
 
 #if HAL_OS_POSIX_IO
 
@@ -153,5 +151,3 @@ private:
 };
 
 #endif // HAL_OS_POSIX_IO
-
-#endif // DataFlash_File_h
diff --git a/libraries/DataFlash/DataFlash_MAVLink.h b/libraries/DataFlash/DataFlash_MAVLink.h
index 7724f3cd02f..0172e414aa0 100644
--- a/libraries/DataFlash/DataFlash_MAVLink.h
+++ b/libraries/DataFlash/DataFlash_MAVLink.h
@@ -5,9 +5,7 @@
 
    - transfers blocks of the open log file to a client using MAVLink
  */
-
-#ifndef DATAFLASH_MAVLINK_H
-#define DATAFLASH_MAVLINK_H
+#pragma once
 
 #define DATAFLASH_MAVLINK_SUPPORT 1
 
@@ -192,6 +190,3 @@ private:
 };
 
 #endif // DATAFLASH_MAVLINK_SUPPORT
-
-#endif // DATAFLASH_MAVLINK_H
-
diff --git a/libraries/DataFlash/DataFlash_SITL.h b/libraries/DataFlash/DataFlash_SITL.h
index a6f5843398c..b1fe34c9c84 100644
--- a/libraries/DataFlash/DataFlash_SITL.h
+++ b/libraries/DataFlash/DataFlash_SITL.h
@@ -1,8 +1,7 @@
 /* ************************************************************ */
 /* DataFlash_SITL Log library                                 */
 /* ************************************************************ */
-#ifndef __DATAFLASH_SITL_H__
-#define __DATAFLASH_SITL_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 
@@ -49,4 +48,3 @@ public:
 };
 
 #endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL
-#endif // __DATAFLASH_SITL_H__
diff --git a/libraries/DataFlash/LogStructure.h b/libraries/DataFlash/LogStructure.h
index ce4b9b177a3..69a06459ad7 100644
--- a/libraries/DataFlash/LogStructure.h
+++ b/libraries/DataFlash/LogStructure.h
@@ -1,5 +1,4 @@
-#ifndef _LOGSTRUCTURE_H
-#define _LOGSTRUCTURE_H
+#pragma once
 
 /*
   unfortunately these need to be macros because of a limitation of
@@ -983,5 +982,3 @@ enum LogOriginType {
     ekf_origin = 0,
     ahrs_home = 1
 };
-
-#endif