diff --git a/KoalaBox b/KoalaBox
index 67703a7..173e220 160000
--- a/KoalaBox
+++ b/KoalaBox
@@ -1 +1 @@
-Subproject commit 67703a72fd61b041e88b901ca689b3bfae1525a5
+Subproject commit 173e220abbaee15f73526ba08f35617f1a556bb9
diff --git a/src/smoke_api/smoke_api.cpp b/src/smoke_api/smoke_api.cpp
index 5785783..5b7bed4 100644
--- a/src/smoke_api/smoke_api.cpp
+++ b/src/smoke_api/smoke_api.cpp
@@ -25,15 +25,14 @@
 
 #include "build_config.h"
 
+// Nested #if directives lead to unexpected evaluates, so it's best to keep conditions flat.
 #if defined(KB_WIN)
 #include "koalabox/win.hpp"
-#elif defined(KB_LINUX)
-#if defined(KB_32)
+#elif defined(KB_LINUX) && defined(KB_32)
 #include "generated/32/proxy_exports.hpp"
-#else
+#elif defined(KB_LINUX) && defined(KB_64)
 #include "generated/64/proxy_exports.hpp"
 #endif
-#endif
 
 // Hooking steam_api has shown itself to be less desirable than steamclient
 // for the reasons outlined below: