diff --git a/common.pri b/common.pri
deleted file mode 100644
index 5f4dbc3bcbf6af01dd02cd26aa0747fd206ada44..0000000000000000000000000000000000000000
--- a/common.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-macx:LIBPATH = $$getOutDir()/$$getConfigDir()
-else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
-
-macx: CONFIG -= app_bundle
-
-# Allows examples/tests to link to libQt5WebEngineCore which
-# isn't deployed properly yet.
-QMAKE_RPATHDIR += $$LIBPATH
diff --git a/examples/quick/quicknanobrowser/quicknanobrowser.pro b/examples/quick/quicknanobrowser/quicknanobrowser.pro
index 2132b031aebc5a6cf329917828389093e019b7cc..aae724c55ecc52a76e333cdfe9bec9da49e70985 100644
--- a/examples/quick/quicknanobrowser/quicknanobrowser.pro
+++ b/examples/quick/quicknanobrowser/quicknanobrowser.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = quicknanobrowser
 
-include($$QTWEBENGINE_ROOT/common.pri)
+macx: CONFIG -= app_bundle
 
 HEADERS = quickwindow.h
 SOURCES = quickwindow.cpp main.cpp
diff --git a/examples/widgets/browser/browser.pro b/examples/widgets/browser/browser.pro
index e19efafb156f4c7e86a3391974c480610e44e34c..c63602412c565e1db214a5460c66e85ae63c9c8a 100644
--- a/examples/widgets/browser/browser.pro
+++ b/examples/widgets/browser/browser.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = browser
 QT += webenginewidgets network widgets printsupport
 
-include($$QTWEBENGINE_ROOT/common.pri)
+macx: CONFIG -= app_bundle
 
 qtHaveModule(uitools):!embedded: QT += uitools
 else: DEFINES += QT_NO_UITOOLS
diff --git a/examples/widgets/fancybrowser/fancybrowser.pro b/examples/widgets/fancybrowser/fancybrowser.pro
index 01f7c535a2b743bc6f33162202264793cfc8006d..eb5e5a34c78db2f49f9533e068e6a56ff1a3e72a 100644
--- a/examples/widgets/fancybrowser/fancybrowser.pro
+++ b/examples/widgets/fancybrowser/fancybrowser.pro
@@ -1,6 +1,6 @@
 QT      +=  webenginewidgets
 
-include($$QTWEBENGINE_ROOT/common.pri)
+macx: CONFIG -= app_bundle
 
 HEADERS =   mainwindow.h
 SOURCES =   main.cpp \
diff --git a/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
index bd9e53a90ed7ad6417bd300dd039c68feea310f3..c79d314c212f81114490284ef68ff44918f4fb1e 100644
--- a/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
+++ b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = widgetsnanobrowser
 
-include($$QTWEBENGINE_ROOT/common.pri)
+macx: CONFIG -= app_bundle
 
 HEADERS = widgetwindow.h
 SOURCES = widgetwindow.cpp main.cpp
diff --git a/lib/quick/quick.pro b/lib/quick/quick.pro
index 78650dedc505fabc81c9c72b26d9bdf85bf7574e..c4c248a418b32d3446e95f0278bf022aff204019 100644
--- a/lib/quick/quick.pro
+++ b/lib/quick/quick.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += ../
 # FIXME: all this should eventually be turned into QT += webenginecore
 macx:LIBPATH = $$getOutDir()/$$getConfigDir()
 else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
-LIBS += -lQt5WebEngineCore -L$$LIBPATH
+LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH
 QMAKE_RPATHDIR += $$LIBPATH
 
 #DESTDIR = $$LIBPATH
diff --git a/lib/widgets/widgets.pro b/lib/widgets/widgets.pro
index 60730f880ababd057685d2d70bea5d5842c768ea..5da1be0913c6a39354f03fd660d2fc12382a3002 100644
--- a/lib/widgets/widgets.pro
+++ b/lib/widgets/widgets.pro
@@ -17,7 +17,7 @@ QT_PRIVATE += widgets-private gui-private core-private
 # FIXME: all this should eventually be turned into QT += webenginecore
 macx:LIBPATH = $$getOutDir()/$$getConfigDir()
 else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
-LIBS += -L$$LIBPATH -lQt5WebEngineCore
+LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH
 QMAKE_RPATHDIR += $$LIBPATH
 
 DESTDIR = $$LIBPATH
diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri
index 618ffe0cd3a8fdece62588754f563d5b7876a4ab..bdefa91598bf1a0929799fdd82c20b3cc8c3a7e5 100644
--- a/tests/auto/quick/tests.pri
+++ b/tests/auto/quick/tests.pri
@@ -12,7 +12,7 @@ INCLUDEPATH += \
 QT += testlib network quick
 QT_PRIVATE += quick-private gui-private core-private
 
-include($$QTWEBENGINE_ROOT/common.pri)
+macx: CONFIG -= app_bundle
 
 # This define is used by some tests to look up resources in the source tree
 DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/widgets/tests.pri b/tests/auto/widgets/tests.pri
index 3d3979986b746742d05bf96a4d5ba681879bc3b1..4ca22969f98fda9ad1a294480e2e9f2540af0bb8 100644
--- a/tests/auto/widgets/tests.pri
+++ b/tests/auto/widgets/tests.pri
@@ -18,7 +18,7 @@ INCLUDEPATH += \
     $$PWD/../Api
 
 QT += testlib network webenginewidgets widgets
-include($$QTWEBENGINE_ROOT/common.pri)
+macx: CONFIG -= app_bundle
 
 # This define is used by some tests to look up resources in the source tree
 DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"