diff --git a/src/gdisp/mcufont/mf_config.h b/src/gdisp/mcufont/mf_config.h
index c241eb4c..4a49daed 100644
--- a/src/gdisp/mcufont/mf_config.h
+++ b/src/gdisp/mcufont/mf_config.h
@@ -43,8 +43,17 @@
 #define MF_USE_KERNING GDISP_NEED_TEXT_KERNING
 #define MF_FONT_FILE_NAME "src/gdisp/fonts/fonts.h"
 
+
+#ifdef __AVR__
+#include <avr/pgmspace.h>
+#elif defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#include <pgmspace.h>
+#else
+#include <stdint.h>
+#define PROGMEM
 #define pgm_read_byte(addr) (*(const unsigned char *)(addr))
 #define pgm_read_word(addr) (*(const uint16_t *)(addr))
+#endif /* __AVR__ */
 
 
 /*******************************************************
diff --git a/src/gdisp/mcufont/mf_font.c b/src/gdisp/mcufont/mf_font.c
index ab15069a..d8729ba9 100644
--- a/src/gdisp/mcufont/mf_font.c
+++ b/src/gdisp/mcufont/mf_font.c
@@ -7,7 +7,16 @@
 
 #ifndef MF_NO_COMPILE
 
+#define MF_BWFONT_INTERNALS
+#define MF_RLEFONT_INTERNALS
+
 #include "mf_font.h"
+
+#include "mf_bwfont.h"
+#include "mf_rlefont.h"
+#include "mf_bwfont.h"
+#include "mf_scaledfont.h"
+
 #include <stdbool.h>
 
 /* This will be made into a list of included fonts using macro magic. */