diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index bfda5997fe..314f294c82 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3309,21 +3309,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- wxHTML users: -->
     src/generic/htmllbox.cpp
 </set>
-<set var="WEB_SRC_PLATFORM">
-    <if cond="TOOLKIT=='MSW'">
-        src/msw/webview.cpp
-    </if>
-    <if cond="PLATFORM_UNIX=='1'">
-        src/gtk/webview.cpp
-    </if>
-    <if cond="PLATFORM_MACOSX=='1'">
-        src/osx/webview.mm
-    </if>
-</set>
-<set var="WEB_SRC" hints="files">
-    $(WEB_SRC_PLATFORM)
-    src/common/webview.cpp
-</set>
 <set var="MSW_HTML_HDR" hints="files">
     <if cond="TOOLKIT=='MSW'">wx/msw/helpbest.h</if>
 </set>
@@ -3349,22 +3334,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/htmllbox.h
     $(MSW_HTML_HDR)
 </set>
-<set var="PLATFORM_WEB_HDR" hints="files">
-    <if cond="TOOLKIT=='MSW'">
-        wx/msw/webviewie.h
-    </if>
-    <if cond="PLATFORM_UNIX=='1'">
-        wx/gtk/webview.h
-    </if>
-    <if cond="PLATFORM_MACOSX=='1'">
-        wx/osx/webview.h
-    </if>
+
+<!-- ====================================================================== -->
+<!--                                wxWEB                                   -->
+<!-- ====================================================================== -->
+
+<set var="WEB_SRC_PLATFORM">
+    <if cond="TOOLKIT=='MSW'">src/msw/webview.cpp</if>
+    <if cond="PLATFORM_UNIX=='1'">src/gtk/webview.cpp</if>
+    <if cond="PLATFORM_MACOSX=='1'">src/osx/webview.mm</if>
 </set>
-<set var="WEB_HDR" hints="files">
-    $(PLATFORM_WEB_HDR)
-    wx/webview.h
+<set var="WEB_SRC" hints="files">
+    $(WEB_SRC_PLATFORM)
+    src/common/webview.cpp
 </set>
 
+<set var="WEB_HDR_PLATFORM" hints="files">
+    <if cond="TOOLKIT=='MSW'">wx/msw/webviewie.h</if>
+    <if cond="PLATFORM_UNIX=='1'">wx/gtk/webview.h</if>
+    <if cond="PLATFORM_MACOSX=='1'">wx/osx/webview.h</if>
+</set>
+<set var="WEB_HDR" hints="files">
+    $(WEB_HDR_PLATFORM)
+    wx/webview.h
+</set>
 
 <!-- ====================================================================== -->
 <!--                                wxXRC                                   -->
@@ -3956,7 +3949,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
-            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR)
+            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEB_HDR}
         </if>
     </set>