rename to remove the gtk3 prefix

Change-Id: I219798ed42aff11d09fd45c26ca1a018c2d22c08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115239
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

56 files changed, 56 insertions, 56 deletions

diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 44d742e01c77..4e7f838903a1 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -80,37 +80,37 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
-    vcl/unx/gtk3/a11y/gtk3atkaction \
-    vcl/unx/gtk3/a11y/gtk3atkbridge \
-    vcl/unx/gtk3/a11y/gtk3atkcomponent \
-    vcl/unx/gtk3/a11y/gtk3atkeditabletext \
-    vcl/unx/gtk3/a11y/gtk3atkfactory \
-    vcl/unx/gtk3/a11y/gtk3atkhypertext \
-    vcl/unx/gtk3/a11y/gtk3atkimage \
-    vcl/unx/gtk3/a11y/gtk3atklistener \
-    vcl/unx/gtk3/a11y/gtk3atkregistry \
-    vcl/unx/gtk3/a11y/gtk3atkselection \
-    vcl/unx/gtk3/a11y/gtk3atktable \
-    vcl/unx/gtk3/a11y/gtk3atktextattributes \
-    vcl/unx/gtk3/a11y/gtk3atktext \
-    vcl/unx/gtk3/a11y/gtk3atkutil \
-    vcl/unx/gtk3/a11y/gtk3atkvalue \
-    vcl/unx/gtk3/a11y/gtk3atkwrapper \
+    vcl/unx/gtk3/a11y/atkaction \
+    vcl/unx/gtk3/a11y/atkbridge \
+    vcl/unx/gtk3/a11y/atkcomponent \
+    vcl/unx/gtk3/a11y/atkeditabletext \
+    vcl/unx/gtk3/a11y/atkfactory \
+    vcl/unx/gtk3/a11y/atkhypertext \
+    vcl/unx/gtk3/a11y/atkimage \
+    vcl/unx/gtk3/a11y/atklistener \
+    vcl/unx/gtk3/a11y/atkregistry \
+    vcl/unx/gtk3/a11y/atkselection \
+    vcl/unx/gtk3/a11y/atktable \
+    vcl/unx/gtk3/a11y/atktextattributes \
+    vcl/unx/gtk3/a11y/atktext \
+    vcl/unx/gtk3/a11y/atkutil \
+    vcl/unx/gtk3/a11y/atkvalue \
+    vcl/unx/gtk3/a11y/atkwrapper \
     vcl/unx/gtk3/fpicker/resourceprovider \
     vcl/unx/gtk3/fpicker/SalGtkFilePicker \
     vcl/unx/gtk3/fpicker/SalGtkFolderPicker \
     vcl/unx/gtk3/fpicker/SalGtkPicker \
-    vcl/unx/gtk3/gtk3gtkdata \
-    vcl/unx/gtk3/gtk3gtkinst \
-    vcl/unx/gtk3/gtk3gtksys \
-    vcl/unx/gtk3/cairo_gtk3_cairo \
-    vcl/unx/gtk3/gtk3salnativewidgets-gtk \
-    vcl/unx/gtk3/gtk3gtkframe \
-    vcl/unx/gtk3/gtk3gtkobject \
-	vcl/unx/gtk3/gtk3gtksalmenu \
-	vcl/unx/gtk3/gtk3glomenu \
-	vcl/unx/gtk3/gtk3gloactiongroup \
-    vcl/unx/gtk3/gtk3hudawareness \
+    vcl/unx/gtk3/gtkdata \
+    vcl/unx/gtk3/gtkinst \
+    vcl/unx/gtk3/gtksys \
+    vcl/unx/gtk3/gtkcairo \
+    vcl/unx/gtk3/salnativewidgets-gtk \
+    vcl/unx/gtk3/gtkframe \
+    vcl/unx/gtk3/gtkobject \
+	vcl/unx/gtk3/gtksalmenu \
+	vcl/unx/gtk3/glomenu \
+	vcl/unx/gtk3/gloactiongroup \
+    vcl/unx/gtk3/hudawareness \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx b/vcl/unx/gtk3/a11y/atkaction.cxx
index 84770c09cfe9..84770c09cfe9 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
+++ b/vcl/unx/gtk3/a11y/atkaction.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx b/vcl/unx/gtk3/a11y/atkbridge.cxx
index c7cb32ca3ce2..c7cb32ca3ce2 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
+++ b/vcl/unx/gtk3/a11y/atkbridge.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx b/vcl/unx/gtk3/a11y/atkcomponent.cxx
index 21301d4da6bb..21301d4da6bb 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
+++ b/vcl/unx/gtk3/a11y/atkcomponent.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx b/vcl/unx/gtk3/a11y/atkeditabletext.cxx
index f240c32324c6..f240c32324c6 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
+++ b/vcl/unx/gtk3/a11y/atkeditabletext.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx b/vcl/unx/gtk3/a11y/atkfactory.cxx
index f92f9a667c9f..f92f9a667c9f 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
+++ b/vcl/unx/gtk3/a11y/atkfactory.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx b/vcl/unx/gtk3/a11y/atkhypertext.cxx
index 83f6817fc9e2..83f6817fc9e2 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
+++ b/vcl/unx/gtk3/a11y/atkhypertext.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx b/vcl/unx/gtk3/a11y/atkimage.cxx
index 477c71cc99ba..477c71cc99ba 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
+++ b/vcl/unx/gtk3/a11y/atkimage.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx b/vcl/unx/gtk3/a11y/atklistener.cxx
index 2ef96be4616e..2ef96be4616e 100644
--- a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
+++ b/vcl/unx/gtk3/a11y/atklistener.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx b/vcl/unx/gtk3/a11y/atkregistry.cxx
index ff96378c41dc..ff96378c41dc 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
+++ b/vcl/unx/gtk3/a11y/atkregistry.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkselection.cxx b/vcl/unx/gtk3/a11y/atkselection.cxx
index 91759e8d0b21..91759e8d0b21 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
+++ b/vcl/unx/gtk3/a11y/atkselection.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atktable.cxx b/vcl/unx/gtk3/a11y/atktable.cxx
index 11df8a73ce1c..11df8a73ce1c 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktable.cxx
+++ b/vcl/unx/gtk3/a11y/atktable.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atktext.cxx b/vcl/unx/gtk3/a11y/atktext.cxx
index 713b03325518..713b03325518 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktext.cxx
+++ b/vcl/unx/gtk3/a11y/atktext.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx b/vcl/unx/gtk3/a11y/atktextattributes.cxx
index 31c5ebd3585b..31c5ebd3585b 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
+++ b/vcl/unx/gtk3/a11y/atktextattributes.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx b/vcl/unx/gtk3/a11y/atkutil.cxx
index a2c8b46b470d..a2c8b46b470d 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
+++ b/vcl/unx/gtk3/a11y/atkutil.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx b/vcl/unx/gtk3/a11y/atkvalue.cxx
index f5e45d3b2556..f5e45d3b2556 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
+++ b/vcl/unx/gtk3/a11y/atkvalue.cxx
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index 1d53043f3d2b..1d53043f3d2b 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx
diff --git a/vcl/unx/gtk3/gtk3gloactiongroup.cxx b/vcl/unx/gtk3/gloactiongroup.cxx
index 1b64da0ffaf1..1b64da0ffaf1 100644
--- a/vcl/unx/gtk3/gtk3gloactiongroup.cxx
+++ b/vcl/unx/gtk3/gloactiongroup.cxx
diff --git a/vcl/unx/gtk3/gtk3glomenu.cxx b/vcl/unx/gtk3/glomenu.cxx
index ca6887cb9d95..ca6887cb9d95 100644
--- a/vcl/unx/gtk3/gtk3glomenu.cxx
+++ b/vcl/unx/gtk3/glomenu.cxx
diff --git a/vcl/unx/gtk3/cairo_gtk3_cairo.cxx b/vcl/unx/gtk3/gtkcairo.cxx
index 2e882ded6231..8c684295f046 100644
--- a/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
+++ b/vcl/unx/gtk3/gtkcairo.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "cairo_gtk3_cairo.hxx"
+#include "gtkcairo.hxx"
 
 #include <vcl/sysdata.hxx>
 #include <vcl/virdev.hxx>
diff --git a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx b/vcl/unx/gtk3/gtkcairo.hxx
index 1b4ed6d32c01..1b4ed6d32c01 100644
--- a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
+++ b/vcl/unx/gtk3/gtkcairo.hxx
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx
index 8626252f40e6..8626252f40e6 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtkdata.cxx
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index fa46f1372fe1..fa46f1372fe1 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index b4ad243c0422..b4ad243c0422 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtkobject.cxx
index e6da598d5e30..e6da598d5e30 100644
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtkobject.cxx
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index fa379b0fea13..fa379b0fea13 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
diff --git a/vcl/unx/gtk3/gtk3gtksys.cxx b/vcl/unx/gtk3/gtksys.cxx
index a0627a6f81e2..a0627a6f81e2 100644
--- a/vcl/unx/gtk3/gtk3gtksys.cxx
+++ b/vcl/unx/gtk3/gtksys.cxx
diff --git a/vcl/unx/gtk3/gtk3hudawareness.cxx b/vcl/unx/gtk3/hudawareness.cxx
index be84933249e2..be84933249e2 100644
--- a/vcl/unx/gtk3/gtk3hudawareness.cxx
+++ b/vcl/unx/gtk3/hudawareness.cxx
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index 8d09485aa046..ae7a7f3bf4c6 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -22,7 +22,7 @@
 #include <vcl/settings.hxx>
 #include <unx/fontmanager.hxx>
 
-#include "cairo_gtk3_cairo.hxx"
+#include "gtkcairo.hxx"
 #include <optional>
 
 GtkStyleContext* GtkSalGraphics::mpWindowStyle = nullptr;
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkaction.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkaction.cxx
index b05929b90571..6b9f5e3d8c88 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkaction.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkaction.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkaction.cxx"
+#include "../../gtk3/a11y/atkaction.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkbridge.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkbridge.cxx
index d31e5e429597..e07fc6c29571 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkbridge.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkbridge.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkbridge.cxx"
+#include "../../gtk3/a11y/atkbridge.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkcomponent.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkcomponent.cxx
index 63f44a3a14e9..5eac70ebd9ed 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkcomponent.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkcomponent.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkcomponent.cxx"
+#include "../../gtk3/a11y/atkcomponent.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkeditabletext.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkeditabletext.cxx
index 064e72d98612..792e432e13c5 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkeditabletext.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkeditabletext.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkeditabletext.cxx"
+#include "../../gtk3/a11y/atkeditabletext.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkfactory.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkfactory.cxx
index 86d9ac43adb5..2ddc5c55c4ae 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkfactory.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkfactory.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkfactory.cxx"
+#include "../../gtk3/a11y/atkfactory.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkhypertext.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkhypertext.cxx
index d2ce059aad62..f3fa99006eca 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkhypertext.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkhypertext.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkhypertext.cxx"
+#include "../../gtk3/a11y/atkhypertext.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkimage.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkimage.cxx
index 3a1234e07462..eb3acc7134ec 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkimage.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkimage.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkimage.cxx"
+#include "../../gtk3/a11y/atkimage.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atklistener.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atklistener.cxx
index 51d53bf9163b..cf10d29dfde3 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atklistener.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atklistener.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atklistener.cxx"
+#include "../../gtk3/a11y/atklistener.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkregistry.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkregistry.cxx
index f5e79172084a..cc10fbfdd535 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkregistry.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkregistry.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkregistry.cxx"
+#include "../../gtk3/a11y/atkregistry.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkselection.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkselection.cxx
index ab39c0e132f0..4c7fc5c15fa0 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkselection.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkselection.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkselection.cxx"
+#include "../../gtk3/a11y/atkselection.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktable.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktable.cxx
index 194791b68c10..672125d1a895 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktable.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktable.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atktable.cxx"
+#include "../../gtk3/a11y/atktable.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktext.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktext.cxx
index 8d668e6e69d0..de1d1f06ca05 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktext.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktext.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atktext.cxx"
+#include "../../gtk3/a11y/atktext.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktextattributes.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktextattributes.cxx
index c767a95d0448..aeac0e02dc4e 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktextattributes.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atktextattributes.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atktextattributes.cxx"
+#include "../../gtk3/a11y/atktextattributes.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil.cxx
index 39eb5aeebd60..193b08e9ab8a 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkutil.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkutil.cxx"
+#include "../../gtk3/a11y/atkutil.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkvalue.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkvalue.cxx
index 5a526e1cf909..75825b4e120b 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkvalue.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkvalue.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkvalue.cxx"
+#include "../../gtk3/a11y/atkvalue.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkwrapper.cxx b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkwrapper.cxx
index b0029f273ee2..a1bcc2e290df 100644
--- a/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkwrapper.cxx
+++ b/vcl/unx/gtk3_kde5/a11y/gtk3_kde5_atkwrapper.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../gtk3/a11y/gtk3atkwrapper.cxx"
+#include "../../gtk3/a11y/atkwrapper.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx
index fc271f160e7f..ed8780447f96 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_cairo.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/cairo_gtk3_cairo.cxx"
+#include "../gtk3/gtkcairo.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_gloactiongroup.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_gloactiongroup.cxx
index fa71136f9a28..eccf49d3df9e 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gloactiongroup.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gloactiongroup.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3gloactiongroup.cxx"
+#include "../gtk3/gloactiongroup.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_glomenu.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_glomenu.cxx
index de79c14c1403..979c9fba07b6 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_glomenu.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_glomenu.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3glomenu.cxx"
+#include "../gtk3/glomenu.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkdata.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkdata.cxx
index 200a74131860..f03dce99a7b3 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkdata.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkdata.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3gtkdata.cxx"
+#include "../gtk3/gtkdata.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkframe.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkframe.cxx
index 0b2eb38dcec4..8d8a07a3f230 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkframe.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkframe.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3gtkframe.cxx"
+#include "../gtk3/gtkframe.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx
index e25ec8b0ec9f..dd6aace5dc63 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.cxx
@@ -19,7 +19,7 @@
 
 // make gtk3 plug advertise correctly as kde5 hybrid
 #define GTK_TOOLKIT_NAME "gtk3_kde5"
-#include "../gtk3/gtk3gtkinst.cxx"
+#include "../gtk3/gtkinst.cxx"
 
 #include "gtk3_kde5_filepicker.hxx"
 #include "gtk3_kde5_folderpicker.hxx"
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkobject.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkobject.cxx
index a2eb6b9e1631..948c6bd3a87c 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtkobject.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtkobject.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3gtkobject.cxx"
+#include "../gtk3/gtkobject.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_gtksalmenu.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_gtksalmenu.cxx
index 9eb1c7975800..7963e6b6030f 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtksalmenu.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtksalmenu.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3gtksalmenu.cxx"
+#include "../gtk3/gtksalmenu.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_gtksys.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_gtksys.cxx
index 8f6b38843ec4..3f3ad9f1d3c3 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_gtksys.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_gtksys.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3gtksys.cxx"
+#include "../gtk3/gtksys.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_hudawareness.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_hudawareness.cxx
index eb159238983f..e0b8f1812d26 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_hudawareness.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_hudawareness.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3hudawareness.cxx"
+#include "../gtk3/hudawareness.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_salnativewidgets-gtk.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_salnativewidgets-gtk.cxx
index 108e41d470bc..428ff82042e2 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_salnativewidgets-gtk.cxx
@@ -17,6 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "../gtk3/gtk3salnativewidgets-gtk.cxx"
+#include "../gtk3/salnativewidgets-gtk.cxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */