diff --git a/Makefile.in b/Makefile.in
index 1f8ae16ef1..2c8397719d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2125,6 +2125,14 @@ COND_USE_STC_1___wxscintilla___depname = \
 @COND_TOOLKIT_WINCE@	wx/msw/wince/chkconf.h
 @COND_TOOLKIT_WINCE@NET_WINCE_SRC = src/msw/wince/net.cpp
 @COND_TOOLKIT_MSW@MSW_HTML_HDR = wx/msw/helpbest.h
+@COND_PLATFORM_MACOSX_1@WEBVIEW_HDR_PLATFORM = \
+@COND_PLATFORM_MACOSX_1@	wx/osx/webviewhistoryitem_webkit.h \
+@COND_PLATFORM_MACOSX_1@	wx/osx/webview_webkit.h
+@COND_PLATFORM_UNIX_1@WEBVIEW_HDR_PLATFORM = \
+@COND_PLATFORM_UNIX_1@	wx/gtk/webviewhistoryitem_webkit.h \
+@COND_PLATFORM_UNIX_1@	wx/gtk/webview_webkit.h
+@COND_TOOLKIT_MSW@WEBVIEW_HDR_PLATFORM = \
+@COND_TOOLKIT_MSW@	wx/msw/webviewhistoryitem_ie.h wx/msw/webview_ie.h
 @COND_TOOLKIT_OSX_CARBON@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
 @COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
 @COND_TOOLKIT_COCOA@OPENGL_HDR_PLATFORM = wx/cocoa/glcanvas.h
@@ -4261,7 +4269,9 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/richtext/richtextuicustomization.h \
 	wx/richtext/richtextxml.h \
 	wx/stc/stc.h \
-	${WEBVIEW_HDR}
+	$(WEBVIEW_HDR_PLATFORM) \
+	wx/webview.h \
+	wx/webviewarchivehandler.h
 @COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS)
 COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 077566a221..fba0e2690b 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -4013,7 +4013,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) ${WEBVIEW_HDR}
+            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_HDR)
         </if>
     </set>
 
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 085392300c..d027ce89a4 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -5444,6 +5444,14 @@ SOURCE=..\..\include\wx\msw\uxthemep.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\webview_ie.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\webviewhistoryitem_ie.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\window.h
 # End Source File
 # End Group
@@ -7012,6 +7020,14 @@ SOURCE=..\..\include\wx\vscroll.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\webview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\webviewarchivehandler.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\persist\window.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 6bd12caa7c..70196ca4b6 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -4655,6 +4655,12 @@
 				RelativePath="..\..\include\wx\msw\uxthemep.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\msw\webview_ie.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\window.h">
 			</File>
 		</Filter>
@@ -5835,6 +5841,12 @@
 				RelativePath="..\..\include\wx\vscroll.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\webview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\persist\window.h">
 			</File>
 			<File
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index d09c3a5d38..1897ac41df 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -6228,6 +6228,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\wx\msw\webview_ie.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\window.h"
 				>
 			</File>
@@ -7800,6 +7808,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\wx\webview.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\persist\window.h"
 				>
 			</File>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 8c2e5e6379..8edaed47e9 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -6224,6 +6224,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\wx\msw\webview_ie.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\window.h"
 				>
 			</File>
@@ -7796,6 +7804,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\wx\webview.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\persist\window.h"
 				>
 			</File>