From f886f1578c740e19e49abdc352d0d128e5241dcb Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 28 Feb 2024 11:48:46 +0100
Subject: [PATCH] (submit/property.h) include: split out non-exported stuff
 from property.h

Reduce cluttering public interface with non-exported stuff, moving those
things into a separate internal header.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/property.c                |  1 +
 dix/property_priv.h           | 20 ++++++++++++++++++++
 hw/xwayland/xwayland-screen.c |  1 +
 hw/xwayland/xwayland-window.h |  3 +++
 include/property.h            |  8 --------
 5 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 dix/property_priv.h

diff --git a/dix/property.c b/dix/property.c
index 8e60f2010..6291a910c 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -52,6 +52,7 @@ SOFTWARE.
 #include <X11/Xproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/property_priv.h"
 
 #include "windowstr.h"
 #include "propertyst.h"
diff --git a/dix/property_priv.h b/dix/property_priv.h
new file mode 100644
index 000000000..d0984abed
--- /dev/null
+++ b/dix/property_priv.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 1987, 1998  The Open Group
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_PROPERTY_PRIV_H
+#define _XSERVER_PROPERTY_PRIV_H
+
+#include "window.h"
+#include "property.h"
+
+typedef struct _PropertyStateRec {
+    WindowPtr win;
+    PropertyPtr prop;
+    int state;
+} PropertyStateRec;
+
+extern CallbackListPtr PropertyStateCallback;
+
+#endif /* _XSERVER_PROPERTY_PRIV_H */
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 62acff9a5..66477209b 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -37,6 +37,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xfuncproto.h>
 
+#include "dix/property_priv.h"
 #include "miext/extinit_priv.h"
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
diff --git a/hw/xwayland/xwayland-window.h b/hw/xwayland/xwayland-window.h
index 30d49c699..ba5c3a078 100644
--- a/hw/xwayland/xwayland-window.h
+++ b/hw/xwayland/xwayland-window.h
@@ -34,6 +34,9 @@
 #include <unistd.h>
 
 #include <X11/X.h>
+
+#include "dix/property_priv.h"
+
 #include <dix.h>
 #include <propertyst.h>
 #include <validate.h>
diff --git a/include/property.h b/include/property.h
index 6ee8a8398..e6710820e 100644
--- a/include/property.h
+++ b/include/property.h
@@ -51,14 +51,6 @@ SOFTWARE.
 
 typedef struct _Property *PropertyPtr;
 
-typedef struct _PropertyStateRec {
-    WindowPtr win;
-    PropertyPtr prop;
-    int state;
-} PropertyStateRec;
-
-extern CallbackListPtr PropertyStateCallback;
-
 extern _X_EXPORT int dixLookupProperty(PropertyPtr * /*result */ ,
                                        WindowPtr /*pWin */ ,
                                        Atom /*proprty */ ,