From 9a7db75bf62c94320a2b3aedb09188674a0def48 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 4 Jul 2025 18:54:17 +0200 Subject: [PATCH 1/3] glamor: glamor.h: don't need to include fbpict.h This header doesn't need anything from fbpict.h, so no need to include it here. Signed-off-by: Enrico Weigelt, metux IT consult --- glamor/glamor.h | 1 - glamor/glamor_addtraps.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/glamor/glamor.h b/glamor/glamor.h index 09828b068..79d627e32 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -34,7 +34,6 @@ #include #include #include -#include #ifdef GLAMOR_FOR_XORG #include #endif diff --git a/glamor/glamor_addtraps.c b/glamor/glamor_addtraps.c index 723d1ff25..2d370c7e3 100644 --- a/glamor/glamor_addtraps.c +++ b/glamor/glamor_addtraps.c @@ -27,6 +27,8 @@ */ #include +#include "fb/fbpict.h" + #include "glamor_priv.h" void From 4909f669e5eaa7f6b7f43d5eaa873c190e1b5482 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 4 Jul 2025 18:55:24 +0200 Subject: [PATCH 2/3] fb: fbpict.h: no need to include dix-config.h here All in-tree consumers already need to include dix-config.h on the very top anyways, and out-of-tree consumers don't have that include at all. Signed-off-by: Enrico Weigelt, metux IT consult --- fb/fbpict.h | 5 ----- 1 file changed, 5 deletions(-) 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_ From a24a7a7a6648f1feb6ae47a8bc9166b2454b63df Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 4 Jul 2025 19:09:08 +0200 Subject: [PATCH 3/3] fb: fbbits.h: no need to include dix-config.h here All in-tree consumers already need to include dix-config.h on the very top anyways, and there are no out-of-tree consumers (private to fb subsys) Signed-off-by: Enrico Weigelt, metux IT consult --- fb/fbbits.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fb/fbbits.h b/fb/fbbits.h index 808bf0918..3cfe535a5 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -24,15 +24,10 @@ * This file defines functions for drawing some primitives using * underlying datatypes instead of masks */ +#include "fb/fb_priv.h" #define isClipped(c,ul,lr) (((c) | ((c) - (ul)) | ((lr) - (c))) & 0x80008000) -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include "fb/fb_priv.h" - #define __FbMaskBits(x,w,l,n,r) { \ n = (w); \ r = FbRightMask((x)+n); \