diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
index ff9e5bca..bca16f48 100644
--- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
+++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
@@ -1,4 +1,3 @@
-load(qt_build_config)
 
 #DEFINES += QT_DEBUG_AVF
 # Avoid clash with a variable named `slots' in a Quartz header
diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri
index eb6a2998..babdb7cf 100644
--- a/src/plugins/gstreamer/common.pri
+++ b/src/plugins/gstreamer/common.pri
@@ -1,6 +1,5 @@
 
 QT += core-private multimedia-private network
-CONFIG += no_private_qt_headers_warning
 
 qtHaveModule(widgets) {
     QT += widgets multimediawidgets-private
diff --git a/src/plugins/qnx-audio/audio/audio.pro b/src/plugins/qnx-audio/audio/audio.pro
index bf4300a7..bd69dfe1 100644
--- a/src/plugins/qnx-audio/audio/audio.pro
+++ b/src/plugins/qnx-audio/audio/audio.pro
@@ -1,7 +1,6 @@
 TARGET = qtmedia_qnx_audio
-QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
+QT += multimedia-private
 
 LIBS += -lasound
 
diff --git a/src/plugins/resourcepolicy/resourcepolicy.pro b/src/plugins/resourcepolicy/resourcepolicy.pro
index e333bac0..91a94666 100644
--- a/src/plugins/resourcepolicy/resourcepolicy.pro
+++ b/src/plugins/resourcepolicy/resourcepolicy.pro
@@ -1,7 +1,7 @@
 TARGET = resourceqt
 
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning link_pkgconfig
+CONFIG += link_pkgconfig
 PKGCONFIG += libresourceqt5
 
 INCLUDEPATH += $$PWD \
diff --git a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
index ff9ba8f0..0bf841b3 100644
--- a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
+++ b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
@@ -1,14 +1,8 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-02-07T15:27:07
-#
-#-------------------------------------------------
-
 QT += multimedia multimedia-private testlib gui
 
 TARGET = tst_qaudiodecoder
 
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 
 TEMPLATE = app
 
diff --git a/tests/auto/unit/qaudioprobe/qaudioprobe.pro b/tests/auto/unit/qaudioprobe/qaudioprobe.pro
index fe200071..f52bafb9 100644
--- a/tests/auto/unit/qaudioprobe/qaudioprobe.pro
+++ b/tests/auto/unit/qaudioprobe/qaudioprobe.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qaudioprobe
 
 QT += multimedia-private testlib
diff --git a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
index 7ee5222c..beab4821 100644
--- a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
+++ b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qaudiorecorder
 
 QT += multimedia-private testlib
diff --git a/tests/auto/unit/qmediaobject/qmediaobject.pro b/tests/auto/unit/qmediaobject/qmediaobject.pro
index 597ddd00..787982fe 100644
--- a/tests/auto/unit/qmediaobject/qmediaobject.pro
+++ b/tests/auto/unit/qmediaobject/qmediaobject.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qmediaobject
 QT += multimedia-private testlib
 
diff --git a/tests/auto/unit/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/qmediaplayer/qmediaplayer.pro
index cbdbf71f..04ce0973 100644
--- a/tests/auto/unit/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/unit/qmediaplayer/qmediaplayer.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qmediaplayer
 QT += network multimedia-private testlib
 SOURCES += tst_qmediaplayer.cpp
diff --git a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
index ce723fbe..c84d66e9 100644
--- a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
+++ b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qmediaplayerwidgets
 QT += network multimedia-private multimediawidgets-private testlib widgets
 SOURCES += tst_qmediaplayerwidgets.cpp
diff --git a/tests/auto/unit/qmediarecorder/qmediarecorder.pro b/tests/auto/unit/qmediarecorder/qmediarecorder.pro
index f6fac044..99e0de53 100644
--- a/tests/auto/unit/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/unit/qmediarecorder/qmediarecorder.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qmediarecorder
 QT += multimedia-private testlib
 SOURCES += tst_qmediarecorder.cpp
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index 2b7412d1..7fcaadbc 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
@@ -1,4 +1,3 @@
-TARGET = mockserviceplugin1
 QT += multimedia-private
 
 HEADERS += ../mockservice.h
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index ff793ec8..4ac001ec 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
@@ -1,4 +1,3 @@
-TARGET = mockserviceplugin2
 QT += multimedia-private
 
 HEADERS += ../mockservice.h
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index 15e9dc65..34cd2fed 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
@@ -1,4 +1,3 @@
-TARGET = mockserviceplugin3
 QT += multimedia-private
 
 HEADERS += ../mockservice.h
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index 894d9293..0900bfc4 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
@@ -1,4 +1,3 @@
-TARGET = mockserviceplugin4
 QT += multimedia-private
 
 HEADERS += ../mockservice.h
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
index 093c2474..37f287f9 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
@@ -1,4 +1,3 @@
-TARGET = mockserviceplugin5
 QT += multimedia-private
 
 HEADERS += ../mockservice.h
diff --git a/tests/auto/unit/qradiodata/qradiodata.pro b/tests/auto/unit/qradiodata/qradiodata.pro
index a4937cc5..01a1f005 100644
--- a/tests/auto/unit/qradiodata/qradiodata.pro
+++ b/tests/auto/unit/qradiodata/qradiodata.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qradiodata
 QT += multimedia-private testlib
 SOURCES += tst_qradiodata.cpp
diff --git a/tests/auto/unit/qradiotuner/qradiotuner.pro b/tests/auto/unit/qradiotuner/qradiotuner.pro
index e0638c1f..c449e03a 100644
--- a/tests/auto/unit/qradiotuner/qradiotuner.pro
+++ b/tests/auto/unit/qradiotuner/qradiotuner.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qradiotuner
 QT += multimedia-private testlib
 SOURCES += tst_qradiotuner.cpp
diff --git a/tests/auto/unit/qsamplecache/qsamplecache.pro b/tests/auto/unit/qsamplecache/qsamplecache.pro
index 1f0db1b5..d6fa7c4e 100644
--- a/tests/auto/unit/qsamplecache/qsamplecache.pro
+++ b/tests/auto/unit/qsamplecache/qsamplecache.pro
@@ -1,4 +1,4 @@
-CONFIG += no_private_qt_headers_warning testcase
+CONFIG += testcase
 TARGET = tst_qsamplecache
 
 QT += multimedia-private testlib
diff --git a/tests/auto/unit/qvideoprobe/qvideoprobe.pro b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
index 0bd4102a..88e8eebb 100644
--- a/tests/auto/unit/qvideoprobe/qvideoprobe.pro
+++ b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
 TARGET = tst_qvideoprobe
 
 QT += multimedia-private testlib
diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
index 1b6af7e8..a24273f3 100644
--- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro
+++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
@@ -4,7 +4,7 @@ SOURCES += tst_qwavedecoder.cpp \
            ../../../../src/multimedia/audio/qwavedecoder_p.cpp
 
 QT += multimedia-private testlib network
-CONFIG += no_private_qt_headers_warning testcase
+CONFIG += testcase
 
 TESTDATA += data/*
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0