Rewrite platform headers in public/web/ to public/platform/...

Includes of this style are more consistent with the rest of the project and
easier to verify with DEPS. For consistency, includes in public/web/ of other
headers in public/web/ are rewritten to list the public/web/ portion as well.

BUG=350097

Review URL: https://codereview.chromium.org/189703002

git-svn-id: svn://svn.chromium.org/blink/trunk@169597 bbb929c8-8fbe-4397-9dbb-9b2b20218538

136 files changed, 308 insertions, 308 deletions

diff --git a/third_party/WebKit/public/web/WebAXObject.h b/third_party/WebKit/public/web/WebAXObject.h
index a22aecc..3a15232 100644
--- a/third_party/WebKit/public/web/WebAXObject.h
+++ b/third_party/WebKit/public/web/WebAXObject.h
@@ -31,10 +31,10 @@
 #ifndef WebAXObject_h
 #define WebAXObject_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebVector.h"
-#include "WebAXEnums.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebAXEnums.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WTF { template <typename T> class PassRefPtr; }
diff --git a/third_party/WebKit/public/web/WebActiveWheelFlingParameters.h b/third_party/WebKit/public/web/WebActiveWheelFlingParameters.h
index 82a09a3..9fbd4d66 100644
--- a/third_party/WebKit/public/web/WebActiveWheelFlingParameters.h
+++ b/third_party/WebKit/public/web/WebActiveWheelFlingParameters.h
@@ -26,11 +26,11 @@
 #ifndef WebActiveWheelFlingParameters_h
 #define WebActiveWheelFlingParameters_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebFloatPoint.h"
-#include "../platform/WebPoint.h"
-#include "../platform/WebSize.h"
-#include "WebInputEvent.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebFloatPoint.h"
+#include "public/platform/WebPoint.h"
+#include "public/platform/WebSize.h"
+#include "public/web/WebInputEvent.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebArrayBufferView.h b/third_party/WebKit/public/web/WebArrayBufferView.h
index cc02d7e..b436146 100644
--- a/third_party/WebKit/public/web/WebArrayBufferView.h
+++ b/third_party/WebKit/public/web/WebArrayBufferView.h
@@ -29,8 +29,8 @@
 #ifndef WebArrayBufferView_h
 #define WebArrayBufferView_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 
 namespace v8 {
 class Value;
diff --git a/third_party/WebKit/public/web/WebBindings.h b/third_party/WebKit/public/web/WebBindings.h
index a83120a..1b9d7b2 100644
--- a/third_party/WebKit/public/web/WebBindings.h
+++ b/third_party/WebKit/public/web/WebBindings.h
@@ -31,9 +31,9 @@
 #ifndef WebBindings_h
 #define WebBindings_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
 #include <bindings/npruntime.h>
 
 namespace v8 {
diff --git a/third_party/WebKit/public/web/WebCache.h b/third_party/WebKit/public/web/WebCache.h
index 28557da..0b56c10 100644
--- a/third_party/WebKit/public/web/WebCache.h
+++ b/third_party/WebKit/public/web/WebCache.h
@@ -31,7 +31,7 @@
 #ifndef WebCache_h
 #define WebCache_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebCachedURLRequest.h b/third_party/WebKit/public/web/WebCachedURLRequest.h
index c889171..289dce6 100644
--- a/third_party/WebKit/public/web/WebCachedURLRequest.h
+++ b/third_party/WebKit/public/web/WebCachedURLRequest.h
@@ -31,9 +31,9 @@
 #ifndef WebCachedURLRequest_h
 #define WebCachedURLRequest_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivateOwnPtr.h"
-#include "../platform/WebString.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivateOwnPtr.h"
+#include "public/platform/WebString.h"
 
 namespace WebCore { class FetchRequest; }
 
diff --git a/third_party/WebKit/public/web/WebColorChooser.h b/third_party/WebKit/public/web/WebColorChooser.h
index 2c2ce9c..8299796 100644
--- a/third_party/WebKit/public/web/WebColorChooser.h
+++ b/third_party/WebKit/public/web/WebColorChooser.h
@@ -26,8 +26,8 @@
 #ifndef WebColorChooser_h
 #define WebColorChooser_h
 
-#include "../platform/WebColor.h"
-#include "../platform/WebCommon.h"
+#include "public/platform/WebColor.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebColorChooserClient.h b/third_party/WebKit/public/web/WebColorChooserClient.h
index 30ca541..cb6aaff 100644
--- a/third_party/WebKit/public/web/WebColorChooserClient.h
+++ b/third_party/WebKit/public/web/WebColorChooserClient.h
@@ -26,8 +26,8 @@
 #ifndef WebColorChooserClient_h
 #define WebColorChooserClient_h
 
-#include "../platform/WebColor.h"
-#include "../platform/WebCommon.h"
+#include "public/platform/WebColor.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebColorName.h b/third_party/WebKit/public/web/WebColorName.h
index 53ef76a..42c886e 100644
--- a/third_party/WebKit/public/web/WebColorName.h
+++ b/third_party/WebKit/public/web/WebColorName.h
@@ -31,8 +31,8 @@
 #ifndef WebColorName_h
 #define WebColorName_h
 
-#include "../platform/WebColor.h"
-#include "../platform/WebCommon.h"
+#include "public/platform/WebColor.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebCompositionUnderline.h b/third_party/WebKit/public/web/WebCompositionUnderline.h
index 2c58662..7565df7 100644
--- a/third_party/WebKit/public/web/WebCompositionUnderline.h
+++ b/third_party/WebKit/public/web/WebCompositionUnderline.h
@@ -31,7 +31,7 @@
 #ifndef WebCompositionUnderline_h
 #define WebCompositionUnderline_h
 
-#include "../platform/WebColor.h"
+#include "public/platform/WebColor.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebConsoleMessage.h b/third_party/WebKit/public/web/WebConsoleMessage.h
index 616e8eb..f6e385f 100644
--- a/third_party/WebKit/public/web/WebConsoleMessage.h
+++ b/third_party/WebKit/public/web/WebConsoleMessage.h
@@ -31,7 +31,7 @@
 #ifndef WebConsoleMessage_h
 #define WebConsoleMessage_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebContentDetectionResult.h b/third_party/WebKit/public/web/WebContentDetectionResult.h
index 9d415be..b7b5d41 100644
--- a/third_party/WebKit/public/web/WebContentDetectionResult.h
+++ b/third_party/WebKit/public/web/WebContentDetectionResult.h
@@ -26,9 +26,9 @@
 #ifndef WebContentDetectionResult_h
 #define WebContentDetectionResult_h
 
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
-#include "WebRange.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
+#include "public/web/WebRange.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebContextMenuData.h b/third_party/WebKit/public/web/WebContextMenuData.h
index 7e9931a..0eb7544 100644
--- a/third_party/WebKit/public/web/WebContextMenuData.h
+++ b/third_party/WebKit/public/web/WebContextMenuData.h
@@ -31,14 +31,14 @@
 #ifndef WebContextMenuData_h
 #define WebContextMenuData_h
 
-#include "../platform/WebPoint.h"
-#include "../platform/WebReferrerPolicy.h"
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
-#include "../platform/WebVector.h"
-#include "WebHistoryItem.h"
-#include "WebMenuItemInfo.h"
-#include "WebNode.h"
+#include "public/platform/WebPoint.h"
+#include "public/platform/WebReferrerPolicy.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebHistoryItem.h"
+#include "public/web/WebMenuItemInfo.h"
+#include "public/web/WebNode.h"
 
 #define WEBCONTEXT_MEDIATYPEFILE_DEFINED
 
diff --git a/third_party/WebKit/public/web/WebCustomElement.h b/third_party/WebKit/public/web/WebCustomElement.h
index a570831..a782c31 100644
--- a/third_party/WebKit/public/web/WebCustomElement.h
+++ b/third_party/WebKit/public/web/WebCustomElement.h
@@ -31,7 +31,7 @@
 #ifndef WebCustomElement_h
 #define WebCustomElement_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDOMActivityLogger.h b/third_party/WebKit/public/web/WebDOMActivityLogger.h
index 9664be5..815e8fe 100644
--- a/third_party/WebKit/public/web/WebDOMActivityLogger.h
+++ b/third_party/WebKit/public/web/WebDOMActivityLogger.h
@@ -31,9 +31,9 @@
 #ifndef WebDOMActivityLogger_h
 #define WebDOMActivityLogger_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
 #include <v8.h>
 
 namespace blink {
diff --git a/third_party/WebKit/public/web/WebDOMCustomEvent.h b/third_party/WebKit/public/web/WebDOMCustomEvent.h
index e6f2f671..76ee49a 100644
--- a/third_party/WebKit/public/web/WebDOMCustomEvent.h
+++ b/third_party/WebKit/public/web/WebDOMCustomEvent.h
@@ -30,8 +30,8 @@
 #ifndef WebDOMCustomEvent_h
 #define WebDOMCustomEvent_h
 
-#include "WebDOMEvent.h"
-#include "WebSerializedScriptValue.h"
+#include "public/web/WebDOMEvent.h"
+#include "public/web/WebSerializedScriptValue.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDOMEvent.h b/third_party/WebKit/public/web/WebDOMEvent.h
index 4be814f..18f6336 100644
--- a/third_party/WebKit/public/web/WebDOMEvent.h
+++ b/third_party/WebKit/public/web/WebDOMEvent.h
@@ -31,10 +31,10 @@
 #ifndef WebDOMEvent_h
 #define WebDOMEvent_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebString.h"
-#include "WebNode.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebString.h"
+#include "public/web/WebNode.h"
 
 namespace WebCore { class Event; }
 #if BLINK_IMPLEMENTATION
diff --git a/third_party/WebKit/public/web/WebDOMEventListener.h b/third_party/WebKit/public/web/WebDOMEventListener.h
index 7b247d1..e9ec5dc 100644
--- a/third_party/WebKit/public/web/WebDOMEventListener.h
+++ b/third_party/WebKit/public/web/WebDOMEventListener.h
@@ -31,7 +31,7 @@
 #ifndef WebDOMEventListener_h
 #define WebDOMEventListener_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class EventTarget; }
diff --git a/third_party/WebKit/public/web/WebDOMFileSystem.h b/third_party/WebKit/public/web/WebDOMFileSystem.h
index 5279cc0..566a5e2 100644
--- a/third_party/WebKit/public/web/WebDOMFileSystem.h
+++ b/third_party/WebKit/public/web/WebDOMFileSystem.h
@@ -30,11 +30,11 @@
 #ifndef WebDOMFileSystem_h
 #define WebDOMFileSystem_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebFileSystem.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebFileSystem.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
 
 #if BLINK_IMPLEMENTATION
 #include "heap/Handle.h"
diff --git a/third_party/WebKit/public/web/WebDOMMessageEvent.h b/third_party/WebKit/public/web/WebDOMMessageEvent.h
index 92623f1..37919fd 100644
--- a/third_party/WebKit/public/web/WebDOMMessageEvent.h
+++ b/third_party/WebKit/public/web/WebDOMMessageEvent.h
@@ -30,9 +30,9 @@
 #ifndef WebDOMMessageEvent_h
 #define WebDOMMessageEvent_h
 
-#include "../platform/WebMessagePortChannel.h"
-#include "WebDOMEvent.h"
-#include "WebSerializedScriptValue.h"
+#include "public/platform/WebMessagePortChannel.h"
+#include "public/web/WebDOMEvent.h"
+#include "public/web/WebSerializedScriptValue.h"
 
 #if BLINK_IMPLEMENTATION
 #include "core/events/Event.h"
diff --git a/third_party/WebKit/public/web/WebDOMMouseEvent.h b/third_party/WebKit/public/web/WebDOMMouseEvent.h
index a46dfec..efa0676 100644
--- a/third_party/WebKit/public/web/WebDOMMouseEvent.h
+++ b/third_party/WebKit/public/web/WebDOMMouseEvent.h
@@ -30,7 +30,7 @@
 #ifndef WebDOMMouseEvent_h
 #define WebDOMMouseEvent_h
 
-#include "WebDOMEvent.h"
+#include "public/web/WebDOMEvent.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class Event; }
diff --git a/third_party/WebKit/public/web/WebDOMProgressEvent.h b/third_party/WebKit/public/web/WebDOMProgressEvent.h
index 830a368..2e441ef 100644
--- a/third_party/WebKit/public/web/WebDOMProgressEvent.h
+++ b/third_party/WebKit/public/web/WebDOMProgressEvent.h
@@ -31,7 +31,7 @@
 #ifndef WebDOMProgressEvent_h
 #define WebDOMProgressEvent_h
 
-#include "WebDOMEvent.h"
+#include "public/web/WebDOMEvent.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h b/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h
index 9736e8f..0a2ce7c 100644
--- a/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h
+++ b/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h
@@ -31,7 +31,7 @@
 #ifndef WebDOMResourceProgressEvent_h
 #define WebDOMResourceProgressEvent_h
 
-#include "WebDOMProgressEvent.h"
+#include "public/web/WebDOMProgressEvent.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDataSource.h b/third_party/WebKit/public/web/WebDataSource.h
index 6437ab70..639c837 100644
--- a/third_party/WebKit/public/web/WebDataSource.h
+++ b/third_party/WebKit/public/web/WebDataSource.h
@@ -31,9 +31,9 @@
 #ifndef WebDataSource_h
 #define WebDataSource_h
 
-#include "../platform/WebCommon.h"
-#include "WebNavigationType.h"
-#include "WebTextDirection.h"
+#include "public/platform/WebCommon.h"
+#include "public/web/WebNavigationType.h"
+#include "public/web/WebTextDirection.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDatabase.h b/third_party/WebKit/public/web/WebDatabase.h
index 14973c28..ff34c13 100644
--- a/third_party/WebKit/public/web/WebDatabase.h
+++ b/third_party/WebKit/public/web/WebDatabase.h
@@ -31,8 +31,8 @@
 #ifndef WebDatabase_h
 #define WebDatabase_h
 
-#include "../platform/WebCommon.h"
-#include "WebSecurityOrigin.h"
+#include "public/platform/WebCommon.h"
+#include "public/web/WebSecurityOrigin.h"
 
 namespace WebCore { class DatabaseBackendBase; }
 
diff --git a/third_party/WebKit/public/web/WebDateTimeChooserCompletion.h b/third_party/WebKit/public/web/WebDateTimeChooserCompletion.h
index 38ab250e..56e2013 100644
--- a/third_party/WebKit/public/web/WebDateTimeChooserCompletion.h
+++ b/third_party/WebKit/public/web/WebDateTimeChooserCompletion.h
@@ -26,7 +26,7 @@
 #ifndef WebDateTimeChooserCompletion_h
 #define WebDateTimeChooserCompletion_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDateTimeChooserParams.h b/third_party/WebKit/public/web/WebDateTimeChooserParams.h
index 443db11..2a6d5aa 100644
--- a/third_party/WebKit/public/web/WebDateTimeChooserParams.h
+++ b/third_party/WebKit/public/web/WebDateTimeChooserParams.h
@@ -26,11 +26,11 @@
 #ifndef WebDateTimeChooserParams_h
 #define WebDateTimeChooserParams_h
 
-#include "../platform/WebRect.h"
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
-#include "WebDateTimeInputType.h"
-#include "WebDateTimeSuggestion.h"
+#include "public/platform/WebRect.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebDateTimeInputType.h"
+#include "public/web/WebDateTimeSuggestion.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDevToolsAgent.h b/third_party/WebKit/public/web/WebDevToolsAgent.h
index 73a8f82..8e47253 100644
--- a/third_party/WebKit/public/web/WebDevToolsAgent.h
+++ b/third_party/WebKit/public/web/WebDevToolsAgent.h
@@ -31,8 +31,8 @@
 #ifndef WebDevToolsAgent_h
 #define WebDevToolsAgent_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebVector.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebVector.h"
 
 namespace blink {
 class WebDevToolsAgentClient;
diff --git a/third_party/WebKit/public/web/WebDevToolsAgentClient.h b/third_party/WebKit/public/web/WebDevToolsAgentClient.h
index 9d4a433..17a0964 100644
--- a/third_party/WebKit/public/web/WebDevToolsAgentClient.h
+++ b/third_party/WebKit/public/web/WebDevToolsAgentClient.h
@@ -31,8 +31,8 @@
 #ifndef WebDevToolsAgentClient_h
 #define WebDevToolsAgentClient_h
 
-#include "../platform/WebCString.h"
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCString.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 class WebString;
diff --git a/third_party/WebKit/public/web/WebDevToolsFrontend.h b/third_party/WebKit/public/web/WebDevToolsFrontend.h
index 1f6547d..7665e05 100644
--- a/third_party/WebKit/public/web/WebDevToolsFrontend.h
+++ b/third_party/WebKit/public/web/WebDevToolsFrontend.h
@@ -31,7 +31,7 @@
 #ifndef WebDevToolsFrontend_h
 #define WebDevToolsFrontend_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDocument.h b/third_party/WebKit/public/web/WebDocument.h
index cf2e680..9bc8426 100644
--- a/third_party/WebKit/public/web/WebDocument.h
+++ b/third_party/WebKit/public/web/WebDocument.h
@@ -31,12 +31,12 @@
 #ifndef WebDocument_h
 #define WebDocument_h
 
-#include "../platform/WebReferrerPolicy.h"
-#include "../platform/WebVector.h"
-#include "WebDraggableRegion.h"
-#include "WebExceptionCode.h"
-#include "WebNode.h"
-#include "WebSecurityOrigin.h"
+#include "public/platform/WebReferrerPolicy.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebDraggableRegion.h"
+#include "public/web/WebExceptionCode.h"
+#include "public/web/WebNode.h"
+#include "public/web/WebSecurityOrigin.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore {
diff --git a/third_party/WebKit/public/web/WebDocumentType.h b/third_party/WebKit/public/web/WebDocumentType.h
index 8760865..25c5df8 100644
--- a/third_party/WebKit/public/web/WebDocumentType.h
+++ b/third_party/WebKit/public/web/WebDocumentType.h
@@ -31,7 +31,7 @@
 #ifndef WebDocumentType_h
 #define WebDocumentType_h
 
-#include "WebNode.h"
+#include "public/web/WebNode.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class DocumentType; }
diff --git a/third_party/WebKit/public/web/WebDraggableRegion.h b/third_party/WebKit/public/web/WebDraggableRegion.h
index 90636a5..2599135 100644
--- a/third_party/WebKit/public/web/WebDraggableRegion.h
+++ b/third_party/WebKit/public/web/WebDraggableRegion.h
@@ -31,9 +31,9 @@
 #ifndef WebDraggableRegion_h
 #define WebDraggableRegion_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebRect.h"
-#include "../platform/WebString.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebRect.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebElement.h b/third_party/WebKit/public/web/WebElement.h
index 3bfd310..7c9c901 100644
--- a/third_party/WebKit/public/web/WebElement.h
+++ b/third_party/WebKit/public/web/WebElement.h
@@ -31,8 +31,8 @@
 #ifndef WebElement_h
 #define WebElement_h
 
-#include "../platform/WebImage.h"
-#include "WebNode.h"
+#include "public/platform/WebImage.h"
+#include "public/web/WebNode.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class Element; }
diff --git a/third_party/WebKit/public/web/WebElementCollection.h b/third_party/WebKit/public/web/WebElementCollection.h
index 6c684c2..eedf792 100644
--- a/third_party/WebKit/public/web/WebElementCollection.h
+++ b/third_party/WebKit/public/web/WebElementCollection.h
@@ -32,7 +32,7 @@
 #ifndef WebElementCollection_h
 #define WebElementCollection_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace WebCore { class HTMLCollection; }
 #if BLINK_IMPLEMENTATION
diff --git a/third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h b/third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h
index c5cf380..ddae7d0 100644
--- a/third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h
+++ b/third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h
@@ -31,9 +31,9 @@
 #ifndef WebEmbeddedWorkerStartData_h
 #define WebEmbeddedWorkerStartData_h
 
-#include "WebContentSecurityPolicy.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
+#include "public/web/WebContentSecurityPolicy.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebExternalPopupMenuClient.h b/third_party/WebKit/public/web/WebExternalPopupMenuClient.h
index f9e5891..bf98c38 100644
--- a/third_party/WebKit/public/web/WebExternalPopupMenuClient.h
+++ b/third_party/WebKit/public/web/WebExternalPopupMenuClient.h
@@ -31,7 +31,7 @@
 #ifndef WebExternalPopupMenuClient_h
 #define WebExternalPopupMenuClient_h
 
-#include "../platform/WebVector.h"
+#include "public/platform/WebVector.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFileChooserCompletion.h b/third_party/WebKit/public/web/WebFileChooserCompletion.h
index 19c0f26..1923daf 100644
--- a/third_party/WebKit/public/web/WebFileChooserCompletion.h
+++ b/third_party/WebKit/public/web/WebFileChooserCompletion.h
@@ -31,7 +31,7 @@
 #ifndef WebFileChooserCompletion_h
 #define WebFileChooserCompletion_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFileChooserParams.h b/third_party/WebKit/public/web/WebFileChooserParams.h
index 2f8f40c..9fd716d 100644
--- a/third_party/WebKit/public/web/WebFileChooserParams.h
+++ b/third_party/WebKit/public/web/WebFileChooserParams.h
@@ -31,9 +31,9 @@
 #ifndef WebFileChooserParams_h
 #define WebFileChooserParams_h
 
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
-#include "WebFileChooserCompletion.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebFileChooserCompletion.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFindOptions.h b/third_party/WebKit/public/web/WebFindOptions.h
index 3c32007..1046aed 100644
--- a/third_party/WebKit/public/web/WebFindOptions.h
+++ b/third_party/WebKit/public/web/WebFindOptions.h
@@ -31,7 +31,7 @@
 #ifndef WebFindOptions_h
 #define WebFindOptions_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFont.h b/third_party/WebKit/public/web/WebFont.h
index 523cee4..8b797ea 100644
--- a/third_party/WebKit/public/web/WebFont.h
+++ b/third_party/WebKit/public/web/WebFont.h
@@ -31,9 +31,9 @@
 #ifndef WebFont_h
 #define WebFont_h
 
-#include "../platform/WebCanvas.h"
-#include "../platform/WebColor.h"
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCanvas.h"
+#include "public/platform/WebColor.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFontDescription.h b/third_party/WebKit/public/web/WebFontDescription.h
index b7b29ba..b474d9e 100644
--- a/third_party/WebKit/public/web/WebFontDescription.h
+++ b/third_party/WebKit/public/web/WebFontDescription.h
@@ -31,7 +31,7 @@
 #ifndef WebFontDescription_h
 #define WebFontDescription_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class FontDescription; }
diff --git a/third_party/WebKit/public/web/WebFormControlElement.h b/third_party/WebKit/public/web/WebFormControlElement.h
index bb5733d..0810682 100644
--- a/third_party/WebKit/public/web/WebFormControlElement.h
+++ b/third_party/WebKit/public/web/WebFormControlElement.h
@@ -31,9 +31,9 @@
 #ifndef WebFormControlElement_h
 #define WebFormControlElement_h
 
-#include "../platform/WebString.h"
-#include "WebElement.h"
-#include "WebFormElement.h"
+#include "public/platform/WebString.h"
+#include "public/web/WebElement.h"
+#include "public/web/WebFormElement.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class HTMLFormControlElement; }
diff --git a/third_party/WebKit/public/web/WebFormElement.h b/third_party/WebKit/public/web/WebFormElement.h
index 0d01205..238744b 100644
--- a/third_party/WebKit/public/web/WebFormElement.h
+++ b/third_party/WebKit/public/web/WebFormElement.h
@@ -31,8 +31,8 @@
 #ifndef WebFormElement_h
 #define WebFormElement_h
 
-#include "../platform/WebVector.h"
-#include "WebElement.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebElement.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class HTMLFormElement; }
diff --git a/third_party/WebKit/public/web/WebFrame.h b/third_party/WebKit/public/web/WebFrame.h
index 1ff4e9d..c61b31c 100644
--- a/third_party/WebKit/public/web/WebFrame.h
+++ b/third_party/WebKit/public/web/WebFrame.h
@@ -31,14 +31,14 @@
 #ifndef WebFrame_h
 #define WebFrame_h
 
-#include "WebIconURL.h"
-#include "WebNode.h"
-#include "WebURLLoaderOptions.h"
 #include "public/platform/WebCanvas.h"
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebReferrerPolicy.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
+#include "public/web/WebIconURL.h"
+#include "public/web/WebNode.h"
+#include "public/web/WebURLLoaderOptions.h"
 
 struct NPObject;
 
diff --git a/third_party/WebKit/public/web/WebFrameClient.h b/third_party/WebKit/public/web/WebFrameClient.h
index ac7d470..49663cc 100644
--- a/third_party/WebKit/public/web/WebFrameClient.h
+++ b/third_party/WebKit/public/web/WebFrameClient.h
@@ -31,13 +31,6 @@
 #ifndef WebFrameClient_h
 #define WebFrameClient_h
 
-#include "WebDOMMessageEvent.h"
-#include "WebDataSource.h"
-#include "WebIconURL.h"
-#include "WebNavigationPolicy.h"
-#include "WebNavigationType.h"
-#include "WebSecurityOrigin.h"
-#include "WebTextDirection.h"
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebFileSystem.h"
 #include "public/platform/WebFileSystemType.h"
@@ -45,6 +38,13 @@
 #include "public/platform/WebStorageQuotaType.h"
 #include "public/platform/WebURLError.h"
 #include "public/platform/WebURLRequest.h"
+#include "public/web/WebDOMMessageEvent.h"
+#include "public/web/WebDataSource.h"
+#include "public/web/WebIconURL.h"
+#include "public/web/WebNavigationPolicy.h"
+#include "public/web/WebNavigationType.h"
+#include "public/web/WebSecurityOrigin.h"
+#include "public/web/WebTextDirection.h"
 #include <v8.h>
 
 namespace blink {
diff --git a/third_party/WebKit/public/web/WebGeolocationController.h b/third_party/WebKit/public/web/WebGeolocationController.h
index 4a4df54..466da97 100644
--- a/third_party/WebKit/public/web/WebGeolocationController.h
+++ b/third_party/WebKit/public/web/WebGeolocationController.h
@@ -26,8 +26,8 @@
 #ifndef WebGeolocationController_h
 #define WebGeolocationController_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebNonCopyable.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebNonCopyable.h"
 
 namespace WebCore { class GeolocationController; }
 
diff --git a/third_party/WebKit/public/web/WebGeolocationError.h b/third_party/WebKit/public/web/WebGeolocationError.h
index 949b3cc..75bfd1a 100644
--- a/third_party/WebKit/public/web/WebGeolocationError.h
+++ b/third_party/WebKit/public/web/WebGeolocationError.h
@@ -26,8 +26,8 @@
 #ifndef WebGeolocationError_h
 #define WebGeolocationError_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 
 #if BLINK_IMPLEMENTATION
 #include "wtf/PassRefPtr.h"
diff --git a/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h b/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h
index 5236f6d..6f00749 100644
--- a/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h
+++ b/third_party/WebKit/public/web/WebGeolocationPermissionRequest.h
@@ -26,8 +26,8 @@
 #ifndef WebGeolocationPermissionRequest_h
 #define WebGeolocationPermissionRequest_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 
 namespace WebCore {
 class Geolocation;
diff --git a/third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h b/third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h
index eca31d6..02a540c 100644
--- a/third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h
+++ b/third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h
@@ -26,8 +26,8 @@
 #ifndef WebGeolocationPermissionRequestManager_h
 #define WebGeolocationPermissionRequestManager_h
 
-#include "../platform/WebNonCopyable.h"
-#include "../platform/WebPrivateOwnPtr.h"
+#include "public/platform/WebNonCopyable.h"
+#include "public/platform/WebPrivateOwnPtr.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebGeolocationPosition.h b/third_party/WebKit/public/web/WebGeolocationPosition.h
index 84d1363..801a1b9 100644
--- a/third_party/WebKit/public/web/WebGeolocationPosition.h
+++ b/third_party/WebKit/public/web/WebGeolocationPosition.h
@@ -26,8 +26,8 @@
 #ifndef WebGeolocationPosition_h
 #define WebGeolocationPosition_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 
 #if BLINK_IMPLEMENTATION
 #include "wtf/PassRefPtr.h"
diff --git a/third_party/WebKit/public/web/WebGlyphCache.h b/third_party/WebKit/public/web/WebGlyphCache.h
index 0487882..390ed4d 100644
--- a/third_party/WebKit/public/web/WebGlyphCache.h
+++ b/third_party/WebKit/public/web/WebGlyphCache.h
@@ -31,7 +31,7 @@
 #ifndef WebGlyphCache_h
 #define WebGlyphCache_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebHelperPlugin.h b/third_party/WebKit/public/web/WebHelperPlugin.h
index 084bf15..b666d01 100644
--- a/third_party/WebKit/public/web/WebHelperPlugin.h
+++ b/third_party/WebKit/public/web/WebHelperPlugin.h
@@ -31,7 +31,7 @@
 #ifndef WebHelperPlugin_h
 #define WebHelperPlugin_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebHistoryItem.h b/third_party/WebKit/public/web/WebHistoryItem.h
index b228855..0fa268f 100644
--- a/third_party/WebKit/public/web/WebHistoryItem.h
+++ b/third_party/WebKit/public/web/WebHistoryItem.h
@@ -31,9 +31,9 @@
 #ifndef WebHistoryItem_h
 #define WebHistoryItem_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebReferrerPolicy.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebReferrerPolicy.h"
 
 namespace WebCore { class HistoryItem; }
 
diff --git a/third_party/WebKit/public/web/WebHitTestResult.h b/third_party/WebKit/public/web/WebHitTestResult.h
index a48f3cd..ac12cf8 100644
--- a/third_party/WebKit/public/web/WebHitTestResult.h
+++ b/third_party/WebKit/public/web/WebHitTestResult.h
@@ -26,7 +26,7 @@
 #ifndef WebHitTestResult_h
 #define WebHitTestResult_h
 
-#include "../platform/WebPrivateOwnPtr.h"
+#include "public/platform/WebPrivateOwnPtr.h"
 
 namespace WebCore {
 class HitTestResult;
diff --git a/third_party/WebKit/public/web/WebImageCache.h b/third_party/WebKit/public/web/WebImageCache.h
index 8dcdd4e..76e6f20 100644
--- a/third_party/WebKit/public/web/WebImageCache.h
+++ b/third_party/WebKit/public/web/WebImageCache.h
@@ -31,7 +31,7 @@
 #ifndef WebImageCache_h
 #define WebImageCache_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebImageDecoder.h b/third_party/WebKit/public/web/WebImageDecoder.h
index 724ba85..b87aece 100644
--- a/third_party/WebKit/public/web/WebImageDecoder.h
+++ b/third_party/WebKit/public/web/WebImageDecoder.h
@@ -31,9 +31,9 @@
 #ifndef WebImageDecoder_h
 #define WebImageDecoder_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebImage.h"
-#include "../platform/WebNonCopyable.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebImage.h"
+#include "public/platform/WebNonCopyable.h"
 
 namespace WebCore { class ImageDecoder; }
 
diff --git a/third_party/WebKit/public/web/WebInputElement.h b/third_party/WebKit/public/web/WebInputElement.h
index e425093..6936913 100644
--- a/third_party/WebKit/public/web/WebInputElement.h
+++ b/third_party/WebKit/public/web/WebInputElement.h
@@ -31,7 +31,7 @@
 #ifndef WebInputElement_h
 #define WebInputElement_h
 
-#include "WebFormControlElement.h"
+#include "public/web/WebFormControlElement.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class HTMLInputElement; }
diff --git a/third_party/WebKit/public/web/WebInputEvent.h b/third_party/WebKit/public/web/WebInputEvent.h
index f9fc765..79068d3 100644
--- a/third_party/WebKit/public/web/WebInputEvent.h
+++ b/third_party/WebKit/public/web/WebInputEvent.h
@@ -31,9 +31,9 @@
 #ifndef WebInputEvent_h
 #define WebInputEvent_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebRect.h"
-#include "WebTouchPoint.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebRect.h"
+#include "public/web/WebTouchPoint.h"
 
 #include <string.h>
 
diff --git a/third_party/WebKit/public/web/WebKit.h b/third_party/WebKit/public/web/WebKit.h
index 6b4382f..6095b4c 100644
--- a/third_party/WebKit/public/web/WebKit.h
+++ b/third_party/WebKit/public/web/WebKit.h
@@ -31,7 +31,7 @@
 #ifndef WebKit_h
 #define WebKit_h
 
-#include "../platform/Platform.h"
+#include "public/platform/Platform.h"
 
 namespace v8 {
 class Isolate;
diff --git a/third_party/WebKit/public/web/WebLabelElement.h b/third_party/WebKit/public/web/WebLabelElement.h
index f1ed851..0bf0995 100644
--- a/third_party/WebKit/public/web/WebLabelElement.h
+++ b/third_party/WebKit/public/web/WebLabelElement.h
@@ -31,7 +31,7 @@
 #ifndef WebLabelElement_h
 #define WebLabelElement_h
 
-#include "WebElement.h"
+#include "public/web/WebElement.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class HTMLLabelElement; }
diff --git a/third_party/WebKit/public/web/WebMIDIClientMock.h b/third_party/WebKit/public/web/WebMIDIClientMock.h
index 95ba401..75699f8 100644
--- a/third_party/WebKit/public/web/WebMIDIClientMock.h
+++ b/third_party/WebKit/public/web/WebMIDIClientMock.h
@@ -31,9 +31,9 @@
 #ifndef WebMIDIClientMock_h
 #define WebMIDIClientMock_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivateOwnPtr.h"
-#include "WebMIDIClient.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivateOwnPtr.h"
+#include "public/web/WebMIDIClient.h"
 
 namespace WebCore {
 class MIDIClientMock;
diff --git a/third_party/WebKit/public/web/WebMIDIPermissionRequest.h b/third_party/WebKit/public/web/WebMIDIPermissionRequest.h
index a9f808d..90b63c2 100644
--- a/third_party/WebKit/public/web/WebMIDIPermissionRequest.h
+++ b/third_party/WebKit/public/web/WebMIDIPermissionRequest.h
@@ -31,8 +31,8 @@
 #ifndef WebMIDIPermissionRequest_h
 #define WebMIDIPermissionRequest_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 
 namespace WebCore {
 class MIDIAccess;
diff --git a/third_party/WebKit/public/web/WebMediaDevicesRequest.h b/third_party/WebKit/public/web/WebMediaDevicesRequest.h
index fd32fe2..22aa5a3 100644
--- a/third_party/WebKit/public/web/WebMediaDevicesRequest.h
+++ b/third_party/WebKit/public/web/WebMediaDevicesRequest.h
@@ -26,10 +26,10 @@
 #ifndef WebMediaDevicesRequest_h
 #define WebMediaDevicesRequest_h
 
-#include "WebSecurityOrigin.h"
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebPrivatePtr.h"
 #include "public/platform/WebString.h"
+#include "public/web/WebSecurityOrigin.h"
 
 namespace WebCore {
 class MediaDevicesRequest;
diff --git a/third_party/WebKit/public/web/WebMediaStreamRegistry.h b/third_party/WebKit/public/web/WebMediaStreamRegistry.h
index 3c17812..fce441f 100644
--- a/third_party/WebKit/public/web/WebMediaStreamRegistry.h
+++ b/third_party/WebKit/public/web/WebMediaStreamRegistry.h
@@ -31,7 +31,7 @@
 #ifndef WebMediaStreamRegistry_h
 #define WebMediaStreamRegistry_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebMemoryUsageInfo.h b/third_party/WebKit/public/web/WebMemoryUsageInfo.h
index 9cfcfea..a2b7fe4 100644
--- a/third_party/WebKit/public/web/WebMemoryUsageInfo.h
+++ b/third_party/WebKit/public/web/WebMemoryUsageInfo.h
@@ -26,7 +26,7 @@
 #ifndef WebMemoryUsageInfo_h
 #define WebMemoryUsageInfo_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebMenuItemInfo.h b/third_party/WebKit/public/web/WebMenuItemInfo.h
index 2b08f42..472e9f3 100644
--- a/third_party/WebKit/public/web/WebMenuItemInfo.h
+++ b/third_party/WebKit/public/web/WebMenuItemInfo.h
@@ -31,10 +31,10 @@
 #ifndef WebMenuItemInfo_h
 #define WebMenuItemInfo_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
-#include "WebTextDirection.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebTextDirection.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebNetworkStateNotifier.h b/third_party/WebKit/public/web/WebNetworkStateNotifier.h
index 5b2ec92..276b46f 100644
--- a/third_party/WebKit/public/web/WebNetworkStateNotifier.h
+++ b/third_party/WebKit/public/web/WebNetworkStateNotifier.h
@@ -31,7 +31,7 @@
 #ifndef WebNetworkStateNotifier_h
 #define WebNetworkStateNotifier_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebNode.h b/third_party/WebKit/public/web/WebNode.h
index d82594c..1685d4e 100644
--- a/third_party/WebKit/public/web/WebNode.h
+++ b/third_party/WebKit/public/web/WebNode.h
@@ -31,10 +31,10 @@
 #ifndef WebNode_h
 #define WebNode_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebString.h"
-#include "WebExceptionCode.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebString.h"
+#include "public/web/WebExceptionCode.h"
 
 namespace WebCore { class Node; }
 
diff --git a/third_party/WebKit/public/web/WebNodeList.h b/third_party/WebKit/public/web/WebNodeList.h
index 80484366..c02e19b 100644
--- a/third_party/WebKit/public/web/WebNodeList.h
+++ b/third_party/WebKit/public/web/WebNodeList.h
@@ -31,7 +31,7 @@
 #ifndef WebNodeList_h
 #define WebNodeList_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace WebCore { class NodeList; }
 #if BLINK_IMPLEMENTATION
diff --git a/third_party/WebKit/public/web/WebNotification.h b/third_party/WebKit/public/web/WebNotification.h
index d37ab3c..3b4bdc7 100644
--- a/third_party/WebKit/public/web/WebNotification.h
+++ b/third_party/WebKit/public/web/WebNotification.h
@@ -31,10 +31,10 @@
 #ifndef WebNotification_h
 #define WebNotification_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebString.h"
-#include "WebTextDirection.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebString.h"
+#include "public/web/WebTextDirection.h"
 
 namespace WebCore { class Notification; }
 
diff --git a/third_party/WebKit/public/web/WebNotificationPresenter.h b/third_party/WebKit/public/web/WebNotificationPresenter.h
index 9277a16..1690442 100644
--- a/third_party/WebKit/public/web/WebNotificationPresenter.h
+++ b/third_party/WebKit/public/web/WebNotificationPresenter.h
@@ -31,7 +31,7 @@
 #ifndef WebNotificationPresenter_h
 #define WebNotificationPresenter_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebOptionElement.h b/third_party/WebKit/public/web/WebOptionElement.h
index 6c941e4..e21098b 100644
--- a/third_party/WebKit/public/web/WebOptionElement.h
+++ b/third_party/WebKit/public/web/WebOptionElement.h
@@ -31,8 +31,8 @@
 #ifndef WebOptionElement_h
 #define WebOptionElement_h
 
-#include "../platform/WebVector.h"
-#include "WebElement.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebElement.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class HTMLOptionElement; }
diff --git a/third_party/WebKit/public/web/WebPageOverlay.h b/third_party/WebKit/public/web/WebPageOverlay.h
index 397ddd5..3da90d8 100644
--- a/third_party/WebKit/public/web/WebPageOverlay.h
+++ b/third_party/WebKit/public/web/WebPageOverlay.h
@@ -29,8 +29,8 @@
 #ifndef WebPageOverlay_h
 #define WebPageOverlay_h
 
-#include "../platform/WebCanvas.h"
-#include "../platform/WebRect.h"
+#include "public/platform/WebCanvas.h"
+#include "public/platform/WebRect.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPagePopup.h b/third_party/WebKit/public/web/WebPagePopup.h
index f933096..9d34ed8 100644
--- a/third_party/WebKit/public/web/WebPagePopup.h
+++ b/third_party/WebKit/public/web/WebPagePopup.h
@@ -31,8 +31,8 @@
 #ifndef WebPagePopup_h
 #define WebPagePopup_h
 
-#include "../platform/WebCommon.h"
-#include "WebWidget.h"
+#include "public/platform/WebCommon.h"
+#include "public/web/WebWidget.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPageSerializer.h b/third_party/WebKit/public/web/WebPageSerializer.h
index 89a3a31..c0ea958 100644
--- a/third_party/WebKit/public/web/WebPageSerializer.h
+++ b/third_party/WebKit/public/web/WebPageSerializer.h
@@ -31,9 +31,9 @@
 #ifndef WebPageSerializer_h
 #define WebPageSerializer_h
 
-#include "../platform/WebCString.h"
-#include "../platform/WebCommon.h"
-#include "../platform/WebURL.h"
+#include "public/platform/WebCString.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebURL.h"
 
 namespace blink {
 class WebFrame;
diff --git a/third_party/WebKit/public/web/WebPasswordFormData.h b/third_party/WebKit/public/web/WebPasswordFormData.h
index 84dc700..316d16f 100644
--- a/third_party/WebKit/public/web/WebPasswordFormData.h
+++ b/third_party/WebKit/public/web/WebPasswordFormData.h
@@ -31,10 +31,10 @@
 #ifndef WebPasswordFormData_h
 #define WebPasswordFormData_h
 
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
-#include "../platform/WebVector.h"
-#include "WebFormElement.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebFormElement.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPerformance.h b/third_party/WebKit/public/web/WebPerformance.h
index 2d1be29..fc0afc5 100644
--- a/third_party/WebKit/public/web/WebPerformance.h
+++ b/third_party/WebKit/public/web/WebPerformance.h
@@ -31,9 +31,9 @@
 #ifndef WebPerformance_h
 #define WebPerformance_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "WebNavigationType.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/web/WebNavigationType.h"
 
 #if BLINK_IMPLEMENTATION
 #include "heap/Handle.h"
diff --git a/third_party/WebKit/public/web/WebPlugin.h b/third_party/WebKit/public/web/WebPlugin.h
index 9f046f2..b6d7322 100644
--- a/third_party/WebKit/public/web/WebPlugin.h
+++ b/third_party/WebKit/public/web/WebPlugin.h
@@ -31,12 +31,12 @@
 #ifndef WebPlugin_h
 #define WebPlugin_h
 
-#include "../platform/WebCanvas.h"
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
-#include "WebDragOperation.h"
-#include "WebDragStatus.h"
-#include "WebWidget.h"
+#include "public/platform/WebCanvas.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
+#include "public/web/WebDragOperation.h"
+#include "public/web/WebDragStatus.h"
+#include "public/web/WebWidget.h"
 
 struct NPObject;
 struct _NPP;
diff --git a/third_party/WebKit/public/web/WebPluginContainer.h b/third_party/WebKit/public/web/WebPluginContainer.h
index ddbc6d4..f1a2e77 100644
--- a/third_party/WebKit/public/web/WebPluginContainer.h
+++ b/third_party/WebKit/public/web/WebPluginContainer.h
@@ -31,7 +31,7 @@
 #ifndef WebPluginContainer_h
 #define WebPluginContainer_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 struct NPObject;
 
diff --git a/third_party/WebKit/public/web/WebPluginDocument.h b/third_party/WebKit/public/web/WebPluginDocument.h
index 86b3ba7..dcc4a70 100644
--- a/third_party/WebKit/public/web/WebPluginDocument.h
+++ b/third_party/WebKit/public/web/WebPluginDocument.h
@@ -31,7 +31,7 @@
 #ifndef WebPluginDocument_h
 #define WebPluginDocument_h
 
-#include "WebDocument.h"
+#include "public/web/WebDocument.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class PluginDocument; }
diff --git a/third_party/WebKit/public/web/WebPluginParams.h b/third_party/WebKit/public/web/WebPluginParams.h
index c76a879..16a1381 100644
--- a/third_party/WebKit/public/web/WebPluginParams.h
+++ b/third_party/WebKit/public/web/WebPluginParams.h
@@ -31,9 +31,9 @@
 #ifndef WebPluginParams_h
 #define WebPluginParams_h
 
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
-#include "../platform/WebVector.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
+#include "public/platform/WebVector.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPluginScrollbar.h b/third_party/WebKit/public/web/WebPluginScrollbar.h
index 7977b8a..c19c087 100644
--- a/third_party/WebKit/public/web/WebPluginScrollbar.h
+++ b/third_party/WebKit/public/web/WebPluginScrollbar.h
@@ -25,8 +25,8 @@
 #ifndef WebPluginScrollbar_h
 #define WebPluginScrollbar_h
 
-#include "../platform/WebCanvas.h"
-#include "../platform/WebScrollbar.h"
+#include "public/platform/WebCanvas.h"
+#include "public/platform/WebScrollbar.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPopupMenu.h b/third_party/WebKit/public/web/WebPopupMenu.h
index c7e84e0..c2da852 100644
--- a/third_party/WebKit/public/web/WebPopupMenu.h
+++ b/third_party/WebKit/public/web/WebPopupMenu.h
@@ -31,8 +31,8 @@
 #ifndef WebPopupMenu_h
 #define WebPopupMenu_h
 
-#include "../platform/WebCommon.h"
-#include "WebWidget.h"
+#include "public/platform/WebCommon.h"
+#include "public/web/WebWidget.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPopupMenuInfo.h b/third_party/WebKit/public/web/WebPopupMenuInfo.h
index 9b6eca4..0b86361 100644
--- a/third_party/WebKit/public/web/WebPopupMenuInfo.h
+++ b/third_party/WebKit/public/web/WebPopupMenuInfo.h
@@ -31,8 +31,8 @@
 #ifndef WebPopupMenuInfo_h
 #define WebPopupMenuInfo_h
 
-#include "../platform/WebVector.h"
-#include "WebMenuItemInfo.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebMenuItemInfo.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPrerendererClient.h b/third_party/WebKit/public/web/WebPrerendererClient.h
index a0e3eca..c90c398 100644
--- a/third_party/WebKit/public/web/WebPrerendererClient.h
+++ b/third_party/WebKit/public/web/WebPrerendererClient.h
@@ -32,7 +32,7 @@
 #ifndef WebPrerendererClient_h
 #define WebPrerendererClient_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPrintParams.h b/third_party/WebKit/public/web/WebPrintParams.h
index 1f49f0e..415eeaa 100644
--- a/third_party/WebKit/public/web/WebPrintParams.h
+++ b/third_party/WebKit/public/web/WebPrintParams.h
@@ -31,9 +31,9 @@
 #ifndef WebPrintParams_h
 #define WebPrintParams_h
 
-#include "../platform/WebRect.h"
-#include "../platform/WebSize.h"
-#include "WebPrintScalingOption.h"
+#include "public/platform/WebRect.h"
+#include "public/platform/WebSize.h"
+#include "public/web/WebPrintScalingOption.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebRange.h b/third_party/WebKit/public/web/WebRange.h
index 3eeeeb0..3bc5c07 100644
--- a/third_party/WebKit/public/web/WebRange.h
+++ b/third_party/WebKit/public/web/WebRange.h
@@ -31,8 +31,8 @@
 #ifndef WebRange_h
 #define WebRange_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebVector.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebVector.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class Range; }
diff --git a/third_party/WebKit/public/web/WebRuntimeFeatures.h b/third_party/WebKit/public/web/WebRuntimeFeatures.h
index eac7593..f0296ab 100644
--- a/third_party/WebKit/public/web/WebRuntimeFeatures.h
+++ b/third_party/WebKit/public/web/WebRuntimeFeatures.h
@@ -31,7 +31,7 @@
 #ifndef WebRuntimeFeatures_h
 #define WebRuntimeFeatures_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h b/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h
index 7245cd5..dd5e0f3 100644
--- a/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h
+++ b/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h
@@ -31,7 +31,7 @@
 #ifndef WebScopedMicrotaskSuppression_h
 #define WebScopedMicrotaskSuppression_h
 
-#include "../platform/WebPrivateOwnPtr.h"
+#include "public/platform/WebPrivateOwnPtr.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebScopedUserGesture.h b/third_party/WebKit/public/web/WebScopedUserGesture.h
index f829834..97a4822 100644
--- a/third_party/WebKit/public/web/WebScopedUserGesture.h
+++ b/third_party/WebKit/public/web/WebScopedUserGesture.h
@@ -31,7 +31,7 @@
 #ifndef WebScopedUserGesture_h
 #define WebScopedUserGesture_h
 
-#include "../platform/WebPrivateOwnPtr.h"
+#include "public/platform/WebPrivateOwnPtr.h"
 
 namespace WebCore {
 class UserGestureIndicator;
diff --git a/third_party/WebKit/public/web/WebScriptBindings.h b/third_party/WebKit/public/web/WebScriptBindings.h
index ef953b6..cd7d20b 100644
--- a/third_party/WebKit/public/web/WebScriptBindings.h
+++ b/third_party/WebKit/public/web/WebScriptBindings.h
@@ -31,7 +31,7 @@
 #ifndef WebScriptBindings_h
 #define WebScriptBindings_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace v8 {
 class Isolate;
diff --git a/third_party/WebKit/public/web/WebScriptController.h b/third_party/WebKit/public/web/WebScriptController.h
index 0f50754..4c46cfa 100644
--- a/third_party/WebKit/public/web/WebScriptController.h
+++ b/third_party/WebKit/public/web/WebScriptController.h
@@ -31,7 +31,7 @@
 #ifndef WebScriptController_h
 #define WebScriptController_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace v8 {
 class Extension;
diff --git a/third_party/WebKit/public/web/WebScriptSource.h b/third_party/WebKit/public/web/WebScriptSource.h
index 8d27096..de826e4 100644
--- a/third_party/WebKit/public/web/WebScriptSource.h
+++ b/third_party/WebKit/public/web/WebScriptSource.h
@@ -31,8 +31,8 @@
 #ifndef WebScriptSource_h
 #define WebScriptSource_h
 
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSearchableFormData.h b/third_party/WebKit/public/web/WebSearchableFormData.h
index 08a8591..2f61ca6 100644
--- a/third_party/WebKit/public/web/WebSearchableFormData.h
+++ b/third_party/WebKit/public/web/WebSearchableFormData.h
@@ -31,9 +31,9 @@
 #ifndef WebSearchableFormData_h
 #define WebSearchableFormData_h
 
-#include "../platform/WebString.h"
-#include "../platform/WebURL.h"
-#include "WebInputElement.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebURL.h"
+#include "public/web/WebInputElement.h"
 
 namespace blink {
 class WebFormElement;
diff --git a/third_party/WebKit/public/web/WebSecurityOrigin.h b/third_party/WebKit/public/web/WebSecurityOrigin.h
index b33f09d..9236772 100644
--- a/third_party/WebKit/public/web/WebSecurityOrigin.h
+++ b/third_party/WebKit/public/web/WebSecurityOrigin.h
@@ -31,7 +31,7 @@
 #ifndef WebSecurityOrigin_h
 #define WebSecurityOrigin_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class SecurityOrigin; }
diff --git a/third_party/WebKit/public/web/WebSecurityPolicy.h b/third_party/WebKit/public/web/WebSecurityPolicy.h
index dc834c1..f725912 100644
--- a/third_party/WebKit/public/web/WebSecurityPolicy.h
+++ b/third_party/WebKit/public/web/WebSecurityPolicy.h
@@ -31,8 +31,8 @@
 #ifndef WebSecurityPolicy_h
 #define WebSecurityPolicy_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebReferrerPolicy.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebReferrerPolicy.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSelectElement.h b/third_party/WebKit/public/web/WebSelectElement.h
index 9db36aa..b9b20d1 100644
--- a/third_party/WebKit/public/web/WebSelectElement.h
+++ b/third_party/WebKit/public/web/WebSelectElement.h
@@ -31,9 +31,9 @@
 #ifndef WebSelectElement_h
 #define WebSelectElement_h
 
-#include "../platform/WebVector.h"
-#include "WebFormControlElement.h"
-#include "WebOptionElement.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebFormControlElement.h"
+#include "public/web/WebOptionElement.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class HTMLSelectElement; }
diff --git a/third_party/WebKit/public/web/WebSelector.h b/third_party/WebKit/public/web/WebSelector.h
index 00c5e6c..15f040a 100644
--- a/third_party/WebKit/public/web/WebSelector.h
+++ b/third_party/WebKit/public/web/WebSelector.h
@@ -31,7 +31,7 @@
 #ifndef WebSelector_h
 #define WebSelector_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSerializedScriptValue.h b/third_party/WebKit/public/web/WebSerializedScriptValue.h
index b111ef0..281bc77 100644
--- a/third_party/WebKit/public/web/WebSerializedScriptValue.h
+++ b/third_party/WebKit/public/web/WebSerializedScriptValue.h
@@ -31,8 +31,8 @@
 #ifndef WebSerializedScriptValue_h
 #define WebSerializedScriptValue_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 
 namespace WebCore { class SerializedScriptValue; }
 
diff --git a/third_party/WebKit/public/web/WebServiceWorkerContextClient.h b/third_party/WebKit/public/web/WebServiceWorkerContextClient.h
index 540cb06..82754fc 100644
--- a/third_party/WebKit/public/web/WebServiceWorkerContextClient.h
+++ b/third_party/WebKit/public/web/WebServiceWorkerContextClient.h
@@ -31,7 +31,7 @@
 #ifndef WebServiceWorkerContextClient_h
 #define WebServiceWorkerContextClient_h
 
-#include "WebWorkerPermissionClientProxy.h"
+#include "public/web/WebWorkerPermissionClientProxy.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSettings.h b/third_party/WebKit/public/web/WebSettings.h
index 8c66ea4..b23cb97 100644
--- a/third_party/WebKit/public/web/WebSettings.h
+++ b/third_party/WebKit/public/web/WebSettings.h
@@ -31,8 +31,8 @@
 #ifndef WebSettings_h
 #define WebSettings_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebSize.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebSize.h"
 #include <unicode/uscript.h>
 
 namespace blink {
diff --git a/third_party/WebKit/public/web/WebSharedWorker.h b/third_party/WebKit/public/web/WebSharedWorker.h
index 27365ad..09efceb 100644
--- a/third_party/WebKit/public/web/WebSharedWorker.h
+++ b/third_party/WebKit/public/web/WebSharedWorker.h
@@ -31,8 +31,8 @@
 #ifndef WebSharedWorker_h
 #define WebSharedWorker_h
 
-#include "../platform/WebCommon.h"
-#include "WebContentSecurityPolicy.h"
+#include "public/platform/WebCommon.h"
+#include "public/web/WebContentSecurityPolicy.h"
 
 namespace WebCore {
 class ScriptExecutionContext;
diff --git a/third_party/WebKit/public/web/WebSharedWorkerClient.h b/third_party/WebKit/public/web/WebSharedWorkerClient.h
index 89362f3..f3e222b 100644
--- a/third_party/WebKit/public/web/WebSharedWorkerClient.h
+++ b/third_party/WebKit/public/web/WebSharedWorkerClient.h
@@ -31,7 +31,7 @@
 #ifndef WebSharedWorkerClient_h
 #define WebSharedWorkerClient_h
 
-#include "../platform/WebMessagePortChannel.h"
+#include "public/platform/WebMessagePortChannel.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSharedWorkerConnector.h b/third_party/WebKit/public/web/WebSharedWorkerConnector.h
index 0371737..5978de90 100644
--- a/third_party/WebKit/public/web/WebSharedWorkerConnector.h
+++ b/third_party/WebKit/public/web/WebSharedWorkerConnector.h
@@ -31,7 +31,7 @@
 #ifndef WebSharedWorkerConnector_h
 #define WebSharedWorkerConnector_h
 
-#include "WebContentSecurityPolicy.h"
+#include "public/web/WebContentSecurityPolicy.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h b/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h
index 45a4a69..a09c80f 100644
--- a/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h
+++ b/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h
@@ -31,7 +31,7 @@
 #ifndef WebSharedWorkerRepositoryClient_h
 #define WebSharedWorkerRepositoryClient_h
 
-#include "WebSharedWorkerConnector.h"
+#include "public/web/WebSharedWorkerConnector.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSocket.h b/third_party/WebKit/public/web/WebSocket.h
index 589a509..c5d6992 100644
--- a/third_party/WebKit/public/web/WebSocket.h
+++ b/third_party/WebKit/public/web/WebSocket.h
@@ -31,8 +31,8 @@
 #ifndef WebSocket_h
 #define WebSocket_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 
 namespace WebCore { class WebSocketChannel; }
 
diff --git a/third_party/WebKit/public/web/WebSocketClient.h b/third_party/WebKit/public/web/WebSocketClient.h
index 35896f8..a07f095 100644
--- a/third_party/WebKit/public/web/WebSocketClient.h
+++ b/third_party/WebKit/public/web/WebSocketClient.h
@@ -31,7 +31,7 @@
 #ifndef WebSocketClient_h
 #define WebSocketClient_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechGrammar.h b/third_party/WebKit/public/web/WebSpeechGrammar.h
index 226793a..618c040 100644
--- a/third_party/WebKit/public/web/WebSpeechGrammar.h
+++ b/third_party/WebKit/public/web/WebSpeechGrammar.h
@@ -26,9 +26,9 @@
 #ifndef WebSpeechGrammar_h
 #define WebSpeechGrammar_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebURL.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebURL.h"
 
 namespace WebCore {
 class SpeechGrammar;
diff --git a/third_party/WebKit/public/web/WebSpeechInputController.h b/third_party/WebKit/public/web/WebSpeechInputController.h
index 6556330..fdc0688 100644
--- a/third_party/WebKit/public/web/WebSpeechInputController.h
+++ b/third_party/WebKit/public/web/WebSpeechInputController.h
@@ -31,7 +31,7 @@
 #ifndef WebSpeechInputController_h
 #define WebSpeechInputController_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechInputListener.h b/third_party/WebKit/public/web/WebSpeechInputListener.h
index e352a19..6f97dc0 100644
--- a/third_party/WebKit/public/web/WebSpeechInputListener.h
+++ b/third_party/WebKit/public/web/WebSpeechInputListener.h
@@ -31,7 +31,7 @@
 #ifndef WebSpeechInputListener_h
 #define WebSpeechInputListener_h
 
-#include "WebSpeechInputResult.h"
+#include "public/web/WebSpeechInputResult.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechInputResult.h b/third_party/WebKit/public/web/WebSpeechInputResult.h
index 306674b..7aec879 100644
--- a/third_party/WebKit/public/web/WebSpeechInputResult.h
+++ b/third_party/WebKit/public/web/WebSpeechInputResult.h
@@ -26,10 +26,10 @@
 #ifndef WebSpeechInputResult_h
 #define WebSpeechInputResult_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
 
 namespace WebCore {
 class SpeechInputResult;
diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h b/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h
index 07d8aac..7e493e1 100644
--- a/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h
+++ b/third_party/WebKit/public/web/WebSpeechRecognitionHandle.h
@@ -26,8 +26,8 @@
 #ifndef WebSpeechRecognitionHandle_h
 #define WebSpeechRecognitionHandle_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 
 namespace WebCore {
 class SpeechRecognition;
diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionParams.h b/third_party/WebKit/public/web/WebSpeechRecognitionParams.h
index fd06810..f28ffde 100644
--- a/third_party/WebKit/public/web/WebSpeechRecognitionParams.h
+++ b/third_party/WebKit/public/web/WebSpeechRecognitionParams.h
@@ -26,10 +26,10 @@
 #ifndef WebSpeechRecognitionParams_h
 #define WebSpeechRecognitionParams_h
 
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
-#include "WebSecurityOrigin.h"
-#include "WebSpeechGrammar.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebSecurityOrigin.h"
+#include "public/web/WebSpeechGrammar.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionResult.h b/third_party/WebKit/public/web/WebSpeechRecognitionResult.h
index d9428c6..43b7150 100644
--- a/third_party/WebKit/public/web/WebSpeechRecognitionResult.h
+++ b/third_party/WebKit/public/web/WebSpeechRecognitionResult.h
@@ -26,10 +26,10 @@
 #ifndef WebSpeechRecognitionResult_h
 #define WebSpeechRecognitionResult_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebPrivatePtr.h"
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
 
 namespace WebCore {
 class SpeechRecognitionResult;
diff --git a/third_party/WebKit/public/web/WebSpeechRecognizer.h b/third_party/WebKit/public/web/WebSpeechRecognizer.h
index 91ec057..a3291ca 100644
--- a/third_party/WebKit/public/web/WebSpeechRecognizer.h
+++ b/third_party/WebKit/public/web/WebSpeechRecognizer.h
@@ -26,8 +26,8 @@
 #ifndef WebSpeechRecognizer_h
 #define WebSpeechRecognizer_h
 
-#include "../platform/WebCommon.h"
-#include "WebSpeechRecognitionHandle.h"
+#include "public/platform/WebCommon.h"
+#include "public/web/WebSpeechRecognitionHandle.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechRecognizerClient.h b/third_party/WebKit/public/web/WebSpeechRecognizerClient.h
index 185509f..7aceee9 100644
--- a/third_party/WebKit/public/web/WebSpeechRecognizerClient.h
+++ b/third_party/WebKit/public/web/WebSpeechRecognizerClient.h
@@ -26,7 +26,7 @@
 #ifndef WebSpeechRecognizerClient_h
 #define WebSpeechRecognizerClient_h
 
-#include "../platform/WebVector.h"
+#include "public/platform/WebVector.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpellCheckClient.h b/third_party/WebKit/public/web/WebSpellCheckClient.h
index ec4823a..2074320 100644
--- a/third_party/WebKit/public/web/WebSpellCheckClient.h
+++ b/third_party/WebKit/public/web/WebSpellCheckClient.h
@@ -31,9 +31,9 @@
 #ifndef WebSpellCheckClient_h
 #define WebSpellCheckClient_h
 
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
-#include "WebTextCheckingType.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebTextCheckingType.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebStorageEventDispatcher.h b/third_party/WebKit/public/web/WebStorageEventDispatcher.h
index 20c6568..a170498 100644
--- a/third_party/WebKit/public/web/WebStorageEventDispatcher.h
+++ b/third_party/WebKit/public/web/WebStorageEventDispatcher.h
@@ -31,7 +31,7 @@
 #ifndef WebStorageEventDispatcher_h
 #define WebStorageEventDispatcher_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSurroundingText.h b/third_party/WebKit/public/web/WebSurroundingText.h
index aa6e268..44a12af 100644
--- a/third_party/WebKit/public/web/WebSurroundingText.h
+++ b/third_party/WebKit/public/web/WebSurroundingText.h
@@ -25,10 +25,10 @@
 #ifndef WebSurroundingText_h
 #define WebSurroundingText_h
 
-#include "../platform/WebPrivateOwnPtr.h"
-#include "../platform/WebString.h"
-#include "WebNode.h"
-#include "WebRange.h"
+#include "public/platform/WebPrivateOwnPtr.h"
+#include "public/platform/WebString.h"
+#include "public/web/WebNode.h"
+#include "public/web/WebRange.h"
 
 namespace WebCore {
 class SurroundingText;
diff --git a/third_party/WebKit/public/web/WebTestingSupport.h b/third_party/WebKit/public/web/WebTestingSupport.h
index 5d3ace8..2815fea 100644
--- a/third_party/WebKit/public/web/WebTestingSupport.h
+++ b/third_party/WebKit/public/web/WebTestingSupport.h
@@ -26,7 +26,7 @@
 #ifndef WebTestingSupport_h
 #define WebTestingSupport_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebTextAreaElement.h b/third_party/WebKit/public/web/WebTextAreaElement.h
index 59f794c..db088f7 100644
--- a/third_party/WebKit/public/web/WebTextAreaElement.h
+++ b/third_party/WebKit/public/web/WebTextAreaElement.h
@@ -31,7 +31,7 @@
 #ifndef WebTextAreaElement_h
 #define WebTextAreaElement_h
 
-#include "WebFormControlElement.h"
+#include "public/web/WebFormControlElement.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class HTMLTextAreaElement; }
diff --git a/third_party/WebKit/public/web/WebTextCheckingCompletion.h b/third_party/WebKit/public/web/WebTextCheckingCompletion.h
index a639954..476176f 100644
--- a/third_party/WebKit/public/web/WebTextCheckingCompletion.h
+++ b/third_party/WebKit/public/web/WebTextCheckingCompletion.h
@@ -31,7 +31,7 @@
 #ifndef WebTextCheckingCompletion_h
 #define WebTextCheckingCompletion_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebTextCheckingResult.h b/third_party/WebKit/public/web/WebTextCheckingResult.h
index 088ab74..7621b1b 100644
--- a/third_party/WebKit/public/web/WebTextCheckingResult.h
+++ b/third_party/WebKit/public/web/WebTextCheckingResult.h
@@ -31,9 +31,9 @@
 #ifndef WebTextCheckingResult_h
 #define WebTextCheckingResult_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebString.h"
-#include "WebTextDecorationType.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebString.h"
+#include "public/web/WebTextDecorationType.h"
 
 namespace WebCore {
 struct TextCheckingResult;
diff --git a/third_party/WebKit/public/web/WebTextInputInfo.h b/third_party/WebKit/public/web/WebTextInputInfo.h
index dc3ff40..2207136 100644
--- a/third_party/WebKit/public/web/WebTextInputInfo.h
+++ b/third_party/WebKit/public/web/WebTextInputInfo.h
@@ -26,8 +26,8 @@
 #ifndef WebTextInputInfo_h
 #define WebTextInputInfo_h
 
-#include "../platform/WebString.h"
-#include "WebTextInputType.h"
+#include "public/platform/WebString.h"
+#include "public/web/WebTextInputType.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebTextRun.h b/third_party/WebKit/public/web/WebTextRun.h
index 64504ef..75a2847 100644
--- a/third_party/WebKit/public/web/WebTextRun.h
+++ b/third_party/WebKit/public/web/WebTextRun.h
@@ -31,7 +31,7 @@
 #ifndef WebTextRun_h
 #define WebTextRun_h
 
-#include "../platform/WebString.h"
+#include "public/platform/WebString.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class TextRun; }
diff --git a/third_party/WebKit/public/web/WebTouchPoint.h b/third_party/WebKit/public/web/WebTouchPoint.h
index fc0231a..55fffcb 100644
--- a/third_party/WebKit/public/web/WebTouchPoint.h
+++ b/third_party/WebKit/public/web/WebTouchPoint.h
@@ -31,8 +31,8 @@
 #ifndef WebTouchPoint_h
 #define WebTouchPoint_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebFloatPoint.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebFloatPoint.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebUserGestureIndicator.h b/third_party/WebKit/public/web/WebUserGestureIndicator.h
index b7c7f3c..30208a6 100644
--- a/third_party/WebKit/public/web/WebUserGestureIndicator.h
+++ b/third_party/WebKit/public/web/WebUserGestureIndicator.h
@@ -31,7 +31,7 @@
 #ifndef WebUserGestureIndicator_h
 #define WebUserGestureIndicator_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebUserGestureToken.h b/third_party/WebKit/public/web/WebUserGestureToken.h
index 4251dcd..f4e7789 100644
--- a/third_party/WebKit/public/web/WebUserGestureToken.h
+++ b/third_party/WebKit/public/web/WebUserGestureToken.h
@@ -31,7 +31,7 @@
 #ifndef WebUserGestureToken_h
 #define WebUserGestureToken_h
 
-#include "../platform/WebPrivatePtr.h"
+#include "public/platform/WebPrivatePtr.h"
 
 namespace WebCore {
 class UserGestureToken;
diff --git a/third_party/WebKit/public/web/WebUserMediaRequest.h b/third_party/WebKit/public/web/WebUserMediaRequest.h
index 50f1745..60c239f 100644
--- a/third_party/WebKit/public/web/WebUserMediaRequest.h
+++ b/third_party/WebKit/public/web/WebUserMediaRequest.h
@@ -31,10 +31,10 @@
 #ifndef WebUserMediaRequest_h
 #define WebUserMediaRequest_h
 
-#include "WebSecurityOrigin.h"
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebPrivatePtr.h"
 #include "public/platform/WebString.h"
+#include "public/web/WebSecurityOrigin.h"
 
 namespace WebCore {
 class UserMediaRequest;
diff --git a/third_party/WebKit/public/web/WebView.h b/third_party/WebKit/public/web/WebView.h
index 5d5495c..cbb9859 100644
--- a/third_party/WebKit/public/web/WebView.h
+++ b/third_party/WebKit/public/web/WebView.h
@@ -31,12 +31,12 @@
 #ifndef WebView_h
 #define WebView_h
 
-#include "../platform/WebColor.h"
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
-#include "WebDragOperation.h"
-#include "WebPageVisibilityState.h"
-#include "WebWidget.h"
+#include "public/platform/WebColor.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
+#include "public/web/WebDragOperation.h"
+#include "public/web/WebPageVisibilityState.h"
+#include "public/web/WebWidget.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebViewClient.h b/third_party/WebKit/public/web/WebViewClient.h
index d1c74b4..6bb4df3 100644
--- a/third_party/WebKit/public/web/WebViewClient.h
+++ b/third_party/WebKit/public/web/WebViewClient.h
@@ -31,20 +31,20 @@
 #ifndef WebViewClient_h
 #define WebViewClient_h
 
-#include "../platform/WebColor.h"
-#include "../platform/WebGraphicsContext3D.h"
-#include "../platform/WebString.h"
-#include "WebAXEnums.h"
-#include "WebContentDetectionResult.h"
-#include "WebDragOperation.h"
-#include "WebFileChooserCompletion.h"
-#include "WebFileChooserParams.h"
-#include "WebNavigatorContentUtilsClient.h"
-#include "WebPageVisibilityState.h"
-#include "WebPopupType.h"
-#include "WebTextAffinity.h"
-#include "WebTextDirection.h"
-#include "WebWidgetClient.h"
+#include "public/platform/WebColor.h"
+#include "public/platform/WebGraphicsContext3D.h"
+#include "public/platform/WebString.h"
+#include "public/web/WebAXEnums.h"
+#include "public/web/WebContentDetectionResult.h"
+#include "public/web/WebDragOperation.h"
+#include "public/web/WebFileChooserCompletion.h"
+#include "public/web/WebFileChooserParams.h"
+#include "public/web/WebNavigatorContentUtilsClient.h"
+#include "public/web/WebPageVisibilityState.h"
+#include "public/web/WebPopupType.h"
+#include "public/web/WebTextAffinity.h"
+#include "public/web/WebTextDirection.h"
+#include "public/web/WebWidgetClient.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebWidget.h b/third_party/WebKit/public/web/WebWidget.h
index 10ad291..7e26779d 100644
--- a/third_party/WebKit/public/web/WebWidget.h
+++ b/third_party/WebKit/public/web/WebWidget.h
@@ -31,13 +31,13 @@
 #ifndef WebWidget_h
 #define WebWidget_h
 
-#include "../platform/WebCanvas.h"
-#include "../platform/WebCommon.h"
-#include "../platform/WebRect.h"
-#include "../platform/WebSize.h"
-#include "WebCompositionUnderline.h"
-#include "WebTextDirection.h"
-#include "WebTextInputInfo.h"
+#include "public/platform/WebCanvas.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebRect.h"
+#include "public/platform/WebSize.h"
+#include "public/web/WebCompositionUnderline.h"
+#include "public/web/WebTextDirection.h"
+#include "public/web/WebTextInputInfo.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebWidgetClient.h b/third_party/WebKit/public/web/WebWidgetClient.h
index 4f6eb73..e11490a 100644
--- a/third_party/WebKit/public/web/WebWidgetClient.h
+++ b/third_party/WebKit/public/web/WebWidgetClient.h
@@ -31,11 +31,11 @@
 #ifndef WebWidgetClient_h
 #define WebWidgetClient_h
 
-#include "WebNavigationPolicy.h"
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebScreenInfo.h"
+#include "public/web/WebNavigationPolicy.h"
 #include "public/web/WebTouchAction.h"
 
 namespace blink {
diff --git a/third_party/WebKit/public/web/WebWindowFeatures.h b/third_party/WebKit/public/web/WebWindowFeatures.h
index 9e8581e..421767e 100644
--- a/third_party/WebKit/public/web/WebWindowFeatures.h
+++ b/third_party/WebKit/public/web/WebWindowFeatures.h
@@ -31,9 +31,9 @@
 #ifndef WebWindowFeatures_h
 #define WebWindowFeatures_h
 
-#include "../platform/WebCommon.h"
-#include "../platform/WebString.h"
-#include "../platform/WebVector.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
 
 #if BLINK_IMPLEMENTATION
 #include "core/page/WindowFeatures.h"
diff --git a/third_party/WebKit/public/web/WebWorkerInfo.h b/third_party/WebKit/public/web/WebWorkerInfo.h
index e5d62c2..71921bd 100644
--- a/third_party/WebKit/public/web/WebWorkerInfo.h
+++ b/third_party/WebKit/public/web/WebWorkerInfo.h
@@ -31,7 +31,7 @@
 #ifndef WebWorkerInfo_h
 #define WebWorkerInfo_h
 
-#include "../platform/WebCommon.h"
+#include "public/platform/WebCommon.h"
 
 namespace blink {