diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 24e2cc8902..8718b04d11 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -88,7 +88,7 @@ typedef struct _ScreenSaverStuff {
     Bool (*ExternalScreenSaver) (ScreenPtr /*pScreen */ ,
                                  int /*xstate */ ,
                                  Bool /*force */ );
-} ScreenSaverStuffRec;
+} ScreenSaverStuffRec, *ScreenSaverStuffPtr;
 
 typedef enum {
     WINDOW_VRR_DISABLED = 0,
diff --git a/include/windowstr.h b/include/windowstr.h
index d640ee7e4c..8a87f2738e 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -201,8 +201,6 @@ static inline PropertyPtr wUserProps(WindowPtr pWin) { return pWin->properties;
 
 #define HasBorder(w)	((w)->borderWidth || wClipShape(w))
 
-typedef struct _ScreenSaverStuff *ScreenSaverStuffPtr;
-
 #define SCREEN_IS_BLANKED   0
 #define SCREEN_ISNT_SAVED   1
 #define SCREEN_IS_TILED     2