diff --git a/include/xxd-embedded.h b/include/xxd-embedded.h
index 3e4604a..027a4d6 100644
--- a/include/xxd-embedded.h
+++ b/include/xxd-embedded.h
@@ -5,30 +5,20 @@
 #include <TargetConditionals.h>
 #endif
 
-#ifndef NO_CHECKRAIN
 extern unsigned char checkra1n[];
 extern unsigned int checkra1n_len;
-#endif
 
-#ifndef NO_KPF
 extern unsigned char checkra1n_kpf_pongo[];
 extern unsigned int checkra1n_kpf_pongo_len;
-#endif
 
-#ifndef NO_RAMDISK
 extern unsigned char ramdisk_dmg[];
 extern unsigned int ramdisk_dmg_len;
-#endif
 
-#ifndef NO_BINPACK
 extern unsigned char binpack_dmg[];
 extern unsigned int binpack_dmg_len;
-#endif
 
-#ifndef NO_CUSTOM_PONGO
 extern unsigned char Pongo_bin[];
 extern unsigned int Pongo_bin_len;
-#endif
 
 #if defined(__APPLE__) && (TARGET_OS_IPHONE || defined(DEV_BUILD))
 extern unsigned char libcheckra1nhelper_dylib[];
diff --git a/src/Makefile b/src/Makefile
index 283dd77..4e85c4f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,10 +26,10 @@ OBJECTS += xxd-checkra1n-kpf-pongo.o
 else
 CFLAGS += -DNO_KPF
 endif
-ifneq ($(NO_BINPACK),1)
+ifneq ($(NO_OVERLAY),1)
 OBJECTS += xxd-binpack.dmg.o
 else
-CFLAGS += -DNO_BINPACK
+CFLAGS += -DNO_OVERLAY
 endif
 ifneq ($(NO_CHECKRAIN),1)
 OBJECTS += xxd-checkra1n.o
diff --git a/src/fake_embedded.c b/src/fake_embedded.c
index 3b673df..5571605 100644
--- a/src/fake_embedded.c
+++ b/src/fake_embedded.c
@@ -15,7 +15,12 @@ unsigned char* checkra1n = NULL;
 unsigned int checkra1n_len = 0;
 #endif
 
-#ifdef NO_BINPACK
+#ifdef NO_OVERLAY
 unsigned char* binpack_dmg = NULL;
 unsigned int binpack_dmg_len = 0;
 #endif
+
+#ifdef NO_CUSTOM_PONGO
+unsigned char* Pongo_bin = NULL;
+unsigned int Pongo_bin_len = 0;
+#endif
diff --git a/src/pongo_helper.c b/src/pongo_helper.c
index ec0bd03..727e15d 100644
--- a/src/pongo_helper.c
+++ b/src/pongo_helper.c
@@ -58,7 +58,7 @@ void *pongo_usb_callback(void *arg) {
 		upload_pongo_file(handle, **ramdisk_to_upload, ramdisk_dmg_len);
 		issue_pongo_command(handle, "ramdisk");
 	}
-#ifdef NO_BINPACK
+#ifdef NO_OVERLAY
 	if (binpack_dmg_len != 0)
 #endif
 	{