diff --git a/lib/libsysdecode/linux.c b/lib/libsysdecode/linux.c
index 1ad3b4f89806..e0bd463ca89e 100644
--- a/lib/libsysdecode/linux.c
+++ b/lib/libsysdecode/linux.c
@@ -35,9 +35,9 @@
 
 #ifdef __aarch64__
 #include <arm64/linux/linux.h>
-#elif __i386__
+#elif defined(__i386__)
 #include <i386/linux/linux.h>
-#elif __amd64__
+#elif defined(__amd64__)
 #include <amd64/linux/linux.h>
 #else
 #error "Unsupported Linux arch"
diff --git a/lib/libsysdecode/syscallnames.c b/lib/libsysdecode/syscallnames.c
index da356d8ac016..cb7b55cc1607 100644
--- a/lib/libsysdecode/syscallnames.c
+++ b/lib/libsysdecode/syscallnames.c
@@ -50,7 +50,7 @@ static
 static
 #ifdef __aarch64__
 #include <arm64/linux/linux_syscalls.c>
-#elif __amd64__
+#elif defined(__amd64__)
 #include <amd64/linux/linux_syscalls.c>
 #else
 #include <i386/linux/linux_syscalls.c>