4 files changed, 30 insertions, 3 deletions
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index e0f08b036cd5..7e71b34ccaed 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -10,7 +10,6 @@
 #include <config_features.h>
 
 #include <test/bootstrapfixture.hxx>
-#include <test/setupvcl.hxx>
 #include <vcl/errinf.hxx>
 #include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
@@ -30,6 +29,8 @@
 #include <memory>
 #include <cstring>
 
+#include "setupvcl.hxx"
+
 using namespace ::com::sun::star;
 
 static void aBasicErrorFunc( const OUString &rErr, const OUString &rAction )
diff --git a/test/source/setupvcl.cxx b/test/source/setupvcl.cxx
index 81d53b0f2734..56c0a3b3c84c 100644
--- a/test/source/setupvcl.cxx
+++ b/test/source/setupvcl.cxx
@@ -15,12 +15,12 @@
 #include <comphelper/processfactory.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include <test/setupvcl.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <vcl/svapp.hxx>
 
 #include "isheadless.hxx"
+#include "setupvcl.hxx"
 
 namespace {
 
diff --git a/test/source/setupvcl.hxx b/test/source/setupvcl.hxx
new file mode 100644
index 000000000000..78d4683e50ce
--- /dev/null
+++ b/test/source/setupvcl.hxx
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SETUPVCL_HXX
+#define INCLUDED_TEST_SETUPVCL_HXX
+
+#include <sal/config.h>
+
+#include <test/testdllapi.hxx>
+
+namespace test {
+
+// Calls InitVCL etc.; needed from multiple places in the test infrastructure:
+OOO_DLLPUBLIC_TEST_SETUPVCL void setUpVcl(bool forceHeadless = false);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx
index 99777f6b483c..f6d1b97620ad 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -12,9 +12,9 @@
 #include <cppunit/Protector.h>
 #include <sal/types.h>
 #include <sal/log.hxx>
-#include <test/setupvcl.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/threadpool.hxx>
+#include "setupvcl.hxx"
 
 namespace {