diff --git a/src/gos/gos_raw32.h b/src/gos/gos_raw32.h
index 158d9b19..a37b78ff 100644
--- a/src/gos/gos_raw32.h
+++ b/src/gos/gos_raw32.h
@@ -43,7 +43,9 @@
 
 typedef unsigned char	bool_t;
 
-#if !defined(_STDINT_H) && !defined(__stdint_h)
+#if __STDC_VERSION__ >= 199901L
+	#include <stdint.h>
+#else
 	typedef signed char		int8_t;
 	typedef unsigned char	uint8_t;
 	typedef signed short	int16_t;
@@ -52,7 +54,9 @@ typedef unsigned char	bool_t;
 	typedef unsigned int	uint32_t;
 #endif
 
-#if !defined (__need_size_t) && !defined (_STDDEF_H_) && !defined(__stddef_h)
+#if defined(__STDC__)
+	#include <stddef.h>
+#else
 	typedef uint32_t		size_t;
 #endif