From f0d38b8c5ee79b0e3b87e9546bd00911f6069e61 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 21 May 2025 12:03:39 +0200
Subject: [PATCH] (need_nv) xf86ConfigLayout

---
 hw/xfree86/common/xf86AutoConfig.c | 2 +-
 hw/xfree86/common/xf86Priv.h       | 1 -
 hw/xfree86/common/xf86_priv.h      | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index f1f09a977..1df8458b1 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -33,7 +33,7 @@
 #include <xorg-config.h>
 #endif
 
-#include "xf86.h"
+#include "xf86_priv.h"
 #include "xf86Parser_priv.h"
 #include "xf86tokens.h"
 #include "xf86Config.h"
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 785da63dd..e9e36b0f2 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -44,7 +44,6 @@ extern _X_EXPORT int xf86Depth;
 /* Other parameters */
 
 extern _X_EXPORT xf86InfoRec xf86Info;
-extern _X_EXPORT serverLayoutRec xf86ConfigLayout;
 
 extern _X_EXPORT DriverPtr *xf86DriverList;
 extern _X_EXPORT int xf86NumDrivers;
diff --git a/hw/xfree86/common/xf86_priv.h b/hw/xfree86/common/xf86_priv.h
index 194cc2b76..0499be5c5 100644
--- a/hw/xfree86/common/xf86_priv.h
+++ b/hw/xfree86/common/xf86_priv.h
@@ -43,6 +43,8 @@ extern const char *xf86LogFile;
 extern MessageType xf86LogFileFrom;
 extern Bool xf86LogFileWasOpened;
 
+extern serverLayoutRec xf86ConfigLayout;
+
 /* xf86Cursor.c */
 void xf86LockZoom(ScreenPtr pScreen, int lock);
 void xf86InitViewport(ScrnInfoPtr pScr);