diff --git a/glamor/glamor_font.c b/glamor/glamor_font.c
index c60fa787b..9b26180e9 100644
--- a/glamor/glamor_font.c
+++ b/glamor/glamor_font.c
@@ -20,6 +20,12 @@
  * OF THIS SOFTWARE.
  */
 
+#include <dix-config.h>
+
+#include <stddef.h>
+#include <X11/fonts/fontstruct.h> // libxfont2.h missed to include that
+#include <X11/fonts/libxfont2.h>
+
 #include "glamor_priv.h"
 #include "glamor_font.h"
 #include <dixfontstr.h>
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 3b8bfb87f..cca393565 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -13,12 +13,14 @@ is" without express or implied warranty.
 */
 #include <dix-config.h>
 
+#include <stddef.h>
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 #include <X11/fonts/font.h>
 #include <X11/fonts/fontstruct.h>
+#include <X11/fonts/libxfont2.h>
 
 #include "misc.h"
 #include "regionstr.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 7bf68e415..ccd663903 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -13,10 +13,12 @@ is" without express or implied warranty.
 */
 #include <dix-config.h>
 
+#include <stddef.h>
 #include <X11/X.h>
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 #include <X11/fonts/fontstruct.h>
+#include <X11/fonts/libxfont2.h>
 
 #include "dix/screenint_priv.h"
 #include "miext/extinit_priv.h"
diff --git a/include/dixfontstr.h b/include/dixfontstr.h
index eae1a3b58..dbf991d35 100644
--- a/include/dixfontstr.h
+++ b/include/dixfontstr.h
@@ -27,7 +27,6 @@ SOFTWARE.
 #include "servermd.h"
 #include "dixfont.h"
 #include <X11/fonts/fontstruct.h>
-#include <X11/fonts/libxfont2.h>
 #include <X11/Xproto.h>         /* for xQueryFontReply */
 
 #define FONTCHARSET(font)	  (font)