diff --git a/libraries/AP_OpticalFlow/AP_OpticalFlow_Onboard.cpp b/libraries/AP_OpticalFlow/AP_OpticalFlow_Onboard.cpp
index 57ad9140ac..87b61d9eb6 100644
--- a/libraries/AP_OpticalFlow/AP_OpticalFlow_Onboard.cpp
+++ b/libraries/AP_OpticalFlow/AP_OpticalFlow_Onboard.cpp
@@ -12,10 +12,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <AP_HAL/AP_HAL.h>
-#include "OpticalFlow.h"
 #include "AP_OpticalFlow_Onboard.h"
 
+#include <AP_HAL/AP_HAL.h>
+
+#include "OpticalFlow.h"
+
 #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX &&\
     CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP
 //#define FLOWONBOARD_DEBUG 1
diff --git a/libraries/AP_OpticalFlow/AP_OpticalFlow_Onboard.h b/libraries/AP_OpticalFlow/AP_OpticalFlow_Onboard.h
index e0a98a7a23..c5a84c3c60 100644
--- a/libraries/AP_OpticalFlow/AP_OpticalFlow_Onboard.h
+++ b/libraries/AP_OpticalFlow/AP_OpticalFlow_Onboard.h
@@ -12,13 +12,14 @@
    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 __AP_OPTICALFLOW_ONBOARD_H__
-#define __AP_OPTICALFLOW_ONBOARD_H__
+#pragma once
 
 #include <AP_AHRS/AP_AHRS.h>
-#include <AP_NavEKF/AP_NavEKF.h>
-#include <AP_NavEKF2/AP_NavEKF2.h>
 #include <AP_Math/AP_Math.h>
+#include <AP_NavEKF2/AP_NavEKF2.h>
+#include <AP_NavEKF/AP_NavEKF.h>
+
+#include "OpticalFlow.h"
 
 class AP_OpticalFlow_Onboard : public OpticalFlow_backend
 {
@@ -31,5 +32,3 @@ private:
     void _get_gyro(float&, float&, float&);
     uint32_t _last_read_ms;
 };
-
-#endif