diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index c4ffd4f8117625f3aeee1bcfa6deb1edfeecc9a7..f1b718c781d9527c54b4f23a89f2d251c01338f0 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -189,6 +189,15 @@ $(BUILD)/uart.o: $(CONFVARS_FILE)
 
 FROZEN_EXTRA_DEPS = $(CONFVARS_FILE)
 
+ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
+CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
+CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
+endif
+
+ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
+CFLAGS += -DMICROPY_MODULE_FROZEN_STR
+endif
+
 .PHONY: deploy
 
 deploy: $(BUILD)/firmware-combined.bin
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index fa809d91a65130b59af0bf7547bf5ce466b59453..e77f88c83c4d9f10942424ce0aba84c9400cbc31 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -94,10 +94,7 @@
 #define MICROPY_PY_STR_BYTES_CMP_WARN (1)
 #define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_STREAMS_POSIX_API   (1)
-#define MICROPY_MODULE_FROZEN_STR   (1)
-#define MICROPY_MODULE_FROZEN_MPY   (1)
 #define MICROPY_MODULE_FROZEN_LEXER mp_lexer_new_from_str32
-#define MICROPY_QSTR_EXTRA_POOL     mp_qstr_frozen_const_pool
 
 #define MICROPY_FATFS_ENABLE_LFN       (1)
 #define MICROPY_FATFS_RPATH            (2)