diff --git a/README b/README
index 532ef0c36..0cb993f15 100644
--- a/README
+++ b/README
@@ -50,7 +50,7 @@ the latter).
 
 			OVERVIEW OF MPIR
 
-There are five classes of functions in MPIR.
+There are four classes of functions in MPIR.
 
  1. Signed integer arithmetic functions (mpz).  These functions are intended
     to be easy to use, with their regular interface.  The associated type is
diff --git a/gmp-h.in b/gmp-h.in
index 3d2009d41..306a6f5d5 100644
--- a/gmp-h.in
+++ b/gmp-h.in
@@ -532,6 +532,10 @@ typedef __mpq_struct *mpq_ptr;
 #define __GMP_UNLIKELY(cond)  (cond)
 #endif
 
+#if defined( _STDINT_H ) || defined ( _STDINT_H_ ) || defined ( _STDINT )
+#define MPIR_HAVE_STDINT 1
+#endif
+
 /* Allow direct user access to numerator and denominator of a mpq_t object.  */
 #define mpq_numref(Q) (&((Q)->_mp_num))
 #define mpq_denref(Q) (&((Q)->_mp_den))
@@ -1213,7 +1217,7 @@ __GMP_DECLSPEC void mpz_xor __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
 
 /****** Integer (i.e. Z) routines for intmaax_t/uintmax_t types ******/
 
-#if defined( _STDINT_H ) || defined ( _STDINT_H_ ) || defined ( _STDINT )
+#if defined(MPIR_HAVE_STDINT)
 
 #define __GMP_BITS_PER_UINTMAX  (8*sizeof(uintmax_t))
 
diff --git a/mpirxx.h b/mpirxx.h
index 51e2b4e49..449cac0d7 100644
--- a/mpirxx.h
+++ b/mpirxx.h
@@ -57,7 +57,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #endif
 #endif
 
-#if defined( _STDINT_H ) || defined ( _STDINT_H_ ) || defined ( _STDINT )
+#if defined(MPIR_HAVE_STDINT)
 #  if INTMAX_MAX != LONG_MAX && (INTMAX_MAX != LLONG_MAX || !defined(MPIRXX_HAVE_LLONG))
 #    define MPIRXX_INTMAX_T 1
 #  endif