diff --git a/libraries/AP_Terrain/AP_Terrain.h b/libraries/AP_Terrain/AP_Terrain.h
index 1bbdaeb05b4c3..9d473a6b308c5 100644
--- a/libraries/AP_Terrain/AP_Terrain.h
+++ b/libraries/AP_Terrain/AP_Terrain.h
@@ -14,12 +14,7 @@
  */
 #pragma once
 
-#include <AP_HAL/AP_HAL_Boards.h>
-#include <AP_Filesystem/AP_Filesystem_config.h>
-
-#ifndef AP_TERRAIN_AVAILABLE
-#define AP_TERRAIN_AVAILABLE AP_FILESYSTEM_FILE_READING_ENABLED
-#endif
+#include "AP_Terrain_config.h"
 
 #if AP_TERRAIN_AVAILABLE
 
diff --git a/libraries/AP_Terrain/AP_Terrain_config.h b/libraries/AP_Terrain/AP_Terrain_config.h
new file mode 100644
index 0000000000000..30bc8b0b1fbb5
--- /dev/null
+++ b/libraries/AP_Terrain/AP_Terrain_config.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <AP_HAL/AP_HAL_Boards.h>
+#include <AP_Filesystem/AP_Filesystem_config.h>
+
+#ifndef AP_TERRAIN_AVAILABLE
+#define AP_TERRAIN_AVAILABLE AP_FILESYSTEM_FILE_READING_ENABLED
+#endif