diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index cfb195b0b7..dee70cf6fa 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -254,18 +254,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
         ((screenInfo.bitmapBitOrder == LSBFirst) ?
          BitmapFormatBitOrderLSB : BitmapFormatBitOrderMSB) |
         BitmapFormatImageRectMin |
-#if GLYPHPADBYTES == 1
-        BitmapFormatScanlinePad8 |
-#endif
-#if GLYPHPADBYTES == 2
-        BitmapFormatScanlinePad16 |
-#endif
-#if GLYPHPADBYTES == 4
         BitmapFormatScanlinePad32 |
-#endif
-#if GLYPHPADBYTES == 8
-        BitmapFormatScanlinePad64 |
-#endif
         BitmapFormatScanlineUnit8;
 
     if (client->clientGone) {
diff --git a/fb/fb.h b/fb/fb.h
index ecd98d89bb..f75f7d48ab 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -68,9 +68,6 @@
 #define FB_UNIT	    (1 << FB_SHIFT)
 #define FB_MASK	    (FB_UNIT - 1)
 #define FB_ALLONES  ((FbBits) -1)
-#if GLYPHPADBYTES != 4
-#error "GLYPHPADBYTES must be 4"
-#endif
 #define FB_STIP_SHIFT	LOG2_BITMAP_PAD
 #define FB_STIP_UNIT	(1 << FB_STIP_SHIFT)
 #define FB_STIP_MASK	(FB_STIP_UNIT - 1)
diff --git a/include/dixfontstr.h b/include/dixfontstr.h
index 4cc74fe10a..69a5def069 100644
--- a/include/dixfontstr.h
+++ b/include/dixfontstr.h
@@ -65,24 +65,6 @@ SOFTWARE.
 #define N2dChars(pfont)	(N1dChars(pfont) * \
 			 (FONTLASTROW(pfont) - FONTFIRSTROW(pfont) + 1))
 
-#ifndef GLYPHPADBYTES
-#define GLYPHPADBYTES -1
-#endif
-
-#if GLYPHPADBYTES == 0 || GLYPHPADBYTES == 1
-#define	GLYPHWIDTHBYTESPADDED(pci)	(GLYPHWIDTHBYTES(pci))
-#endif
-
-#if GLYPHPADBYTES == 2
-#define	GLYPHWIDTHBYTESPADDED(pci)	((GLYPHWIDTHBYTES(pci)+1) & ~0x1)
-#endif
-
-#if GLYPHPADBYTES == 4
 #define	GLYPHWIDTHBYTESPADDED(pci)	((GLYPHWIDTHBYTES(pci)+3) & ~0x3)
-#endif
-
-#if GLYPHPADBYTES == 8          /* for a cray? */
-#define	GLYPHWIDTHBYTESPADDED(pci)	((GLYPHWIDTHBYTES(pci)+7) & ~0x7)
-#endif
 
 #endif                          /* DIXFONTSTRUCT_H */
diff --git a/include/servermd.h b/include/servermd.h
index 5802af58e7..01dbf3b658 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -64,9 +64,7 @@ SOFTWARE.
 #error "Too weird to live."
 #endif
 
-#ifndef GLYPHPADBYTES
 #define GLYPHPADBYTES           4
-#endif
 
 #define BITMAP_SCANLINE_PAD  32
 #define LOG2_BITMAP_PAD		5
diff --git a/mi/miglblt.c b/mi/miglblt.c
index c81f6fb868..47a0384d77 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -144,11 +144,7 @@ miPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int ngly
             nbyGlyphWidth = GLYPHWIDTHBYTESPADDED(pci);
             nbyPadGlyph = BitmapBytePad(gWidth);
 
-            if (nbyGlyphWidth == nbyPadGlyph
-#if GLYPHPADBYTES != 4
-                && (((int) pglyph) & 3) == 0
-#endif
-                ) {
+            if (nbyGlyphWidth == nbyPadGlyph) {
                 pb = pglyph;
             }
             else {