From 678b025df56ca8c8dae9dd9d4c031e1e2afdcaa0 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 23 Sep 2025 12:03:07 +0200
Subject: [PATCH] include: misc.h: drop duplicate definition of CallbackListPtr

This type is already defined in `include/callback.h` - anybody who wants it
most likely needs that include file, too.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/xace.h         | 1 +
 include/callback.h  | 6 +-----
 include/dixstruct.h | 5 ++++-
 include/misc.h      | 6 ------
 include/os.h        | 2 ++
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Xext/xace.h b/Xext/xace.h
index f1d304e61a..b45b00ae4e 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_MINOR_VERSION		0
 
 #include "dix/selection_priv.h"
+#include "include/callback.h"
 
 #include "extnsionst.h"
 #include "pixmap.h"
diff --git a/include/callback.h b/include/callback.h
index a1f9f15c04..7b78deba4e 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -56,11 +56,7 @@ SOFTWARE.
  *  callback manager stuff
  */
 
-#ifndef _XTYPEDEF_CALLBACKLISTPTR
-typedef struct _CallbackList *CallbackListPtr;  /* also in misc.h */
-
-#define _XTYPEDEF_CALLBACKLISTPTR
-#endif
+typedef struct _CallbackList *CallbackListPtr;
 
 typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *);
 
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 4d112b4887..2d6dae2f6a 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -24,6 +24,10 @@ SOFTWARE.
 #ifndef DIXSTRUCT_H
 #define DIXSTRUCT_H
 
+#include <X11/Xmd.h>
+
+#include "callback.h"
+
 #include "client.h"
 #include "dix.h"
 #include "resource.h"
@@ -31,7 +35,6 @@ SOFTWARE.
 #include "gc.h"
 #include "pixmap.h"
 #include "privates.h"
-#include <X11/Xmd.h>
 
 /*
  * 	direct-mapped hash table, used by resource manager to store
diff --git a/include/misc.h b/include/misc.h
index d62bb49dbb..3fe91ac43b 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -115,12 +115,6 @@ typedef int XRetCode;
 #define FALSE 0
 #endif
 
-#ifndef _XTYPEDEF_CALLBACKLISTPTR
-typedef struct _CallbackList *CallbackListPtr;  /* also in dix.h */
-
-#define _XTYPEDEF_CALLBACKLISTPTR
-#endif
-
 typedef struct _xReq *xReqPtr;
 
 #include "os.h"                 /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
diff --git a/include/os.h b/include/os.h
index 48660ed513..d63ac190e4 100644
--- a/include/os.h
+++ b/include/os.h
@@ -47,7 +47,9 @@ SOFTWARE.
 #ifndef OS_H
 #define OS_H
 
+#include "callback.h"
 #include "misc.h"
+
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>