diff --git a/src/include/c.h b/src/include/c.h
index 726f0f3f88db099f16d17ccd0b7029f0d36902f2..f1f8b11877a72b22df1c78fccc0f4fd9ef8d3e47 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -340,6 +340,11 @@ typedef unsigned PG_INT128_TYPE uint128;
 #define PG_INT64_MAX	INT64CONST(0x7FFFFFFFFFFFFFFF)
 #define PG_UINT64_MAX	UINT64CONST(0xFFFFFFFFFFFFFFFF)
 
+/* Max value of size_t might also be missing if we don't have stdint.h */
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t) -1)
+#endif
+
 /* Select timestamp representation (float8 or int64) */
 #ifdef USE_INTEGER_DATETIMES
 #define HAVE_INT64_TIMESTAMP
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index e6334a203851499acf5c9e9c67f670f2cf08473c..5125833b6a91e82884a1d3d00917af68fc5463b2 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -41,7 +41,7 @@
 
 #define AllocSizeIsValid(size)	((Size) (size) <= MaxAllocSize)
 
-#define MaxAllocHugeSize	((Size) -1 >> 1)	/* SIZE_MAX / 2 */
+#define MaxAllocHugeSize	(SIZE_MAX / 2)
 
 #define AllocHugeSizeIsValid(size)	((Size) (size) <= MaxAllocHugeSize)
 
diff --git a/src/timezone/private.h b/src/timezone/private.h
index f031b17b7eff0ecab9c55ad04a962679f8c072c3..f78053660e8dc1dafd8d72270a79fc11bea8fd87 100644
--- a/src/timezone/private.h
+++ b/src/timezone/private.h
@@ -48,10 +48,6 @@
 /* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */
 #define is_digit(c) ((unsigned)(c) - '0' <= 9)
 
-#ifndef SIZE_MAX
-#define SIZE_MAX ((size_t) -1)
-#endif
-
 /*
  * SunOS 4.1.1 libraries lack remove.
  */