diff --git a/Android/app/CMakeLists.txt b/Android/app/CMakeLists.txt
index c5fe4ab40..7bc2ed5c6 100644
--- a/Android/app/CMakeLists.txt
+++ b/Android/app/CMakeLists.txt
@@ -53,8 +53,7 @@ add_library( # Sets the name of the library.
              ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSFileUtils.c
              ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSJSONCodec.c
              ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSLogger.c
-#             ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSReturnCodes.c
-#             ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSSignalInfo.c
+             ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSSignalInfo.c
              ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSStackCursor.c
              ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSStackCursor_Backtrace.c
              ${CMAKE_SOURCE_DIR}/../../Source/KSCrash/Recording/Tools/KSStackCursor_MachineContext.c
diff --git a/Source/KSCrash/Recording/Tools/KSSignalInfo.c b/Source/KSCrash/Recording/Tools/KSSignalInfo.c
index b56b57c3a..d29caf95a 100644
--- a/Source/KSCrash/Recording/Tools/KSSignalInfo.c
+++ b/Source/KSCrash/Recording/Tools/KSSignalInfo.c
@@ -49,7 +49,9 @@ typedef struct
 
 static const KSSignalCodeInfo g_sigIllCodes[] =
 {
+#ifdef ILL_NOOP
     ENUM_NAME_MAPPING(ILL_NOOP),
+#endif
     ENUM_NAME_MAPPING(ILL_ILLOPC),
     ENUM_NAME_MAPPING(ILL_ILLTRP),
     ENUM_NAME_MAPPING(ILL_PRVOPC),
@@ -69,7 +71,9 @@ static const KSSignalCodeInfo g_sigTrapCodes[] =
 
 static const KSSignalCodeInfo g_sigFPECodes[] =
 {
+#ifdef FPE_NOOP
     ENUM_NAME_MAPPING(FPE_NOOP),
+#endif
     ENUM_NAME_MAPPING(FPE_FLTDIV),
     ENUM_NAME_MAPPING(FPE_FLTOVF),
     ENUM_NAME_MAPPING(FPE_FLTUND),
@@ -82,7 +86,9 @@ static const KSSignalCodeInfo g_sigFPECodes[] =
 
 static const KSSignalCodeInfo g_sigBusCodes[] =
 {
+#ifdef BUS_NOOP
     ENUM_NAME_MAPPING(BUS_NOOP),
+#endif
     ENUM_NAME_MAPPING(BUS_ADRALN),
     ENUM_NAME_MAPPING(BUS_ADRERR),
     ENUM_NAME_MAPPING(BUS_OBJERR),
@@ -90,7 +96,9 @@ static const KSSignalCodeInfo g_sigBusCodes[] =
 
 static const KSSignalCodeInfo g_sigSegVCodes[] =
 {
+#ifdef SEGV_NOOP
     ENUM_NAME_MAPPING(SEGV_NOOP),
+#endif
     ENUM_NAME_MAPPING(SEGV_MAPERR),
     ENUM_NAME_MAPPING(SEGV_ACCERR),
 };