diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index cff7b1506a950218766f4a05140441c9628893d6..637a2ffa0b76559cda3972dadfa05d67da9cde01 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -24,9 +24,7 @@ DEFINES += \
 
 CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir()
 INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core \
-               $$CHROMIUM_SRC_DIR \
-               $$CHROMIUM_SRC_DIR/third_party/skia/include/core \
-               $$CHROMIUM_SRC_DIR/third_party/skia/include/config
+               $$CHROMIUM_SRC_DIR
 
 linux-g++*: QMAKE_CXXFLAGS += -Wno-unused-parameter
 
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index 76e79c570183e7260b4dff315345eef76fdd6689..600a55a8cedc6b5617405488c825b3846ac12ecf 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -43,11 +43,20 @@
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 #include "net/cookie_monster_delegate_qt.h"
-#include "type_conversion.h"
 
 #include <QByteArray>
 #include <QUrl>
 
+
+namespace {
+
+inline GURL toGurl(const QUrl& url)
+{
+    return GURL(url.toString().toStdString());
+}
+
+}
+
 QT_BEGIN_NAMESPACE
 
 using namespace QtWebEngineCore;