diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
index 09eda5ec..8d2ec7dd 100644
--- a/include/jemalloc/internal/jemalloc_internal.h.in
+++ b/include/jemalloc/internal/jemalloc_internal.h.in
@@ -565,7 +565,7 @@ psz2ind(size_t psz) {
 		pszind_t lg_delta = (x < LG_SIZE_CLASS_GROUP + LG_PAGE + 1) ?
 		    LG_PAGE : x - LG_SIZE_CLASS_GROUP - 1;
 
-		size_t delta_inverse_mask = ZI(-1) << lg_delta;
+		size_t delta_inverse_mask = ZD(-1) << lg_delta;
 		pszind_t mod = ((((psz-1) & delta_inverse_mask) >> lg_delta)) &
 		    ((ZU(1) << LG_SIZE_CLASS_GROUP) - 1);
 
@@ -646,7 +646,7 @@ size2index_compute(size_t size) {
 		szind_t lg_delta = (x < LG_SIZE_CLASS_GROUP + LG_QUANTUM + 1)
 		    ? LG_QUANTUM : x - LG_SIZE_CLASS_GROUP - 1;
 
-		size_t delta_inverse_mask = ZI(-1) << lg_delta;
+		size_t delta_inverse_mask = ZD(-1) << lg_delta;
 		szind_t mod = ((((size-1) & delta_inverse_mask) >> lg_delta)) &
 		    ((ZU(1) << LG_SIZE_CLASS_GROUP) - 1);
 
diff --git a/include/jemalloc/internal/jemalloc_internal_macros.h b/include/jemalloc/internal/jemalloc_internal_macros.h
index 35a7a104..c5dd9b39 100644
--- a/include/jemalloc/internal/jemalloc_internal_macros.h
+++ b/include/jemalloc/internal/jemalloc_internal_macros.h
@@ -41,14 +41,14 @@
 #endif
 
 #define ZU(z)	((size_t)z)
-#define ZI(z)	((ssize_t)z)
+#define ZD(z)	((ssize_t)z)
 #define QU(q)	((uint64_t)q)
-#define QI(q)	((int64_t)q)
+#define QD(q)	((int64_t)q)
 
 #define KZU(z)	ZU(z##ULL)
-#define KZI(z)	ZI(z##LL)
+#define KZD(z)	ZD(z##LL)
 #define KQU(q)	QU(q##ULL)
-#define KQI(q)	QI(q##LL)
+#define KQD(q)	QI(q##LL)
 
 #ifndef __DECONST
 #  define	__DECONST(type, var)	((type)(uintptr_t)(const void *)(var))