tdf#42949 Fix IWYU warnings in vcl/unx/generic/*

Also recheck vcl/inc/unx/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

8 files changed, 16 insertions, 7 deletions

diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 5ba32eea0fb0..d6a505e0dc5e 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_I18N_CB_HXX
 #define INCLUDED_VCL_INC_UNX_I18N_CB_HXX
 
+#include <X11/Xlib.h>
+
 #include <salwtype.hxx>
 #include <vector>
 
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index f38c1b794802..c9302c5eb97b 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INC_UNX_I18N_IC_HXX
 #define INCLUDED_VCL_INC_UNX_I18N_IC_HXX
 
-#include <i18nlangtag/lang.h>
 #include "i18n_cb.hxx"
 
 enum class EndExtTextInputFlags;
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index fa5b3b4a5dcc..eb4b774f21d3 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_I18N_IM_HXX
 #define INCLUDED_VCL_INC_UNX_I18N_IM_HXX
 
+#include <X11/Xlib.h>
+
 #include <vclpluginapi.h>
 
 #define bUseInputMethodDefault True
diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx
index ae9c4ae30a2e..3189087398f4 100644
--- a/vcl/inc/unx/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
 #define INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
 
+#include <X11/X.h>
+
+#include <sal/types.h>
+
 /*
  convert a keysym as defined in /usr/{X11R6|openwin}/include/X11/keysymdef.h
  to unicode
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 312e1be9283c..69baaf32c756 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
 #define INCLUDED_VCL_INC_UNX_I18N_XKB_HXX
 
-#include <sal/types.h>
+#include <X11/Xlib.h>
+
 #include <vclpluginapi.h>
 
 class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index c9a9a5120a82..b93d263f33e7 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -24,19 +24,16 @@
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
 
-#include <tools/fract.hxx>
-
 #include <vcl/salgtype.hxx>
 #include <vcl/vclenum.hxx>
-#include <vcl/metric.hxx>
 
+#include <unx/saldisp.hxx>
 #include <salgdi.hxx>
 #include <salgeom.hxx>
 #include <sallayout.hxx>
 #include <vclpluginapi.h>
 #include <ControlCacheKey.hxx>
 
-#include <deque>
 #include <memory>
 
 /* From <X11/Intrinsic.h> */
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index bef98cbbdf6e..a07a8453d3b7 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H
 #define INCLUDED_VCL_INC_UNX_SALOBJ_H
 
+#include <X11/Xlib.h>
+
 #include <salobj.hxx>
 #include <vcl/sysdata.hxx>
 #include <vclpluginapi.h>
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index 8ad94eb6ee7d..b9874a3eb084 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -21,11 +21,13 @@
 #define INCLUDED_VCL_INC_UNX_SALVD_H
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
+#include <unx/saldisp.hxx>
 #include <unx/saltype.h>
 #include <salvd.hxx>
 
+#include <memory>
+
 class SalDisplay;
 class X11SalGraphics;