diff --git a/composite/compositeext.h b/composite/compositeext.h index 945a4c35c..e3e6f4c75 100644 --- a/composite/compositeext.h +++ b/composite/compositeext.h @@ -20,11 +20,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _COMPOSITEEXT_H_ #define _COMPOSITEEXT_H_ diff --git a/config/config-backends.h b/config/config-backends.h index cb09ef5be..06928731f 100644 --- a/config/config-backends.h +++ b/config/config-backends.h @@ -22,13 +22,9 @@ * * Author: Daniel Stone */ - #ifndef XSERVER_CONFIG_BACKENDS_H #define XSERVER_CONFIG_BACKENDS_H -#ifdef HAVE_DIX_CONFIG_H -#include -#endif #include "input.h" #include "list.h" diff --git a/dbe/midbe.h b/dbe/midbe.h index 019375756..037d7891f 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -28,11 +28,6 @@ * Header file for users of machine-independent DBE code * *****************************************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef MIDBE_H #define MIDBE_H diff --git a/fb/fbpict.h b/fb/fbpict.h index eb627c15f..a35765b9c 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -20,11 +20,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _FBPICT_H_ #define _FBPICT_H_ diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h index 441d72dd7..35a11aaf0 100644 --- a/glx/glxdrawable.h +++ b/glx/glxdrawable.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _GLX_drawable_h_ #define _GLX_drawable_h_ diff --git a/glx/glxserver.h b/glx/glxserver.h index 79f4944d0..4c82e28d2 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _GLX_server_h_ #define _GLX_server_h_ diff --git a/glx/unpack.h b/glx/unpack.h index 256073470..01994a3cc 100644 --- a/glx/unpack.h +++ b/glx/unpack.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef __GLX_unpack_h__ #define __GLX_unpack_h__ diff --git a/include/inpututils.h b/include/inpututils.h index 49b1c1074..111718df8 100644 --- a/include/inpututils.h +++ b/include/inpututils.h @@ -21,11 +21,6 @@ * DEALINGS IN THE SOFTWARE. * */ - -#ifdef HAVE_DIX_CONFIG_H -#include "dix-config.h" -#endif - #ifndef INPUTUTILS_H #define INPUTUTILS_H diff --git a/include/vidmodestr.h b/include/vidmodestr.h index b47daa779..5aad26830 100644 --- a/include/vidmodestr.h +++ b/include/vidmodestr.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _VIDMODEPROC_H_ #define _VIDMODEPROC_H_ diff --git a/meson.build b/meson.build index 1b901c65b..bb5756a94 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,6 @@ project('xserver', 'c', ) release_date = '2025-07-04' -add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc']) cc = meson.get_compiler('c') add_project_arguments('-fno-strict-aliasing', language : 'c') diff --git a/mi/mivalidate.h b/mi/mivalidate.h index 4c64ab34e..1b423f85c 100644 --- a/mi/mivalidate.h +++ b/mi/mivalidate.h @@ -26,10 +26,6 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef MIVALIDATE_H #define MIVALIDATE_H diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h index 00e95b8a0..877e1fddb 100644 --- a/miext/rootless/rootlessWindow.h +++ b/miext/rootless/rootlessWindow.h @@ -26,11 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _ROOTLESSWINDOW_H #define _ROOTLESSWINDOW_H diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h index 6e606d00a..2de511dbc 100644 --- a/xfixes/xfixesint.h +++ b/xfixes/xfixesint.h @@ -41,11 +41,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _XFIXESINT_H_ #define _XFIXESINT_H_