diff --git a/Core/gb.h b/Core/gb.h
index 53cce9ff6..db077869c 100644
--- a/Core/gb.h
+++ b/Core/gb.h
@@ -9,6 +9,7 @@ extern "C" {
 #include <stdalign.h>
 #include <time.h>
 
+#ifndef GB_DISABLE_CHEAT_SEARCH
 #ifdef GB_DISABLE_CHEATS
 #define GB_DISABLE_CHEAT_SEARCH
 #else
@@ -16,6 +17,7 @@ extern "C" {
 #define GB_DISABLE_CHEAT_SEARCH
 #endif
 #endif
+#endif
 
 #include "model.h"
 #include "defs.h"
diff --git a/Makefile b/Makefile
index 42fefcfbc..a65415728 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,7 @@ ifneq ($(DISABLE_DEBUGGER),)
 CFLAGS += -DGB_DISABLE_DEBUGGER
 CPPP_FLAGS += -DGB_DISABLE_DEBUGGER
 CORE_FILTER += Core/debugger.c Core/sm83_disassembler.c Core/symbol_hash.c
+DISABLE_CHEAT_SEARCH := 1
 else
 CPPP_FLAGS += -UGB_DISABLE_DEBUGGER
 endif
@@ -79,10 +80,19 @@ ifneq ($(DISABLE_CHEATS),)
 CFLAGS += -DGB_DISABLE_CHEATS
 CPPP_FLAGS += -DGB_DISABLE_CHEATS
 CORE_FILTER += Core/cheats.c
+DISABLE_CHEAT_SEARCH := 1
 else
 CPPP_FLAGS += -UGB_DISABLE_CHEATS
 endif
 
+ifneq ($(DISABLE_CHEAT_SEARCH),)
+CFLAGS += -DGB_DISABLE_CHEAT_SEARCH
+CPPP_FLAGS += -DGB_DISABLE_CHEAT_SEARCH
+CORE_FILTER += Core/cheat_search.c
+else
+CPPP_FLAGS += -UGB_DISABLE_CHEAT_SEARCH
+endif
+
 ifneq ($(CORE_FILTER)$(DISABLE_TIMEKEEPING),)
 ifneq ($(MAKECMDGOALS),lib)
 $(error SameBoy features can only be disabled when compiling the 'lib' target)
@@ -268,7 +278,7 @@ ifeq ($(SYSROOT),)
 $(error Could not find an iOS SDK)
 endif
 CFLAGS += -arch arm64 -miphoneos-version-min=$(IOS_MIN) -isysroot $(SYSROOT) -IAppleCommon -DGB_DISABLE_DEBUGGER
-CORE_FILTER += Core/debugger.c Core/sm83_disassembler.c Core/symbol_hash.c
+CORE_FILTER += Core/debugger.c Core/sm83_disassembler.c Core/symbol_hash.c Core/cheat_search.c
 LDFLAGS += -arch arm64
 OCFLAGS += -x objective-c -fobjc-arc -Wno-deprecated-declarations -isysroot $(SYSROOT)
 LDFLAGS += -miphoneos-version-min=$(IOS_MIN)  -isysroot $(SYSROOT)