diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index 608025ab0b..e48b727828 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -28,9 +28,9 @@
 /*****************/
 
 /* Macros used to "unset" chunk cache configuration parameters */
-#define H5D_CHUNK_CACHE_NSLOTS_DEFAULT ((size_t)-1)
-#define H5D_CHUNK_CACHE_NBYTES_DEFAULT ((size_t)-1)
-#define H5D_CHUNK_CACHE_W0_DEFAULT     (-1.0f)
+#define H5D_CHUNK_CACHE_NSLOTS_DEFAULT SIZE_MAX
+#define H5D_CHUNK_CACHE_NBYTES_DEFAULT SIZE_MAX
+#define H5D_CHUNK_CACHE_W0_DEFAULT     (-1.0)
 
 /* Bit flags for the H5Pset_chunk_opts() and H5Pget_chunk_opts() */
 #define H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS (0x0002u)
@@ -46,11 +46,11 @@
 typedef enum H5D_layout_t {
     H5D_LAYOUT_ERROR = -1,
 
-    H5D_COMPACT    = 0, /**< raw data is very small		     */
-    H5D_CONTIGUOUS = 1, /**< the default				     */
-    H5D_CHUNKED    = 2, /**< slow and fancy			     */
-    H5D_VIRTUAL    = 3, /**< actual data is stored in other datasets     */
-    H5D_NLAYOUTS   = 4  /**< this one must be last!		     */
+    H5D_COMPACT    = 0, /**< raw data is very small */
+    H5D_CONTIGUOUS = 1, /**< the default */
+    H5D_CHUNKED    = 2, /**< slow and fancy */
+    H5D_VIRTUAL    = 3, /**< actual data is stored in other datasets */
+    H5D_NLAYOUTS   = 4  /**< this one must be last! */
 } H5D_layout_t;
 //! <!-- [H5D_layout_t_snip] -->
 
diff --git a/src/H5ESpublic.h b/src/H5ESpublic.h
index a7c2e586a1..409282c5d8 100644
--- a/src/H5ESpublic.h
+++ b/src/H5ESpublic.h
@@ -25,7 +25,7 @@
 /*****************/
 
 /* Default value for "no event set" / synchronous execution */
-#define H5ES_NONE (hid_t)0
+#define H5ES_NONE 0 /* (hid_t) */
 
 /* Special "wait" timeout values */
 #define H5ES_WAIT_FOREVER (UINT64_MAX) /* Wait until all operations complete */
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index ace7700886..0294023dc1 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -24,7 +24,7 @@
 #include "H5Ipublic.h"
 
 /* Value for the default error stack */
-#define H5E_DEFAULT (hid_t)0
+#define H5E_DEFAULT 0 /* (hid_t) */
 
 /**
  * Different kinds of error information
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 164b41200c..51c06f4873 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -84,7 +84,7 @@
     (0x0020u) /**< Restrict search to objects opened through current file ID                                 \
                    (as opposed to objects opened through any file ID accessing this file) */
 
-#define H5F_FAMILY_DEFAULT (hsize_t)0
+#define H5F_FAMILY_DEFAULT 0 /* (hsize_t) */
 
 #ifdef H5_HAVE_PARALLEL
 /**
@@ -108,7 +108,7 @@ typedef enum H5F_scope_t {
 /**
  * Unlimited file size for H5Pset_external()
  */
-#define H5F_UNLIMITED ((hsize_t)(-1L))
+#define H5F_UNLIMITED HSIZE_UNDEF
 
 /**
  * How does file close behave?
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index 4b5e9e4d87..52746498d9 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -39,12 +39,12 @@
  *
  * The maximum length of a link's name is encoded in a 32-bit unsigned integer.
  */
-#define H5L_MAX_LINK_NAME_LEN ((uint32_t)(-1)) /* (4GB - 1) */
+#define H5L_MAX_LINK_NAME_LEN UINT32_MAX
 
 /**
  * \brief Macro to indicate operation occurs on same location
  */
-#define H5L_SAME_LOC (hid_t)0
+#define H5L_SAME_LOC 0 /* (hid_t) */
 
 /**
  * \brief Current version of the H5L_class_t struct
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 5adb05e3f2..3d6968eb43 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -100,7 +100,7 @@
 #define H5P_CRT_ORDER_INDEXED 0x0002
 
 /* Default value for all property list classes */
-#define H5P_DEFAULT (hid_t)0
+#define H5P_DEFAULT 0 /* (hid_t) */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index fd85dcc40c..c2c0aefb53 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -22,7 +22,7 @@
 #include "H5Ipublic.h"
 
 /* Define atomic datatypes */
-#define H5S_ALL       (hid_t)0
+#define H5S_ALL       0 /* (hid_t) */
 #define H5S_UNLIMITED HSIZE_UNDEF
 
 /* Define user-level maximum number of dimensions */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 5301ea238c..70a119d127 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -245,7 +245,7 @@ typedef struct {
  * Indicate that a string is variable length (null-terminated in C, instead of
  * fixed length)
  */
-#define H5T_VARIABLE ((size_t)(-1))
+#define H5T_VARIABLE SIZE_MAX
 
 /* Opaque information */
 /**