diff --git a/release/BUILD.bazel b/release/BUILD.bazel
index bc3def80..8f86d2b6 100644
--- a/release/BUILD.bazel
+++ b/release/BUILD.bazel
@@ -106,6 +106,7 @@ release(
         ":proxybuffer_containers_tar": "ProxyBuffer container",
         ":release_bundle": "Deployment scripts",
         ":softhsm_dev": "SoftHSM2 development binaries",
-        "//src/ate:windows": "ATE Win32 binaries",
+        "//src/ate:windows_win32": "ATE Win32 binaries",
+        "//src/ate:windows_x64": "ATE x64 binaries",
     },
 )
diff --git a/src/ate/BUILD.bazel b/src/ate/BUILD.bazel
index 825fd871..f4b4af85 100644
--- a/src/ate/BUILD.bazel
+++ b/src/ate/BUILD.bazel
@@ -115,7 +115,7 @@ cc_binary(
 )
 
 pkg_win(
-    name = "windows",
+    name = "windows_win32",
     srcs = [
         "ate_api.h",
         "ate_perso_blob.h",
@@ -124,6 +124,16 @@ pkg_win(
     platform = "@crt//platforms/x86_32:win32",
 )
 
+pkg_win(
+    name = "windows_x64",
+    srcs = [
+        "ate_api.h",
+        "ate_perso_blob.h",
+        ":ate",
+    ],
+    platform = "@crt//platforms/x86_64:win64",
+)
+
 go_library(
     name = "ate_go_lib",
     srcs = ["perso_blob.go"],
diff --git a/src/ate/ate_api.h b/src/ate/ate_api.h
index 2c38a327..591d80c9 100644
--- a/src/ate/ate_api.h
+++ b/src/ate/ate_api.h
@@ -13,14 +13,28 @@
 #define COMPILE_TIME_ASSERT(condition, msg) \
   typedef char COMPILE_TIME_ASSERT_##msg[(condition) ? 1 : -1]
 
-// types for TP
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-typedef unsigned int size_t;
-#else  // not _WIN32
+// Check for standard definition of fixed-width integer types
+#ifndef UINT8_MAX
+/* Fallback for old compilers which do not provide a standart <stdint.h> header
+ * (pre-C99) */
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
+#else
 #include <stdint.h>
+#endif  // UINT8_MAX
+
+// Check for standard definition of 'size_t' type
+#ifndef _SIZE_T_DEFINED
+/* Fallback for old compilers that do not provide a standard <stddef.h> header
+ * (pre-C99) */
+#if defined(_WIN64)
+typedef uint64_t size_t;  // 8 bytes size in 64-platform
+#else
+typedef uint32_t size_t;  // 4 bytes size in 32-platform
+#endif
+#endif  // _SIZE_T_DEFINED
 #endif  // _WIN32
 
 #ifdef __cplusplus