diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function
index 4465a60a8..b45702d83 100644
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@@ -7,7 +7,9 @@
 #include <test/random.h>
 #include <test/psa_crypto_helpers.h>
 
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "mbedtls/platform.h"
 
@@ -20,17 +22,6 @@
 #include <setjmp.h>
 #endif
 
-#ifdef _MSC_VER
-#include <basetsd.h>
-typedef UINT8 uint8_t;
-typedef INT32 int32_t;
-typedef UINT32 uint32_t;
-#else
-#include <stdint.h>
-#endif
-
-#include <string.h>
-
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <unistd.h>
 #endif