diff --git a/src/unity_internals.h b/src/unity_internals.h
index 0f4c90a2cea6b18e90f2fc25d4b9fa2d29ad0c4a..2a2dfa81bdf190185fedbd8e619cf63938ea565e 100644
--- a/src/unity_internals.h
+++ b/src/unity_internals.h
@@ -10,12 +10,12 @@
 #include <stdio.h>
 #include <setjmp.h>
 
-//Limits.h is often automatically included.
+//stdint.h is often automatically included.
 //Unity uses it to guess at the sizes of integer types, etc.
 #ifdef UNITY_USE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef UNITY_USE_STDINT_H
+#ifndef UNITY_EXCLUDE_STDINT_H
 #include <stdint.h>
 #endif
 
@@ -111,10 +111,7 @@ typedef _UU64 _U_UINT;
 typedef _US64 _U_SINT;
 
 #endif
-
-#ifndef UINTPTR_MAX
-#error "OH SHITSTICKS!"
-#endif
+
 //-------------------------------------------------------
 // Pointer Support
 //-------------------------------------------------------
diff --git a/targets/gcc.yml b/targets/gcc.yml
index fc3841b16820d9934e3cec428bc3aeeb2db39545..f3072e05ba5297c2296b5e48d804b85ed4f65d94 100644
--- a/targets/gcc.yml
+++ b/targets/gcc.yml
@@ -20,8 +20,7 @@ compiler:
     items:
       - UNITY_SUPPORT_64
       - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_TEST_CASES
-      - UNITY_USE_STDINT_H
+      - UNITY_SUPPORT_TEST_CASES
   object_files:
     prefix: '-o'
     extension: '.o'