5 files changed, 14 insertions, 1 deletions
diff --git a/include/dix.h b/include/dix.h
index 34661f3b6..7a931c3ac 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -306,12 +306,19 @@ extern _X_EXPORT void FreeAllAtoms(void);
 
 extern _X_EXPORT void InitAtoms(void);
 
+extern void SaveServerAtoms(void);
+extern void ResetAtoms(void);
+
 /* main.c */
 
 extern _X_EXPORT void SetVendorRelease(int release);
 
 extern _X_EXPORT void SetVendorString(char *string);
 
+/* devices.c */
+
+extern void ResetInput(void);
+
 /* events.c */
 
 extern void SetMaskForEvent(
diff --git a/include/misc.h b/include/misc.h
index dc039113d..10970506f 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -357,6 +357,6 @@ typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */
 #endif
 
 extern _X_EXPORT unsigned long globalSerialNumber;
-extern _X_EXPORT unsigned long serverGeneration;
+#define serverGeneration 1
 
 #endif /* MISC_H */
diff --git a/include/property.h b/include/property.h
index 075eb4a0d..01379ed11 100644
--- a/include/property.h
+++ b/include/property.h
@@ -88,4 +88,6 @@ extern _X_EXPORT int DeleteProperty(
 extern _X_EXPORT void DeleteAllWindowProperties(
     WindowPtr /*pWin*/);
 
+extern void ResetProperties(WindowPtr /*pWin*/);
+
 #endif  /* PROPERTY_H */
diff --git a/include/propertyst.h b/include/propertyst.h
index 1edd11d5d..73ccce65d 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -61,6 +61,7 @@ typedef struct _Property {
 	uint32_t	format;     /* format of data for swapping - 8,16,32 */
 	uint32_t	size;       /* size of data in (format/8) bytes */
 	pointer         data;       /* private to client */
+	unsigned int	retain : 1; /* should this property be retained across server reset? */
 	PrivateRec	*devPrivates;
 } PropertyRec;
 
diff --git a/include/window.h b/include/window.h
index e13598b88..1bb51e7ce 100644
--- a/include/window.h
+++ b/include/window.h
@@ -93,6 +93,9 @@ extern _X_EXPORT Bool CreateRootWindow(
 extern _X_EXPORT void InitRootWindow(
     WindowPtr /*pWin*/);
 
+extern void ResetRootWindow(
+    WindowPtr /*pWin*/);
+
 typedef WindowPtr (* RealChildHeadProc) (WindowPtr pWin);
 
 extern _X_EXPORT void RegisterRealChildHeadProc (RealChildHeadProc proc);