diff --git a/Makefile b/Makefile
index 52382d4f..497a58a0 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ asm_32xmemory ?= 1
 else
 use_fame ?= 1
 use_cz80 ?= 1
-ifneq (,$(filter "$(ARCH)","x86" "i386" "mips" "aarch64" "riscv" "powerpc"))
+ifneq (,$(filter x86% i386% mips% aarch% riscv% powerpc% ppc%, $(ARCH)))
 use_sh2drc ?= 1
 endif
 endif
diff --git a/pico/pico_int.h b/pico/pico_int.h
index 78f32d0e..da063bc9 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 
-#ifdef UTYPES_DEFINED
+#ifndef UTYPES_DEFINED
 typedef uint8_t        u8;
 typedef int8_t         s8;
 typedef uint16_t       u16;