diff --git a/message_definitions/v1.0/common.xml b/message_definitions/v1.0/common.xml
index 28f006feacc..247c59e7602 100644
--- a/message_definitions/v1.0/common.xml
+++ b/message_definitions/v1.0/common.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <mavlink>
-  <include>minimal.xml</include>
+  <include>standard.xml</include>
   <version>3</version>
   <dialect>0</dialect>
   <enums>
diff --git a/message_definitions/v1.0/development.xml b/message_definitions/v1.0/development.xml
index 4adbb75e2e5..1d3b253a33c 100644
--- a/message_definitions/v1.0/development.xml
+++ b/message_definitions/v1.0/development.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <mavlink>
-  <!-- XML file for prototyping definitions for standard.xml  -->
-  <include>standard.xml</include>
+  <!-- XML file for prototyping definitions for common.xml  -->
+  <include>common.xml</include>
   <version>0</version>
   <dialect>0</dialect>
   <enums>
diff --git a/message_definitions/v1.0/standard.xml b/message_definitions/v1.0/standard.xml
index 4ca39607ad1..e323b9543f5 100644
--- a/message_definitions/v1.0/standard.xml
+++ b/message_definitions/v1.0/standard.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <mavlink>
   <!-- MAVLink standard messages -->
-  <include>common.xml</include>
+  <include>minimal.xml</include>
   <dialect>0</dialect>
-  <!-- use common.xml enums -->
+  <!-- use minimal.xml enums -->
   <enums/>
-  <!-- use common.xml messages -->
+  <!-- use minimal.xml messages -->
   <messages/>
 </mavlink>