sw: no reason why SwModelTestBase can be used only by "extras" tests

So move it one level up, this way more tests can share code in the
future.

Change-Id: I35300b3c88ac9a5c39916f53b1b1743aa85869a0
Reviewed-on: https://gerrit.libreoffice.org/82252
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

35 files changed, 38 insertions, 38 deletions

diff --git a/sw/CppunitTest_sw_accessible_relation_set.mk b/sw/CppunitTest_sw_accessible_relation_set.mk
index 22ee1e58c6d2..90b500f429aa 100644
--- a/sw/CppunitTest_sw_accessible_relation_set.mk
+++ b/sw/CppunitTest_sw_accessible_relation_set.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_docbookexport.mk b/sw/CppunitTest_sw_docbookexport.mk
index c3e70d26dade..b22229501f9e 100644
--- a/sw/CppunitTest_sw_docbookexport.mk
+++ b/sw/CppunitTest_sw_docbookexport.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_docbookexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_fodfexport.mk b/sw/CppunitTest_sw_fodfexport.mk
index 85922c8664f4..d64e58fc0bb0 100644
--- a/sw/CppunitTest_sw_fodfexport.mk
+++ b/sw/CppunitTest_sw_fodfexport.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_fodfexport,\
 $(eval $(call gb_CppunitTest_set_include,sw_fodfexport,\
 	-I$(SRCDIR)/sw/inc \
 	-I$(SRCDIR)/sw/source/core/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
 	$$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_globalfilter.mk b/sw/CppunitTest_sw_globalfilter.mk
index 237f3e5ff552..3baefd56cd80 100644
--- a/sw/CppunitTest_sw_globalfilter.mk
+++ b/sw/CppunitTest_sw_globalfilter.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_globalfilter,\
 $(eval $(call gb_CppunitTest_set_include,sw_globalfilter,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 765f6ff114fe..3e2188bc07dc 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk
index ded922ea8ff7..61e33f10e4fc 100644
--- a/sw/CppunitTest_sw_htmlimport.mk
+++ b/sw/CppunitTest_sw_htmlimport.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlimport,\
 	-I$(SRCDIR)/sw/inc \
 	-I$(SRCDIR)/sw/source/core/inc \
 	-I$(SRCDIR)/sw/source/uibase/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
 	$$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_layoutwriter.mk b/sw/CppunitTest_sw_layoutwriter.mk
index cd8e36a5d7d5..481402fe0bf2 100644
--- a/sw/CppunitTest_sw_layoutwriter.mk
+++ b/sw/CppunitTest_sw_layoutwriter.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_layoutwriter,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index 423ded034b16..8768ece34f28 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sw_mailmerge))
 $(eval $(call gb_CppunitTest_set_include,sw_mailmerge,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
     $$(INCLUDE) \
 ))
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 2c2a38ad11ed..ff603b76e2f1 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_odfexport,\
 $(eval $(call gb_CppunitTest_set_include,sw_odfexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 56969227f314..a99026e971fc 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlencryption.mk b/sw/CppunitTest_sw_ooxmlencryption.mk
index 8ad487546f92..b425b6eb84bb 100644
--- a/sw/CppunitTest_sw_ooxmlencryption.mk
+++ b/sw/CppunitTest_sw_ooxmlencryption.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlencryption,\
 $(eval $(call gb_CppunitTest_set_include,sw_ooxmlencryption,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk b/sw/CppunitTest_sw_ooxmlexport8.mk
index abd2db58151a..f873d05f8330 100644
--- a/sw/CppunitTest_sw_ooxmlexport8.mk
+++ b/sw/CppunitTest_sw_ooxmlexport8.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlexport8,\
 $(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport8,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk
index 6b973454d1ed..3efa9cd3d8c5 100644
--- a/sw/CppunitTest_sw_ooxmlfieldexport.mk
+++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlfieldexport,\
 $(eval $(call gb_CppunitTest_set_include,sw_ooxmlfieldexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index b517d7e9a5e3..44d03956d688 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlimport,\
 $(eval $(call gb_CppunitTest_set_include,sw_ooxmlimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk b/sw/CppunitTest_sw_ooxmlimport2.mk
index 95e138010a74..dd0267663455 100644
--- a/sw/CppunitTest_sw_ooxmlimport2.mk
+++ b/sw/CppunitTest_sw_ooxmlimport2.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlimport2,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmllinks.mk b/sw/CppunitTest_sw_ooxmllinks.mk
index 90485d7e21d7..7018cc4f5bd7 100644
--- a/sw/CppunitTest_sw_ooxmllinks.mk
+++ b/sw/CppunitTest_sw_ooxmllinks.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmllinks,\
 $(eval $(call gb_CppunitTest_set_include,sw_ooxmllinks,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk
index deaf4f267dd2..b228ef1d0625 100644
--- a/sw/CppunitTest_sw_ooxmlw14export.mk
+++ b/sw/CppunitTest_sw_ooxmlw14export.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlw14export,\
 $(eval $(call gb_CppunitTest_set_include,sw_ooxmlw14export,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index bef73f544f54..f2d62dc0b70a 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport,\
 $(eval $(call gb_CppunitTest_set_include,sw_rtfexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_rtfexport2.mk b/sw/CppunitTest_sw_rtfexport2.mk
index dae927ea4cbe..b771af3f9abd 100644
--- a/sw/CppunitTest_sw_rtfexport2.mk
+++ b/sw/CppunitTest_sw_rtfexport2.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport2,\
 $(eval $(call gb_CppunitTest_set_include,sw_rtfexport2,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_rtfexport3.mk b/sw/CppunitTest_sw_rtfexport3.mk
index 1ecef65c0290..b447fad21a10 100644
--- a/sw/CppunitTest_sw_rtfexport3.mk
+++ b/sw/CppunitTest_sw_rtfexport3.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport3,\
 $(eval $(call gb_CppunitTest_set_include,sw_rtfexport3,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_rtfexport4.mk b/sw/CppunitTest_sw_rtfexport4.mk
index 64be61d2ca2f..bf91d154d029 100644
--- a/sw/CppunitTest_sw_rtfexport4.mk
+++ b/sw/CppunitTest_sw_rtfexport4.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport4,\
 $(eval $(call gb_CppunitTest_set_include,sw_rtfexport4,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_rtfexport5.mk b/sw/CppunitTest_sw_rtfexport5.mk
index 82fecf0918f8..af0d2a90666c 100644
--- a/sw/CppunitTest_sw_rtfexport5.mk
+++ b/sw/CppunitTest_sw_rtfexport5.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfexport5,\
 $(eval $(call gb_CppunitTest_set_include,sw_rtfexport5,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index 50c748ca59e0..3732ed9eb845 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_rtfimport,\
 $(eval $(call gb_CppunitTest_set_include,sw_rtfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_tiledrendering.mk b/sw/CppunitTest_sw_tiledrendering.mk
index 7f4d2f41a59b..b1c333a1692e 100644
--- a/sw/CppunitTest_sw_tiledrendering.mk
+++ b/sw/CppunitTest_sw_tiledrendering.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_tiledrendering,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_txtexport.mk b/sw/CppunitTest_sw_txtexport.mk
index 92fe3f1e5439..2f4940f59e92 100644
--- a/sw/CppunitTest_sw_txtexport.mk
+++ b/sw/CppunitTest_sw_txtexport.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_txtexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index b68e2db283d0..342d8e3d4517 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_uiwriter,\
     -I$(SRCDIR)/sw/source/uibase/inc \
     -I$(SRCDIR)/sw/source/filter/inc \
     -I$(SRCDIR)/sw/source/filter/html \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_unowriter.mk b/sw/CppunitTest_sw_unowriter.mk
index 0e26218827f1..3c49c49c9236 100644
--- a/sw/CppunitTest_sw_unowriter.mk
+++ b/sw/CppunitTest_sw_unowriter.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_unowriter,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 8502e411bc54..506aa2ae7080 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8export,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk
index 4b2fa79f90b1..a70f63f0deb1 100644
--- a/sw/CppunitTest_sw_ww8export2.mk
+++ b/sw/CppunitTest_sw_ww8export2.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ww8export2,\
 $(eval $(call gb_CppunitTest_set_include,sw_ww8export2,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ww8export3.mk b/sw/CppunitTest_sw_ww8export3.mk
index e70b043356eb..fd30e423de99 100644
--- a/sw/CppunitTest_sw_ww8export3.mk
+++ b/sw/CppunitTest_sw_ww8export3.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ww8export3,\
 $(eval $(call gb_CppunitTest_set_include,sw_ww8export3,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 350af7437c91..97061ef14ab8 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8import,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-    -I$(SRCDIR)/sw/qa/extras/inc \
+    -I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/CppunitTest_sw_xhtmlexport.mk b/sw/CppunitTest_sw_xhtmlexport.mk
index 9f562f2778c0..61f4700e08c4 100644
--- a/sw/CppunitTest_sw_xhtmlexport.mk
+++ b/sw/CppunitTest_sw_xhtmlexport.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_xhtmlexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/uibase/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index 1471784ce22b..a367bbc05ce6 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ooxmlexport$(1),\
 $(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport$(1),\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
-	-I$(SRCDIR)/sw/qa/extras/inc \
+	-I$(SRCDIR)/sw/qa/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/inc/bordertest.hxx
index 52776c38e012..3137c85c9766 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/inc/bordertest.hxx
@@ -6,8 +6,8 @@
  * 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_SW_QA_EXTRAS_INC_BORDERTEST_HXX
-#define INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
+#ifndef INCLUDED_SW_QA_INC_BORDERTEST_HXX
+#define INCLUDED_SW_QA_INC_BORDERTEST_HXX
 
 #include <cppunit/TestAssert.h>
 #include <com/sun/star/table/BorderLine.hpp>
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index 4e3f1eda0eeb..38f8e95a4a40 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
-#define INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
+#ifndef INCLUDED_SW_QA_INC_SWMODELTESTBASE_HXX
+#define INCLUDED_SW_QA_INC_SWMODELTESTBASE_HXX
 
 #include <memory>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
@@ -1038,6 +1038,6 @@ inline std::ostream& operator<<(std::ostream& rStrm, const Color& rColor)
     return rStrm;
 }
 
-#endif // INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
+#endif // INCLUDED_SW_QA_INC_SWMODELTESTBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */