diff --git a/include/cglm/simd/intrin.h b/include/cglm/simd/intrin.h
index 8fb51d7..137df65 100644
--- a/include/cglm/simd/intrin.h
+++ b/include/cglm/simd/intrin.h
@@ -63,7 +63,7 @@
 #endif
 
 /* ARM Neon */
-#if defined(_WIN32)
+#if defined(_WIN32) && defined(_MSC_VER)
 /* TODO: non-ARM stuff already inported, will this be better option */
 /* #  include <intrin.h> */
 
diff --git a/test/include/common.h b/test/include/common.h
index 2eb2e83..cdeede2 100644
--- a/test/include/common.h
+++ b/test/include/common.h
@@ -145,7 +145,7 @@ typedef struct test_entry_t {
     } \
   } while(0);
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__MINGW32__) || defined(__MINGW64__) 
 # define drand48()  ((float)(rand() / (RAND_MAX + 1.0)))
 # define OK_TEXT    "ok:"
 # define FAIL_TEXT  "fail:"