diff --git a/libraries/AP_DDS/AP_DDS_Client.h b/libraries/AP_DDS/AP_DDS_Client.h
index 186b40351f..260faec5c5 100644
--- a/libraries/AP_DDS/AP_DDS_Client.h
+++ b/libraries/AP_DDS/AP_DDS_Client.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "AP_DDS_config.h"
+
 #if AP_DDS_ENABLED
 
 #include "uxr/client/client.h"
@@ -27,7 +29,6 @@
 #include "fcntl.h"
 
 #include <AP_Param/AP_Param.h>
-#include "AP_DDS_config.h"
 
 #define DDS_MTU             512
 #define DDS_STREAM_HISTORY  8
diff --git a/libraries/AP_DDS/AP_DDS_Type_Conversions.h b/libraries/AP_DDS/AP_DDS_Type_Conversions.h
index 71b2e3182d..24659ff00f 100644
--- a/libraries/AP_DDS/AP_DDS_Type_Conversions.h
+++ b/libraries/AP_DDS/AP_DDS_Type_Conversions.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include "AP_DDS_config.h"
+
 #if AP_DDS_ENABLED
 
 #include "builtin_interfaces/msg/Time.h"