diff --git a/dix/main.c b/dix/main.c
index bee5490fd..077fdea04 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -415,7 +415,6 @@ main(int argc, char *argv[], char *envp[])
 			defaultFontPath);
 	}
 	if (!SetDefaultFont(defaultTextFont)) {
-	    CloseDownDevices();
 	    FatalError("could not open default font '%s'", defaultTextFont);
 	}
 #ifdef NULL_ROOT_CURSOR
@@ -425,13 +424,11 @@ main(int argc, char *argv[], char *envp[])
         cm.yhot = 0;
 
         if (!(rootCursor = AllocCursor(NULL, NULL, &cm, 0, 0, 0, 0, 0, 0))) {
-	    CloseDownDevices();
             FatalError("could not create empty root cursor");
 	}
         AddResource(FakeClientID(0), RT_CURSOR, (pointer)rootCursor);
 #else
 	if (!(rootCursor = CreateRootCursor(defaultCursorFont, 0))) {
-	    CloseDownDevices();
 	    FatalError("could not open default cursor font '%s'",
 		       defaultCursorFont);
 	}
@@ -459,14 +456,12 @@ main(int argc, char *argv[], char *envp[])
 #ifdef PANORAMIX
 	if (!noPanoramiXExtension) {
 	    if (!PanoramiXCreateConnectionBlock()) {
-	    	CloseDownDevices();
 		FatalError("could not create connection block info");
 	    }
 	} else
 #endif
 	{
 	    if (!CreateConnectionBlock()) {
-	    	CloseDownDevices();
 	    	FatalError("could not create connection block info");
 	    }
 	}
diff --git a/os/log.c b/os/log.c
index 05e542f08..b1d628c3f 100644
--- a/os/log.c
+++ b/os/log.c
@@ -89,6 +89,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdlib.h>	/* for malloc() */
 #include <errno.h>
 
+#include "input.h"
 #include "site.h"
 #include "opaque.h"
 
@@ -404,6 +405,7 @@ void
 AbortServer(void)
 {
     OsCleanup(TRUE);
+    CloseDownDevices();
     AbortDDX();
     fflush(stderr);
     if (CoreDump)