diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 88c146040..5769dd1c2 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -242,8 +242,9 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
 
     /* myNum */
     /* id */
-    miScreenInit(pScreen, NULL, xnestWidth, xnestHeight, 1, 1, xnestWidth, rootDepth, numDepths, depths, defaultVisual, /* root visual */
-                 numVisuals, visuals);
+    if (!miScreenInit(pScreen, NULL, xnestWidth, xnestHeight, 1, 1, xnestWidth, rootDepth, numDepths, depths, defaultVisual, /* root visual */
+                      numVisuals, visuals))
+        return FALSE;
 
     pScreen->defColormap = (Colormap) FakeClientID(0);
     pScreen->minInstalledCmaps = MINCMAPS;
@@ -332,9 +333,6 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
     /* overwrite miCloseScreen with our own */
     pScreen->CloseScreen = xnestCloseScreen;
 
-    if (!miScreenDevPrivateInit(pScreen, xnestWidth, NULL))
-        return FALSE;
-
     /* overwrite miSetShape with our own */
     pScreen->SetShape = xnestSetShape;
 
diff --git a/mi/mi.h b/mi/mi.h
index 8b0a231ca..2d1cd782c 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -382,11 +382,6 @@ extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap,
 extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
     );
 
-extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr pScreen,
-                                             int width,
-                                             void *pbits
-    );
-
 extern _X_EXPORT Bool miScreenInit(ScreenPtr pScreen,
                                    void *pbits,
                                    int xsize,
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 3bb52b1bc..f375d19fa 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -184,7 +184,7 @@ miCreateScreenResources(ScreenPtr pScreen)
     return TRUE;
 }
 
-Bool
+static Bool
 miScreenDevPrivateInit(ScreenPtr pScreen, int width, void *pbits)
 {
     miScreenInitParmsPtr pScrInitParms;