diff --git a/legacy/embryo/src/bin/embryo_cc_amx.h b/legacy/embryo/src/bin/embryo_cc_amx.h
index dbba0297ed..9bbae2be3b 100644
--- a/legacy/embryo/src/bin/embryo_cc_amx.h
+++ b/legacy/embryo/src/bin/embryo_cc_amx.h
@@ -33,16 +33,10 @@
   /* The ISO C99 defines the int16_t and int_32t types. If the compiler got
    * here, these types are probably undefined.
    */
-# ifndef __int16_t_defined
+# ifndef HAVE_STDINT_H
 typedef short int           int16_t;
-# endif
-# ifndef __uint16_t_defined
 typedef unsigned short int  uint16_t;
-# endif
-# ifndef __int32_t_defined
 typedef int                 int32_t;
-# endif
-# ifndef __uint32_t_defined
 typedef unsigned int        uint32_t;
 # endif
 #endif
diff --git a/legacy/embryo/src/bin/embryo_cc_osdefs.h b/legacy/embryo/src/bin/embryo_cc_osdefs.h
index 8b87e0acc5..b668987f30 100644
--- a/legacy/embryo/src/bin/embryo_cc_osdefs.h
+++ b/legacy/embryo/src/bin/embryo_cc_osdefs.h
@@ -56,6 +56,10 @@
 # define BYTE_ORDER LITTLE_ENDIAN
 #endif
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 /* _MAX_PATH is sometimes called differently and it may be in limits.h instead
  * stdio.h.
  */