diff --git a/dix/cursor.c b/dix/cursor.c
index 25d676779..a9ad34467 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -494,6 +494,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
     FontPtr cursorfont;
     int err;
     XID fontID;
+    const char defaultCursorFont[] = "cursor";
 
     fontID = FakeClientID(0);
     err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync,
diff --git a/dix/globals.c b/dix/globals.c
index acd5c4412..a5d9b7eef 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -103,8 +103,6 @@ Bool screenSaverSuspended = FALSE;
 #endif
 
 const char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
-const char *defaultTextFont = COMPILEDDEFAULTFONT;
-const char *defaultCursorFont = COMPILEDCURSORFONT;
 FontPtr defaultFont;            /* not declared in dix.h to avoid including font.h in
                                    every compilation of dix code */
 CursorPtr rootCursor;
diff --git a/dix/main.c b/dix/main.c
index 16a7d6d39..afae71901 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -224,13 +224,12 @@ dix_main(int argc, char *argv[], char *envp[])
             ErrorF("[dix] failed to set default font path '%s'",
                    defaultFontPath);
         }
-        if (!SetDefaultFont(defaultTextFont)) {
-            FatalError("could not open default font '%s'", defaultTextFont);
+        if (!SetDefaultFont("fixed")) {
+            FatalError("could not open default font");
         }
 
         if (!(rootCursor = CreateRootCursor(NULL, 0))) {
-            FatalError("could not open default cursor font '%s'",
-                       defaultCursorFont);
+            FatalError("could not open default cursor font");
         }
 
 #ifdef PANORAMIX
diff --git a/include/opaque.h b/include/opaque.h
index cfe0a6547..043f1013d 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -33,8 +33,6 @@ from The Open Group.
 
 #include "globals.h"
 
-extern _X_EXPORT const char *defaultTextFont;
-extern _X_EXPORT const char *defaultCursorFont;
 extern _X_EXPORT int LimitClients;
 extern _X_EXPORT volatile char isItTimeToYield;
 extern _X_EXPORT volatile char dispatchException;
diff --git a/include/site.h b/include/site.h
index 21bc0e2a2..fd8c8ceff 100644
--- a/include/site.h
+++ b/include/site.h
@@ -51,8 +51,6 @@ SOFTWARE.
  * The following constants contain default values for all of the variables
  * that can be initialized on the server command line or in the environment.
  */
-#define COMPILEDDEFAULTFONT	"fixed"
-#define COMPILEDCURSORFONT	"cursor"
 #ifndef COMPILEDDISPLAYCLASS
 #define COMPILEDDISPLAYCLASS	"MIT-unspecified"
 #endif
diff --git a/man/Xserver.man b/man/Xserver.man
index 192ae4eb4..2e3fbee06 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -164,12 +164,6 @@ a list of accepted extension names is printed.
 .B \-f \fIvolume\fP
 sets beep (bell) volume (allowable range: 0-100).
 .TP 8
-.B \-fc \fIcursorFont\fP
-sets default cursor font.
-.TP 8
-.B \-fn \fIfont\fP
-sets the default font.
-.TP 8
 .B \-fp \fIfontPath\fP
 sets the search path for fonts.  This path is a comma separated list
 of directories which the X server searches for font databases.
diff --git a/os/utils.c b/os/utils.c
index d1cd07ccc..7c3176344 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -526,8 +526,6 @@ UseMsg(void)
     ErrorF
         ("-deferglyphs [none|all|16] defer loading of [no|all|16-bit] glyphs\n");
     ErrorF("-f #                   bell base (0-100)\n");
-    ErrorF("-fc string             cursor font\n");
-    ErrorF("-fn string             default font name\n");
     ErrorF("-fp string             default font path\n");
     ErrorF("-help                  prints message with these options\n");
     ErrorF("+iglx                  Allow creating indirect GLX contexts\n");
@@ -775,18 +773,6 @@ ProcessCommandLine(int argc, char *argv[])
             else
                 UseMsg();
         }
-        else if (strcmp(argv[i], "-fc") == 0) {
-            if (++i < argc)
-                defaultCursorFont = argv[i];
-            else
-                UseMsg();
-        }
-        else if (strcmp(argv[i], "-fn") == 0) {
-            if (++i < argc)
-                defaultTextFont = argv[i];
-            else
-                UseMsg();
-        }
         else if (strcmp(argv[i], "-fp") == 0) {
             if (++i < argc) {
                 defaultFontPath = argv[i];