Revert of Rewrite platform headers in public/web/ to public/platform/... (https://codereview.chromium.org/189703002/)

Reason for revert:
Broke Windows, Mac, and ChromeOS build.


Original issue's description:
> 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
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=169597

TBR=abarth@chromium.org,jamesr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=350097

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

git-svn-id: svn://svn.chromium.org/blink/trunk@169600 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 3a15232..a22aecc 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebVector.h"
-#include "public/web/WebAXEnums.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../platform/WebVector.h"
+#include "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 9fbd4d66..82a09a3 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 "public/platform/WebCommon.h"
-#include "public/platform/WebFloatPoint.h"
-#include "public/platform/WebPoint.h"
-#include "public/platform/WebSize.h"
-#include "public/web/WebInputEvent.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebFloatPoint.h"
+#include "../platform/WebPoint.h"
+#include "../platform/WebSize.h"
+#include "WebInputEvent.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebArrayBufferView.h b/third_party/WebKit/public/web/WebArrayBufferView.h
index b436146..cc02d7e 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
+#include "../platform/WebCommon.h"
+#include "../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 1b9d7b2..a83120a 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 "public/platform/WebCommon.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebString.h"
+#include "../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 0b56c10..28557da 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebCachedURLRequest.h b/third_party/WebKit/public/web/WebCachedURLRequest.h
index 289dce6..c889171 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivateOwnPtr.h"
-#include "public/platform/WebString.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivateOwnPtr.h"
+#include "../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 8299796..2c2ce9c 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 "public/platform/WebColor.h"
-#include "public/platform/WebCommon.h"
+#include "../platform/WebColor.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebColorChooserClient.h b/third_party/WebKit/public/web/WebColorChooserClient.h
index cb6aaff..30ca541 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 "public/platform/WebColor.h"
-#include "public/platform/WebCommon.h"
+#include "../platform/WebColor.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebColorName.h b/third_party/WebKit/public/web/WebColorName.h
index 42c886e..53ef76a 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 "public/platform/WebColor.h"
-#include "public/platform/WebCommon.h"
+#include "../platform/WebColor.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebCompositionUnderline.h b/third_party/WebKit/public/web/WebCompositionUnderline.h
index 7565df7..2c58662 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 "public/platform/WebColor.h"
+#include "../platform/WebColor.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebConsoleMessage.h b/third_party/WebKit/public/web/WebConsoleMessage.h
index f6e385f..616e8eb 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 "public/platform/WebString.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebContentDetectionResult.h b/third_party/WebKit/public/web/WebContentDetectionResult.h
index b7b5d41..9d415be 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 "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
-#include "public/web/WebRange.h"
+#include "../platform/WebString.h"
+#include "../platform/WebURL.h"
+#include "WebRange.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebContextMenuData.h b/third_party/WebKit/public/web/WebContextMenuData.h
index 0eb7544..7e9931a 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 "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"
+#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"
 
 #define WEBCONTEXT_MEDIATYPEFILE_DEFINED
 
diff --git a/third_party/WebKit/public/web/WebCustomElement.h b/third_party/WebKit/public/web/WebCustomElement.h
index a782c31..a570831 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDOMActivityLogger.h b/third_party/WebKit/public/web/WebDOMActivityLogger.h
index 815e8fe..9664be5 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 "public/platform/WebCommon.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebString.h"
+#include "../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 76ee49a..e6f2f671 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 "public/web/WebDOMEvent.h"
-#include "public/web/WebSerializedScriptValue.h"
+#include "WebDOMEvent.h"
+#include "WebSerializedScriptValue.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDOMEvent.h b/third_party/WebKit/public/web/WebDOMEvent.h
index 18f6336..4be814f 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebString.h"
-#include "public/web/WebNode.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../platform/WebString.h"
+#include "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 e9ec5dc..7b247d1 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 "public/platform/WebCommon.h"
+#include "../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 566a5e2..5279cc0 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 "public/platform/WebCommon.h"
-#include "public/platform/WebFileSystem.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebFileSystem.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../platform/WebString.h"
+#include "../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 37919fd..92623f1 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 "public/platform/WebMessagePortChannel.h"
-#include "public/web/WebDOMEvent.h"
-#include "public/web/WebSerializedScriptValue.h"
+#include "../platform/WebMessagePortChannel.h"
+#include "WebDOMEvent.h"
+#include "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 efa0676..a46dfec 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 "public/web/WebDOMEvent.h"
+#include "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 2e441ef..830a368 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 "public/web/WebDOMEvent.h"
+#include "WebDOMEvent.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h b/third_party/WebKit/public/web/WebDOMResourceProgressEvent.h
index 0a2ce7c..9736e8f 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 "public/web/WebDOMProgressEvent.h"
+#include "WebDOMProgressEvent.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDataSource.h b/third_party/WebKit/public/web/WebDataSource.h
index 639c837..6437ab70 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 "public/platform/WebCommon.h"
-#include "public/web/WebNavigationType.h"
-#include "public/web/WebTextDirection.h"
+#include "../platform/WebCommon.h"
+#include "WebNavigationType.h"
+#include "WebTextDirection.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDatabase.h b/third_party/WebKit/public/web/WebDatabase.h
index ff34c13..14973c28 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 "public/platform/WebCommon.h"
-#include "public/web/WebSecurityOrigin.h"
+#include "../platform/WebCommon.h"
+#include "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 56e2013..38ab250e 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 "public/platform/WebString.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDateTimeChooserParams.h b/third_party/WebKit/public/web/WebDateTimeChooserParams.h
index 2a6d5aa..443db11 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 "public/platform/WebRect.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
-#include "public/web/WebDateTimeInputType.h"
-#include "public/web/WebDateTimeSuggestion.h"
+#include "../platform/WebRect.h"
+#include "../platform/WebString.h"
+#include "../platform/WebVector.h"
+#include "WebDateTimeInputType.h"
+#include "WebDateTimeSuggestion.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDevToolsAgent.h b/third_party/WebKit/public/web/WebDevToolsAgent.h
index 8e47253..73a8f82 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 "public/platform/WebCommon.h"
-#include "public/platform/WebVector.h"
+#include "../platform/WebCommon.h"
+#include "../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 17a0964..9d4a433 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 "public/platform/WebCString.h"
-#include "public/platform/WebCommon.h"
+#include "../platform/WebCString.h"
+#include "../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 7665e05..1f6547d 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebDocument.h b/third_party/WebKit/public/web/WebDocument.h
index 9bc8426..cf2e680 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 "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"
+#include "../platform/WebReferrerPolicy.h"
+#include "../platform/WebVector.h"
+#include "WebDraggableRegion.h"
+#include "WebExceptionCode.h"
+#include "WebNode.h"
+#include "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 25c5df8..8760865 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 "public/web/WebNode.h"
+#include "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 2599135..90636a5 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 "public/platform/WebCommon.h"
-#include "public/platform/WebRect.h"
-#include "public/platform/WebString.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebRect.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebElement.h b/third_party/WebKit/public/web/WebElement.h
index 7c9c901..3bfd310 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 "public/platform/WebImage.h"
-#include "public/web/WebNode.h"
+#include "../platform/WebImage.h"
+#include "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 eedf792..6c684c2 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 "public/platform/WebCommon.h"
+#include "../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 ddae7d0..c5cf380 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 bf98c38..f9e5891 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 "public/platform/WebVector.h"
+#include "../platform/WebVector.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFileChooserCompletion.h b/third_party/WebKit/public/web/WebFileChooserCompletion.h
index 1923daf..19c0f26 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 "public/platform/WebString.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFileChooserParams.h b/third_party/WebKit/public/web/WebFileChooserParams.h
index 9fd716d..2f8f40c 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 "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
-#include "public/web/WebFileChooserCompletion.h"
+#include "../platform/WebString.h"
+#include "../platform/WebVector.h"
+#include "WebFileChooserCompletion.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFindOptions.h b/third_party/WebKit/public/web/WebFindOptions.h
index 1046aed..3c32007 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 "public/platform/WebString.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFont.h b/third_party/WebKit/public/web/WebFont.h
index 8b797ea..523cee4 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 "public/platform/WebCanvas.h"
-#include "public/platform/WebColor.h"
-#include "public/platform/WebCommon.h"
+#include "../platform/WebCanvas.h"
+#include "../platform/WebColor.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebFontDescription.h b/third_party/WebKit/public/web/WebFontDescription.h
index b474d9e..b7b29ba 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 "public/platform/WebString.h"
+#include "../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 0810682..bb5733d 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 "public/platform/WebString.h"
-#include "public/web/WebElement.h"
-#include "public/web/WebFormElement.h"
+#include "../platform/WebString.h"
+#include "WebElement.h"
+#include "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 238744b..0d01205 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 "public/platform/WebVector.h"
-#include "public/web/WebElement.h"
+#include "../platform/WebVector.h"
+#include "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 c61b31c..1ff4e9d 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 49663cc..ac7d470 100644
--- a/third_party/WebKit/public/web/WebFrameClient.h
+++ b/third_party/WebKit/public/web/WebFrameClient.h
@@ -31,6 +31,13 @@
 #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"
@@ -38,13 +45,6 @@
 #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 466da97..4a4df54 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 "public/platform/WebCommon.h"
-#include "public/platform/WebNonCopyable.h"
+#include "../platform/WebCommon.h"
+#include "../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 75bfd1a..949b3cc 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
+#include "../platform/WebCommon.h"
+#include "../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 6f00749..5236f6d 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
+#include "../platform/WebCommon.h"
+#include "../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 02a540c..eca31d6 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 "public/platform/WebNonCopyable.h"
-#include "public/platform/WebPrivateOwnPtr.h"
+#include "../platform/WebNonCopyable.h"
+#include "../platform/WebPrivateOwnPtr.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebGeolocationPosition.h b/third_party/WebKit/public/web/WebGeolocationPosition.h
index 801a1b9..84d1363 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
+#include "../platform/WebCommon.h"
+#include "../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 390ed4d..0487882 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebHelperPlugin.h b/third_party/WebKit/public/web/WebHelperPlugin.h
index b666d01..084bf15 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebHistoryItem.h b/third_party/WebKit/public/web/WebHistoryItem.h
index 0fa268f..b228855 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebReferrerPolicy.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../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 ac12cf8..a48f3cd 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 "public/platform/WebPrivateOwnPtr.h"
+#include "../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 76e6f20..8dcdd4e 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebImageDecoder.h b/third_party/WebKit/public/web/WebImageDecoder.h
index b87aece..724ba85 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 "public/platform/WebCommon.h"
-#include "public/platform/WebImage.h"
-#include "public/platform/WebNonCopyable.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebImage.h"
+#include "../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 6936913..e425093 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 "public/web/WebFormControlElement.h"
+#include "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 79068d3..f9fc765 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 "public/platform/WebCommon.h"
-#include "public/platform/WebRect.h"
-#include "public/web/WebTouchPoint.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebRect.h"
+#include "WebTouchPoint.h"
 
 #include <string.h>
 
diff --git a/third_party/WebKit/public/web/WebKit.h b/third_party/WebKit/public/web/WebKit.h
index 6095b4c..6b4382f 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 "public/platform/Platform.h"
+#include "../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 0bf0995..f1ed851 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 "public/web/WebElement.h"
+#include "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 75699f8..95ba401 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivateOwnPtr.h"
-#include "public/web/WebMIDIClient.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivateOwnPtr.h"
+#include "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 90b63c2..a9f808d 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
+#include "../platform/WebCommon.h"
+#include "../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 22aa5a3..fd32fe2 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 fce441f..3c17812 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 "public/platform/WebString.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebMemoryUsageInfo.h b/third_party/WebKit/public/web/WebMemoryUsageInfo.h
index a2b7fe4..9cfcfea 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 "public/platform/WebString.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebMenuItemInfo.h b/third_party/WebKit/public/web/WebMenuItemInfo.h
index 472e9f3..2b08f42 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 "public/platform/WebCommon.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
-#include "public/web/WebTextDirection.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebString.h"
+#include "../platform/WebVector.h"
+#include "WebTextDirection.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebNetworkStateNotifier.h b/third_party/WebKit/public/web/WebNetworkStateNotifier.h
index 276b46f..5b2ec92 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebNode.h b/third_party/WebKit/public/web/WebNode.h
index 1685d4e..d82594c 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebString.h"
-#include "public/web/WebExceptionCode.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../platform/WebString.h"
+#include "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 c02e19b..80484366 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 "public/platform/WebCommon.h"
+#include "../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 3b4bdc7..d37ab3c 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebString.h"
-#include "public/web/WebTextDirection.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../platform/WebString.h"
+#include "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 1690442..9277a16 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 "public/platform/WebString.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebOptionElement.h b/third_party/WebKit/public/web/WebOptionElement.h
index e21098b..6c941e4 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 "public/platform/WebVector.h"
-#include "public/web/WebElement.h"
+#include "../platform/WebVector.h"
+#include "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 3da90d8..397ddd5 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 "public/platform/WebCanvas.h"
-#include "public/platform/WebRect.h"
+#include "../platform/WebCanvas.h"
+#include "../platform/WebRect.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPagePopup.h b/third_party/WebKit/public/web/WebPagePopup.h
index 9d34ed8..f933096 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 "public/platform/WebCommon.h"
-#include "public/web/WebWidget.h"
+#include "../platform/WebCommon.h"
+#include "WebWidget.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPageSerializer.h b/third_party/WebKit/public/web/WebPageSerializer.h
index c0ea958..89a3a31 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 "public/platform/WebCString.h"
-#include "public/platform/WebCommon.h"
-#include "public/platform/WebURL.h"
+#include "../platform/WebCString.h"
+#include "../platform/WebCommon.h"
+#include "../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 316d16f..84dc700 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 "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
-#include "public/platform/WebVector.h"
-#include "public/web/WebFormElement.h"
+#include "../platform/WebString.h"
+#include "../platform/WebURL.h"
+#include "../platform/WebVector.h"
+#include "WebFormElement.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPerformance.h b/third_party/WebKit/public/web/WebPerformance.h
index fc0afc5..2d1be29 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/web/WebNavigationType.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "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 b6d7322..9f046f2 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 "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"
+#include "../platform/WebCanvas.h"
+#include "../platform/WebString.h"
+#include "../platform/WebURL.h"
+#include "WebDragOperation.h"
+#include "WebDragStatus.h"
+#include "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 f1a2e77..ddbc6d4 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 struct NPObject;
 
diff --git a/third_party/WebKit/public/web/WebPluginDocument.h b/third_party/WebKit/public/web/WebPluginDocument.h
index dcc4a70..86b3ba7 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 "public/web/WebDocument.h"
+#include "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 16a1381..c76a879 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 "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
-#include "public/platform/WebVector.h"
+#include "../platform/WebString.h"
+#include "../platform/WebURL.h"
+#include "../platform/WebVector.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPluginScrollbar.h b/third_party/WebKit/public/web/WebPluginScrollbar.h
index c19c087..7977b8a 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 "public/platform/WebCanvas.h"
-#include "public/platform/WebScrollbar.h"
+#include "../platform/WebCanvas.h"
+#include "../platform/WebScrollbar.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPopupMenu.h b/third_party/WebKit/public/web/WebPopupMenu.h
index c2da852..c7e84e0 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 "public/platform/WebCommon.h"
-#include "public/web/WebWidget.h"
+#include "../platform/WebCommon.h"
+#include "WebWidget.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPopupMenuInfo.h b/third_party/WebKit/public/web/WebPopupMenuInfo.h
index 0b86361..9b6eca4 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 "public/platform/WebVector.h"
-#include "public/web/WebMenuItemInfo.h"
+#include "../platform/WebVector.h"
+#include "WebMenuItemInfo.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPrerendererClient.h b/third_party/WebKit/public/web/WebPrerendererClient.h
index c90c398..a0e3eca 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebPrintParams.h b/third_party/WebKit/public/web/WebPrintParams.h
index 415eeaa..1f49f0e 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 "public/platform/WebRect.h"
-#include "public/platform/WebSize.h"
-#include "public/web/WebPrintScalingOption.h"
+#include "../platform/WebRect.h"
+#include "../platform/WebSize.h"
+#include "WebPrintScalingOption.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebRange.h b/third_party/WebKit/public/web/WebRange.h
index 3bc5c07..3eeeeb0 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 "public/platform/WebCommon.h"
-#include "public/platform/WebVector.h"
+#include "../platform/WebCommon.h"
+#include "../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 f0296ab..eac7593 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h b/third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h
index dd5e0f3..7245cd5 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 "public/platform/WebPrivateOwnPtr.h"
+#include "../platform/WebPrivateOwnPtr.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebScopedUserGesture.h b/third_party/WebKit/public/web/WebScopedUserGesture.h
index 97a4822..f829834 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 "public/platform/WebPrivateOwnPtr.h"
+#include "../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 cd7d20b..ef953b6 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 "public/platform/WebCommon.h"
+#include "../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 4c46cfa..0f50754 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 "public/platform/WebCommon.h"
+#include "../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 de826e4..8d27096 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 "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
+#include "../platform/WebString.h"
+#include "../platform/WebURL.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSearchableFormData.h b/third_party/WebKit/public/web/WebSearchableFormData.h
index 2f61ca6..08a8591 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 "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
-#include "public/web/WebInputElement.h"
+#include "../platform/WebString.h"
+#include "../platform/WebURL.h"
+#include "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 9236772..b33f09d 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 "public/platform/WebCommon.h"
+#include "../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 f725912..dc834c1 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 "public/platform/WebCommon.h"
-#include "public/platform/WebReferrerPolicy.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebReferrerPolicy.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSelectElement.h b/third_party/WebKit/public/web/WebSelectElement.h
index b9b20d1..9db36aa 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 "public/platform/WebVector.h"
-#include "public/web/WebFormControlElement.h"
-#include "public/web/WebOptionElement.h"
+#include "../platform/WebVector.h"
+#include "WebFormControlElement.h"
+#include "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 15f040a..00c5e6c 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSerializedScriptValue.h b/third_party/WebKit/public/web/WebSerializedScriptValue.h
index 281bc77..b111ef0 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
+#include "../platform/WebCommon.h"
+#include "../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 82754fc..540cb06 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 "public/web/WebWorkerPermissionClientProxy.h"
+#include "WebWorkerPermissionClientProxy.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSettings.h b/third_party/WebKit/public/web/WebSettings.h
index b23cb97..8c66ea4 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 "public/platform/WebCommon.h"
-#include "public/platform/WebSize.h"
+#include "../platform/WebCommon.h"
+#include "../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 09efceb..27365ad 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 "public/platform/WebCommon.h"
-#include "public/web/WebContentSecurityPolicy.h"
+#include "../platform/WebCommon.h"
+#include "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 f3e222b..89362f3 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 "public/platform/WebMessagePortChannel.h"
+#include "../platform/WebMessagePortChannel.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSharedWorkerConnector.h b/third_party/WebKit/public/web/WebSharedWorkerConnector.h
index 5978de90..0371737 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 "public/web/WebContentSecurityPolicy.h"
+#include "WebContentSecurityPolicy.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h b/third_party/WebKit/public/web/WebSharedWorkerRepositoryClient.h
index a09c80f..45a4a69 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 "public/web/WebSharedWorkerConnector.h"
+#include "WebSharedWorkerConnector.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSocket.h b/third_party/WebKit/public/web/WebSocket.h
index c5d6992..589a509 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
+#include "../platform/WebCommon.h"
+#include "../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 a07f095..35896f8 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechGrammar.h b/third_party/WebKit/public/web/WebSpeechGrammar.h
index 618c040..226793a 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebURL.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../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 fdc0688..6556330 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechInputListener.h b/third_party/WebKit/public/web/WebSpeechInputListener.h
index 6f97dc0..e352a19 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 "public/web/WebSpeechInputResult.h"
+#include "WebSpeechInputResult.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechInputResult.h b/third_party/WebKit/public/web/WebSpeechInputResult.h
index 7aec879..306674b 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../platform/WebString.h"
+#include "../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 7e493e1..07d8aac 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
+#include "../platform/WebCommon.h"
+#include "../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 f28ffde..fd06810 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 "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
-#include "public/web/WebSecurityOrigin.h"
-#include "public/web/WebSpeechGrammar.h"
+#include "../platform/WebString.h"
+#include "../platform/WebVector.h"
+#include "WebSecurityOrigin.h"
+#include "WebSpeechGrammar.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechRecognitionResult.h b/third_party/WebKit/public/web/WebSpeechRecognitionResult.h
index 43b7150..d9428c6 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 "public/platform/WebCommon.h"
-#include "public/platform/WebPrivatePtr.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebPrivatePtr.h"
+#include "../platform/WebString.h"
+#include "../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 a3291ca..91ec057 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 "public/platform/WebCommon.h"
-#include "public/web/WebSpeechRecognitionHandle.h"
+#include "../platform/WebCommon.h"
+#include "WebSpeechRecognitionHandle.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpeechRecognizerClient.h b/third_party/WebKit/public/web/WebSpeechRecognizerClient.h
index 7aceee9..185509f 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 "public/platform/WebVector.h"
+#include "../platform/WebVector.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSpellCheckClient.h b/third_party/WebKit/public/web/WebSpellCheckClient.h
index 2074320..ec4823a 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 "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
-#include "public/web/WebTextCheckingType.h"
+#include "../platform/WebString.h"
+#include "../platform/WebVector.h"
+#include "WebTextCheckingType.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebStorageEventDispatcher.h b/third_party/WebKit/public/web/WebStorageEventDispatcher.h
index a170498..20c6568 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 "public/platform/WebString.h"
+#include "../platform/WebString.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebSurroundingText.h b/third_party/WebKit/public/web/WebSurroundingText.h
index 44a12af..aa6e268 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 "public/platform/WebPrivateOwnPtr.h"
-#include "public/platform/WebString.h"
-#include "public/web/WebNode.h"
-#include "public/web/WebRange.h"
+#include "../platform/WebPrivateOwnPtr.h"
+#include "../platform/WebString.h"
+#include "WebNode.h"
+#include "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 2815fea..5d3ace8 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebTextAreaElement.h b/third_party/WebKit/public/web/WebTextAreaElement.h
index db088f7..59f794c 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 "public/web/WebFormControlElement.h"
+#include "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 476176f..a639954 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebTextCheckingResult.h b/third_party/WebKit/public/web/WebTextCheckingResult.h
index 7621b1b..088ab74 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 "public/platform/WebCommon.h"
-#include "public/platform/WebString.h"
-#include "public/web/WebTextDecorationType.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebString.h"
+#include "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 2207136..dc3ff40 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 "public/platform/WebString.h"
-#include "public/web/WebTextInputType.h"
+#include "../platform/WebString.h"
+#include "WebTextInputType.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebTextRun.h b/third_party/WebKit/public/web/WebTextRun.h
index 75a2847..64504ef 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 "public/platform/WebString.h"
+#include "../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 55fffcb..fc0231a 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 "public/platform/WebCommon.h"
-#include "public/platform/WebFloatPoint.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebFloatPoint.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebUserGestureIndicator.h b/third_party/WebKit/public/web/WebUserGestureIndicator.h
index 30208a6..b7c7f3c 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebUserGestureToken.h b/third_party/WebKit/public/web/WebUserGestureToken.h
index f4e7789..4251dcd 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 "public/platform/WebPrivatePtr.h"
+#include "../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 60c239f..50f1745 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 cbb9859..5d5495c 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 "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"
+#include "../platform/WebColor.h"
+#include "../platform/WebString.h"
+#include "../platform/WebVector.h"
+#include "WebDragOperation.h"
+#include "WebPageVisibilityState.h"
+#include "WebWidget.h"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebViewClient.h b/third_party/WebKit/public/web/WebViewClient.h
index 6bb4df3..d1c74b4 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 "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"
+#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"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebWidget.h b/third_party/WebKit/public/web/WebWidget.h
index 7e26779d..10ad291 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 "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"
+#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"
 
 namespace blink {
 
diff --git a/third_party/WebKit/public/web/WebWidgetClient.h b/third_party/WebKit/public/web/WebWidgetClient.h
index e11490a..4f6eb73 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 421767e..9e8581e 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 "public/platform/WebCommon.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebVector.h"
+#include "../platform/WebCommon.h"
+#include "../platform/WebString.h"
+#include "../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 71921bd..e5d62c2 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 "public/platform/WebCommon.h"
+#include "../platform/WebCommon.h"
 
 namespace blink {