11 files changed, 15 insertions, 17 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index c2909d6f0..ce9f840ba 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -59,7 +59,9 @@ HEADERS = \
     qwebenginesettings.h \
     qwebenginescript.h \
     qwebenginescriptcollection.h \
-    qwebenginescriptcollection_p.h
+    qwebenginescriptcollection_p.h \
+    qwebengineprofile.h \
+    qwebengineprofile_p.h
 
 SOURCES = \
     qtwebenginecoreglobal.cpp \
@@ -81,7 +83,8 @@ SOURCES = \
     qwebenginedownloadrequest.cpp \
     qwebenginesettings.cpp \
     qwebenginescript.cpp \
-    qwebenginescriptcollection.cpp
+    qwebenginescriptcollection.cpp \
+    qwebengineprofile.cpp
 
 # Chromium headers included are not remotely clean
 CONFIG -= warning_clean
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/core/api/qwebengineprofile.cpp
index 942b969b0..bc8f295d9 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/core/api/qwebengineprofile.cpp
@@ -39,7 +39,7 @@
 
 #include "qwebengineprofile.h"
 #include "qwebengineprofile_p.h"
-
+#include "qwebenginenotification.h"
 #include "qwebenginecookiestore.h"
 #include "qwebenginedownloadrequest.h"
 #include "qwebenginedownloadrequest_p.h"
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/core/api/qwebengineprofile.h
index 590f3d9ea..b2088cf5d 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/core/api/qwebengineprofile.h
@@ -40,7 +40,7 @@
 #ifndef QWEBENGINEPROFILE_H
 #define QWEBENGINEPROFILE_H
 
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qscopedpointer.h>
@@ -57,15 +57,13 @@ class QWebEngineClientCertificateStore;
 class QWebEngineCookieStore;
 class QWebEngineDownloadRequest;
 class QWebEngineNotification;
-class QWebEnginePage;
-class QWebEnginePagePrivate;
 class QWebEngineProfilePrivate;
 class QWebEngineSettings;
 class QWebEngineScriptCollection;
 class QWebEngineUrlRequestInterceptor;
 class QWebEngineUrlSchemeHandler;
 
-class QWEBENGINEWIDGETS_EXPORT QWebEngineProfile : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineProfile : public QObject {
     Q_OBJECT
 public:
     explicit QWebEngineProfile(QObject *parent = Q_NULLPTR);
diff --git a/src/webenginewidgets/api/qwebengineprofile_p.h b/src/core/api/qwebengineprofile_p.h
index 60fa4632f..4bec7d6dc 100644
--- a/src/webenginewidgets/api/qwebengineprofile_p.h
+++ b/src/core/api/qwebengineprofile_p.h
@@ -73,7 +73,7 @@ class QWebEngineProfilePrivate;
 class QWebEngineNotification;
 class QWebEngineSettings;
 
-class QWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient {
+class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient {
 public:
     Q_DECLARE_PUBLIC(QWebEngineProfile)
     QWebEngineProfilePrivate(QtWebEngineCore::ProfileAdapter *profileAdapter);
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 4b29e4f76..034869adb 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -16,7 +16,6 @@ SOURCES = \
         api/qwebenginehistory.cpp \
         api/qwebenginenotificationpresenter.cpp \
         api/qwebenginepage.cpp \
-        api/qwebengineprofile.cpp \
         api/qwebengineview.cpp \
         render_widget_host_view_qt_delegate_widget.cpp
 
@@ -27,8 +26,6 @@ HEADERS = \
         api/qwebenginenotificationpresenter_p.h \
         api/qwebenginepage.h \
         api/qwebenginepage_p.h \
-        api/qwebengineprofile.h \
-        api/qwebengineprofile_p.h \
         api/qwebengineview.h \
         api/qwebengineview_p.h \
         render_widget_host_view_qt_delegate_widget.h
diff --git a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
index 6d51bf7af..f288a2c75 100644
--- a/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
+++ b/tests/auto/core/qwebengineclientcertificatestore/tst_qwebengineclientcertificatestore.cpp
@@ -28,7 +28,7 @@
 
 #include <QtTest/QtTest>
 #include <QtWebEngineCore/qwebengineclientcertificatestore.h>
-#include <QtWebEngineWidgets/qwebengineprofile.h>
+#include <QtWebEngineCore/qwebengineprofile.h>
 
 class tst_QWebEngineClientCertificateStore : public QObject
 {
diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index 5290d5373..f9473cfc2 100644
--- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -30,8 +30,8 @@
 #include <QtTest/QtTest>
 #include <QtWebEngineCore/qwebenginecallback.h>
 #include <QtWebEngineCore/qwebenginecookiestore.h>
+#include <QtWebEngineCore/qwebengineprofile.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
-#include <QtWebEngineWidgets/qwebengineprofile.h>
 
 #include "httpserver.h"
 #include "httpreqrep.h"
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 33edf25f1..e149e75d8 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -31,8 +31,8 @@
 #include <QtWebEngineCore/qwebengineurlrequestinfo.h>
 #include <QtWebEngineCore/qwebengineurlrequestinterceptor.h>
 #include <QtWebEngineCore/qwebenginesettings.h>
+#include <QtWebEngineCore/qwebengineprofile.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
-#include <QtWebEngineWidgets/qwebengineprofile.h>
 
 #include <httpserver.h>
 #include <httpreqrep.h>
diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp
index 92f94ef5d..72144265b 100644
--- a/tests/auto/widgets/origins/tst_origins.cpp
+++ b/tests/auto/widgets/origins/tst_origins.cpp
@@ -34,8 +34,8 @@
 #include <QtWebEngineCore/qwebengineurlscheme.h>
 #include <QtWebEngineCore/qwebengineurlschemehandler.h>
 #include <QtWebEngineCore/qwebenginesettings.h>
+#include <QtWebEngineCore/qwebengineprofile.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
-#include <QtWebEngineWidgets/qwebengineprofile.h>
 
 #if defined(WEBSOCKETS)
 #include <QtWebSockets/qwebsocket.h>
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 48ddb58f9..a7571f98a 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -36,7 +36,7 @@
 #include <QtWebEngineCore/qwebengineurlscheme.h>
 #include <QtWebEngineCore/qwebengineurlschemehandler.h>
 #include <QtWebEngineCore/qwebenginesettings.h>
-#include <QtWebEngineWidgets/qwebengineprofile.h>
+#include <QtWebEngineCore/qwebengineprofile.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
 #include <QtWebEngineWidgets/qwebengineview.h>
 #include <QtWebEngineCore/qwebenginedownloadrequest.h>
diff --git a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
index 62007840f..445ccf06e 100644
--- a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
+++ b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
@@ -28,7 +28,7 @@
 
 #include "util.h"
 #include <QtTest/QtTest>
-#include <QtWebEngineWidgets/qwebengineprofile.h>
+#include <QtWebEngineCore/qwebengineprofile.h>
 #include <QtWebEngineWidgets/qwebenginepage.h>
 #include <QtWebEngineWidgets/qwebengineview.h>
 #include <qwebenginesettings.h>