diff --git a/src/hx/gc/GcCommon.cpp b/src/hx/gc/GcCommon.cpp
index 815f0d656..92af75f16 100644
--- a/src/hx/gc/GcCommon.cpp
+++ b/src/hx/gc/GcCommon.cpp
@@ -3,6 +3,7 @@
 #include <map>
 #include <vector>
 #include <set>
+#include <cstdio>
 #include <stdlib.h>
 
 #if defined(HXCPP_CAPTURE_x64) && !defined(__GNUC__)
diff --git a/tools/hxcpp/BuildTool.hx b/tools/hxcpp/BuildTool.hx
index cd5a48f5b..bdbb60ef8 100644
--- a/tools/hxcpp/BuildTool.hx
+++ b/tools/hxcpp/BuildTool.hx
@@ -153,7 +153,9 @@ class BuildTool
          }
          else if (mDefines.exists("android"))
          {
-            arm64 = true;
+            // HXCPP_X86_64 is not counted as 64-bit above
+            m64 = mDefines.exists("HXCPP_X86_64");
+            arm64 = !m64;
          }
          else
          {