tdf#82577: Remove prex.h and postx.h wrapper headers

Include the X11 headers directly in files that used to include those
wrappers, and add the Pixel typedef to files that use it.

prex.h included headers that a file including prex.h might not need
at all, so when replacing prex.h and postx.h includes, try including
only X11 headers that are actually needed in their place.

Also fix saldisp.hxx and i18n_xkb.cxx relying on indirectly included
X11 headers.

Change-Id: If0c30c7facc28db7f2e410b5e6f1d52d8c7cdfd3
Reviewed-on: https://gerrit.libreoffice.org/22132
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

47 files changed, 120 insertions, 172 deletions

diff --git a/include/postx.h b/include/postx.h
deleted file mode 100644
index f132a4d7bd09..000000000000
--- a/include/postx.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_POSTX_H
-#define INCLUDED_POSTX_H
-
-#if defined __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/prex.h b/include/prex.h
deleted file mode 100644
index 9bc86fb74e73..000000000000
--- a/include/prex.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _PREX_H
-#define _PREX_H
-
-#ifdef MACOSX
-#error No X headers should be included for MACOSX even if they are present in the SDK
-#endif
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/StringDefs.h>
-#include <X11/extensions/Xrender.h>
-#include <X11/XKBlib.h>
-
-/* From <X11/Intrinsic.h> */
-typedef unsigned long Pixel;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index d5a9e3142173..44b8d67fd8d9 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -19,9 +19,9 @@
 #elif defined( ANDROID )
 #elif defined( LIBO_HEADLESS )
 #elif defined( UNX )
-#  include <prex.h>
+#  include <X11/Xlib.h>
+#  include <X11/Xutil.h>
 #  include "GL/glxew.h"
-#  include <postx.h>
 #elif defined( _WIN32 )
 #ifndef INCLUDED_PRE_POST_WIN_H
 #define INCLUDED_PRE_POST_WIN_H
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 0c7f1961d1fe..87d3fe3ab312 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -18,9 +18,9 @@
 #include <rtl/ustring.hxx>
 
 #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
-#  include <prex.h>
+#  include <X11/Xlib.h>
+#  include <X11/Xutil.h>
 #  include "GL/glxew.h"
-#  include <postx.h>
 #endif
 
 /// Helper to do a SAL_INFO as well as a GL log.
diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx
index 49931944a0b0..0f746aa546e3 100644
--- a/vcl/inc/opengl/x11/salvd.hxx
+++ b/vcl/inc/opengl/x11/salvd.hxx
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_VCL_INC_OPENGL_X11_SALVD_H
 #define INCLUDED_VCL_INC_OPENGL_X11_SALVD_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include <unx/saltype.h>
 #include <salvd.hxx>
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 3e90b2f384d3..a3d85a1578c1 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include <postx.h>
 
 #include <unx/gendata.hxx>
 #include <unx/saldisp.hxx>
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index ed34e3edca18..f6da61e4fd2c 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <cairo.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -29,7 +30,6 @@
 #  include <gtk/gtkx.h>
 #endif
 #include <gdk/gdkkeysyms.h>
-#include <postx.h>
 
 #include <salframe.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index d4ae5f06af3a..a53ebaf2d86b 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
-#include <postx.h>
 
 #include <unx/gtk/gtkframe.hxx>
 
diff --git a/vcl/inc/unx/pixmap.hxx b/vcl/inc/unx/pixmap.hxx
index 0057763910ae..658935a70e4d 100644
--- a/vcl/inc/unx/pixmap.hxx
+++ b/vcl/inc/unx/pixmap.hxx
@@ -10,8 +10,9 @@
 #ifndef INCLUDED_VCL_INC_UNX_PIXMAP_HXX
 #define INCLUDED_VCL_INC_UNX_PIXMAP_HXX
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include <tools/gen.hxx>
 #include <unx/saltype.h>
 #include <vclpluginapi.h>
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index fe7aea15fbcb..4239ec65626d 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALBMP_H
 #define INCLUDED_VCL_INC_UNX_SALBMP_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include <vcl/salgtype.hxx>
 #include <unx/saldisp.hxx>
 #include <salbmp.hxx>
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index a4486c70efb8..bea74686e6e7 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALDATA_HXX
 #define INCLUDED_VCL_INC_UNX_SALDATA_HXX
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include <unx/saldisp.hxx>
 #include <unx/salunx.h>
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 99fac241398c..68492542ff4c 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -25,6 +25,10 @@ class   SalColormap;
 class   SalVisual;
 class   SalXLib;
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+
 #include <unx/salunx.h>
 #include <unx/saltype.h>
 #include <vcl/salgtype.hxx>
@@ -42,6 +46,9 @@ class   SalXLib;
 
 #include <vclpluginapi.h>
 
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
 class   BitmapPalette;
 class   SalFrame;
 class   ColorMask;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index e3c1e58bf594..6d7cab6a259b 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALFRAME_H
 #define INCLUDED_VCL_INC_UNX_SALFRAME_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include <unx/salunx.h>
 #include <unx/saltype.h>
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index e8232f2598fd..9b77c7069fcc 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -20,8 +20,10 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALGDI_H
 #define INCLUDED_VCL_INC_UNX_SALGDI_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+
 #include <tools/fract.hxx>
 
 #include <vcl/salgtype.hxx>
@@ -36,6 +38,9 @@
 #include <deque>
 #include <memory>
 
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
 class FontAttributes;
 class FontSelectPattern;
 class SalBitmap;
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 85d7ff6bc704..cc0e086e5d77 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -25,9 +25,8 @@
 #include <salinst.hxx>
 #include "unx/geninst.h"
 
-#include <prex.h>
 #include <X11/Xlib.h>
-#include <postx.h>
+#include <X11/Xutil.h>
 
 namespace com { namespace sun { namespace star { namespace datatransfer {
     namespace clipboard { class XClipboard; }
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index 1d893dd3b7f5..20faefc6d928 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALUNX_H
 #define INCLUDED_VCL_INC_UNX_SALUNX_H
 
-#include <prex.h>
-#include <postx.h>
-
 #include "unx/salunxtime.h"
 
 inline long Divide( long nDividend, long nDivisor )
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index ca83c84340a9..d6af7ce784bb 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALVD_H
 #define INCLUDED_VCL_INC_UNX_SALVD_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
 #include <unx/saltype.h>
 #include <salvd.hxx>
diff --git a/vcl/inc/unx/screensaverinhibitor.hxx b/vcl/inc/unx/screensaverinhibitor.hxx
index 7b5af6d4a85d..deff6d8086b8 100644
--- a/vcl/inc/unx/screensaverinhibitor.hxx
+++ b/vcl/inc/unx/screensaverinhibitor.hxx
@@ -10,11 +10,11 @@
 #ifndef INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
 #define INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #if !defined(SOLARIS) && !defined(AIX)
 #include <X11/extensions/dpms.h>
 #endif
-#include <postx.h>
 
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/unx/svsys.h b/vcl/inc/unx/svsys.h
index 91775820798e..174a1ed74b27 100644
--- a/vcl/inc/unx/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -19,8 +19,10 @@
 #ifndef INCLUDED_VCL_INC_UNX_SVSYS_H
 #define INCLUDED_VCL_INC_UNX_SVSYS_H
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/XKBlib.h>
 
 #endif // INCLUDED_VCL_INC_UNX_SVSYS_H
 
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index c50542797314..de3354955c2b 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -22,11 +22,10 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#ifndef _PREX_H
-#include <prex.h>
+
 #include <X11/Xlib.h>
-#include <postx.h>
-#endif
+#include <X11/Xutil.h>
+
 #include <vclpluginapi.h>
 #include <vector>
 
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index c86270eca311..fe0207aff528 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -23,10 +23,9 @@
 #include <sal/alloca.h>
 #include <osl/thread.h>
 
-#include <prex.h>
-#include <X11/Xlocale.h>
 #include <X11/Xlib.h>
-#include <postx.h>
+#include <X11/Xutil.h>
+#include <X11/Xlocale.h>
 
 #include <vcl/commandevent.hxx>
 #include <unx/salunx.h>
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index a0ce0daeb902..3e52153e1110 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -21,10 +21,9 @@
 
 #include <osl/thread.h>
 
-#include <prex.h>
-#include <X11/Xlocale.h>
 #include <X11/Xlib.h>
-#include <postx.h>
+#include <X11/Xutil.h>
+#include <X11/Xlocale.h>
 
 #include <unx/salunx.h>
 #include <unx/XIM.h>
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 321832b1b27a..4277c8e28f4d 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -27,11 +27,10 @@
 #endif
 #include <poll.h>
 
-#include <prex.h>
-#include <X11/Xlocale.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xlocale.h>
 #include <unx/XIM.h>
-#include <postx.h>
 
 #include "unx/salunx.h"
 #include "unx/saldisp.hxx"
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 40ec7a486215..e30b22725b20 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -22,10 +22,9 @@
 #endif
 #include <sal/alloca.h>
 
-#include <prex.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <unx/XIM.h>
-#include <postx.h>
 
 #include <unx/salunx.h>
 #include <unx/i18n_status.hxx>
diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx
index aebca9f2c58f..cc8a0a8533e8 100644
--- a/vcl/unx/generic/app/i18n_xkb.cxx
+++ b/vcl/unx/generic/app/i18n_xkb.cxx
@@ -19,6 +19,9 @@
 
 #include <stdio.h>
 
+#include <X11/Xlib.h>
+#include <X11/XKBlib.h>
+
 #include "unx/saldisp.hxx"
 #include "unx/saldata.hxx"
 #include "unx/i18n_xkb.hxx"
diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx
index 9706e9f3143e..51eccc111c19 100644
--- a/vcl/unx/generic/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -19,9 +19,9 @@
 
 #ifdef USE_RANDR
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/extensions/Xrandr.h>
-#include <postx.h>
 
 #include "osl/module.h"
 #include "rtl/ustring.hxx"
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 92f4679ae793..316ac5684b32 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -48,9 +48,11 @@
 #include "unx/sm.hxx"
 #include "unx/i18n_im.hxx"
 #include "unx/i18n_xkb.hxx"
-#include <prex.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xproto.h>
-#include <postx.h>
+
 #include "salinst.hxx"
 
 #include <osl/signal.h>
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index ed0eaf768797..07718e0ed313 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -30,7 +30,10 @@
 #include <osl/module.h>
 #endif
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/XKBlib.h>
+
 #include <X11/cursorfont.h>
 #include "unx/x11_cursors/salcursors.h"
 #include "unx/x11_cursors/invert50.h"
@@ -38,15 +41,12 @@
 #define XK_KOREAN
 #endif
 #include <X11/keysym.h>
-#include <X11/XKBlib.h>
 #include <X11/Xatom.h>
 
 #ifdef USE_XINERAMA_XORG
 #include <X11/extensions/Xinerama.h>
 #endif
 
-#include <postx.h>
-
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -77,6 +77,9 @@
 #include <com/sun/star/uno/DeploymentException.hpp>
 #include <officecfg/Office/Common.hxx>
 
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
 using namespace vcl_sal;
 
 #define SALCOLOR_WHITE      MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index e179ea94b2a7..4781a1c1c414 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -32,9 +32,9 @@
 #include <osl/security.h>
 #include <osl/conditn.h>
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
-#include <postx.h>
 
 #include <unx/sm.hxx>
 #include <unx/saldata.hxx>
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 44de6812d3b3..664ac6a69c42 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -36,11 +36,10 @@
 
 #include "salgdi.hxx"
 
-#include <prex.h>
-#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/Xresource.h>
-#include <postx.h>
 
 namespace vcl_sal {
 
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 06fdc50df33a..609f3cb349a9 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
-#include <postx.h>
 
 #include <unx/desktops.hxx>
 
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index e9021f46cdaf..0bcae3e1206c 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -25,9 +25,8 @@
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
 #include <cppuhelper/implbase.hxx>
 
-#include <prex.h>
 #include <X11/Xlib.h>
-#include <postx.h>
+#include <X11/Xutil.h>
 
 namespace x11 {
 
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 1b2cb43c5604..50ccb40d2b63 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -29,11 +29,12 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/XKBlib.h>
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
-#include <X11/Xutil.h>
-#include <postx.h>
+
 #if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) || defined(OPENBSD)
 #include <sys/poll.h>
 #else
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index ba897216a749..9a678b26f351 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -37,9 +37,7 @@
 #include <list>
 #include <unordered_map>
 
-#include <prex.h>
 #include <X11/Xlib.h>
-#include <postx.h>
 
 #define XDND_IMPLEMENTATION_NAME "com.sun.star.datatransfer.dnd.XdndSupport"
 #define XDND_DROPTARGET_IMPLEMENTATION_NAME "com.sun.star.datatransfer.dnd.XdndDropTarget"
diff --git a/vcl/unx/generic/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx
index dbcd74c96a98..13797bf29ba0 100644
--- a/vcl/unx/generic/dtrans/bmp.hxx
+++ b/vcl/unx/generic/dtrans/bmp.hxx
@@ -20,12 +20,10 @@
 #ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_BMP_HXX
 #define INCLUDED_VCL_UNX_GENERIC_DTRANS_BMP_HXX
 
-#include <prex.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <postx.h>
+#include <X11/Xatom.h>
+#include <X11/keysym.h>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <sal/types.h>
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index f0514fb1acbb..83a6d98e7e73 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -19,10 +19,9 @@
 
 #include <utility>
 
-#include <prex.h>
-#include <X11/extensions/Xrender.h>
 #include <X11/Xlib.h>
-#include <postx.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
 
 #include "cairo_cairo.hxx"
 #include "cairo_xlib_cairo.hxx"
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 9203e042b533..ef4845639afe 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -17,9 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
 #include <X11/Xproto.h>
-#include <postx.h>
 
 #include "gdiimpl.hxx"
 
@@ -65,6 +66,9 @@
 
 #define STATIC_POINTS 64
 
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
 class SalPolyLine
 {
     XPoint Points_[STATIC_POINTS];
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index f964e4a59131..d637237d7871 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX
 #define INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
 
 #include "unx/saltype.h"
 #include "unx/x11/x11gdiimpl.h"
@@ -30,6 +31,9 @@
 
 #include <basegfx/polygon/b2dtrapezoid.hxx>
 
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
 class SalGraphics;
 class SalBitmap;
 class SalPolyLine;
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index d18fa7261ec7..0bfd9aa43651 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -24,9 +24,9 @@
 #include <sys/types.h>
 #endif
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xproto.h>
-#include <postx.h>
 
 #include <osl/endian.h>
 
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index d72873b68abb..b470eff7052a 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -23,9 +23,10 @@
 #include <queue>
 #include <set>
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
 #include <X11/Xproto.h>
-#include <postx.h>
 
 #include "tools/debug.hxx"
 
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 97b1d3be778b..f4d8961c93a5 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -19,9 +19,9 @@
 
 #include <vcl/sysdata.hxx>
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
-#include <postx.h>
 
 #include <unx/salunx.h>
 #include <unx/saldata.hxx>
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index 470546b9bc0b..19387925dd7f 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX
 #define INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 struct _XTrap; // on some older systems this is not declared within Xrender.h
 #include <X11/extensions/Xrender.h>
-#include <postx.h>
 
 #include <vcl/salgtype.hxx>
 #include <osl/module.h>
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index abecfd3e36c3..a8e0cabf7bba 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -36,12 +36,12 @@
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 #include "FWS.hxx"
 #include <X11/extensions/shape.h>
-#include <postx.h>
 
 #include "unx/salunx.h"
 #include "unx/saldata.hxx"
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 8652e50f315d..093120516286 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -21,9 +21,10 @@
 #include <stdio.h>
 #endif
 
-#include <prex.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
-#include <postx.h>
+
 #include <tools/debug.hxx>
 
 #include <vcl/keycodes.hxx>
diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx
index 3c2032334872..19ba95c1e7a9 100644
--- a/vcl/unx/generic/window/screensaverinhibitor.cxx
+++ b/vcl/unx/generic/window/screensaverinhibitor.cxx
@@ -10,10 +10,9 @@
 #include <unx/gensys.h>
 #include <unx/screensaverinhibitor.hxx>
 
-#include <prex.h>
-#include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include <postx.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
 
 #include <config_dbus.h>
 
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 3c16a96c59c3..a0a7e5860479 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -50,10 +50,11 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <prex.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
-#include <postx.h>
 
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index c125ec552b69..a2c7f9dc819d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -48,7 +48,9 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <prex.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #if defined(GDK_WINDOWING_X11)
 #   include <gdk/gdkx.h>
@@ -56,7 +58,6 @@
 #if defined(GDK_WINDOWING_WAYLAND)
 #   include <gdk/gdkwayland.h>
 #endif
-#include <postx.h>
 
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>