diff --git a/apps/codecs/libtremor/os.h b/apps/codecs/libtremor/os.h
index bb4b867e3d..bafcaedb62 100644
--- a/apps/codecs/libtremor/os.h
+++ b/apps/codecs/libtremor/os.h
@@ -25,7 +25,7 @@
 
 #  ifdef __GNUC__
 #    define STIN static inline
-#  elif _WIN32
+#  elif defined(_WIN32)
 #    define STIN static __inline__
 #  endif
 #else
diff --git a/firmware/thread.c b/firmware/thread.c
index a63641e12b..ceda09871e 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
@@ -927,7 +927,7 @@ static inline void core_sleep(void)
         : : "z"(&SBYCR-GBR) : "r1");
 }
 
-#elif CPU_MIPS == 32
+#elif defined(CPU_MIPS) && CPU_MIPS == 32
 
 /*---------------------------------------------------------------------------
  * Start the thread running and terminate it if it returns