diff --git a/common/ttysize.c b/common/ttysize.c
index 9f6ebbb48..ff389bf6c 100644
--- a/common/ttysize.c
+++ b/common/ttysize.c
@@ -33,6 +33,7 @@
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <termios.h>
+#include <limits.h>
 
 #include "missing.h"
 #include "sudo_debug.h"
diff --git a/include/missing.h b/include/missing.h
index 68434ffc7..a79782b54 100644
--- a/include/missing.h
+++ b/include/missing.h
@@ -124,22 +124,6 @@
 # define OPEN_MAX	256
 #endif
 
-#ifndef USHRT_MAX
-# define USHRT_MAX	0xffff
-#endif
-
-#ifndef INT_MAX
-# define INT_MAX	0x7fffffff
-#endif
-
-#ifndef INT_MIN
-# define INT_MIN	(-0x7fffffff-1)
-#endif
-
-#ifndef UINT_MAX
-# define UINT_MAX	0xffffffffU
-#endif
-
 #ifndef LLONG_MAX
 # if defined(QUAD_MAX)
 #  define LLONG_MAX	QUAD_MAX
@@ -156,6 +140,14 @@
 # endif
 #endif
 
+#ifndef ULONG_MAX
+# if defined(UQUAD_MAX)
+#  define ULLONG_MAX	UQUAD_MAX
+# else
+#  define ULLONG_MAX	0xffffffffffffffffULL
+# endif
+#endif
+
 #ifndef PATH_MAX
 # ifdef _POSIX_PATH_MAX
 #  define PATH_MAX		_POSIX_PATH_MAX