diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index cbd108ea96..9f7a941157 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2244,11 +2244,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         </if>
     </set>
 
-    <set var="ALL_HEADERS" make_var="1" hints="files">
+    <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
+        $(XML_HDR)
+    </set>
+
+    <set var="ALL_HEADERS" make_var="1" hints="files">
+        $(ALL_BASE_HEADERS)
         $(ALL_GUI_HEADERS) $(ADVANCED_HDR)
-        $(HTML_HDR) $(XML_HDR)
+        $(HTML_HDR)
         $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
     </set>
 
diff --git a/docs/tech/tn0016.txt b/docs/tech/tn0016.txt
index 99d2882658..9f2d9896d7 100644
--- a/docs/tech/tn0016.txt
+++ b/docs/tech/tn0016.txt
@@ -173,7 +173,8 @@ a) Add files to files.bkl:
      Finally, define FOO_SRC and FOO_HDR to contain both
      FOO_PLATFORM_{SRC,HDR} and FOO_{SRC,HDR} (see NET_SRC definition for an
      example).
-   * Add FOO_HDR to ALL_HEADERS
+   * Add FOO_HDR to ALL_HEADERS (or ALL_BASE_HEADERS if wxFoo is not GUI
+     component). 
 
    (You can apply different approaches to HDR and SRC variables, if e.g.
    headers are all common but sources are not.)