diff --git a/src/H5CX.c b/src/H5CX.c
index 0c6c8733703..cdc6467a09f 100644
--- a/src/H5CX.c
+++ b/src/H5CX.c
@@ -300,9 +300,9 @@ typedef struct H5CX_t {
     bool no_selection_io_cause_valid; /* Whether reason for not performing selection I/O is valid */
 
     uint32_t
-            actual_selection_io_mode; /* Actual selection I/O mode used (H5D_ACTUAL_SELECTION_IO_MODE_NAME) */
-    hbool_t actual_selection_io_mode_set;   /* Whether actual selection I/O mode is set */
-    hbool_t actual_selection_io_mode_valid; /* Whether actual selection I/O mode is valid */
+         actual_selection_io_mode; /* Actual selection I/O mode used (H5D_ACTUAL_SELECTION_IO_MODE_NAME) */
+    bool actual_selection_io_mode_set;   /* Whether actual selection I/O mode is set */
+    bool actual_selection_io_mode_valid; /* Whether actual selection I/O mode is valid */
 
     /* Cached LCPL properties */
     H5T_cset_t encoding;                 /* Link name character encoding */
diff --git a/src/H5FDint.c b/src/H5FDint.c
index 5d3a80212ef..a0b2c7d1ecb 100644
--- a/src/H5FDint.c
+++ b/src/H5FDint.c
@@ -376,7 +376,7 @@ H5FD_read_vector(H5FD_t *file, uint32_t count, H5FD_mem_t types[], haddr_t addrs
     size_t     size      = 0;
     H5FD_mem_t type      = H5FD_MEM_DEFAULT;
     hid_t      dxpl_id   = H5I_INVALID_HID; /* DXPL for operation */
-    hbool_t    is_raw    = FALSE;           /* Does this include raw data */
+    bool       is_raw    = false;           /* Does this include raw data */
     herr_t     ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -461,7 +461,7 @@ H5FD_read_vector(H5FD_t *file, uint32_t count, H5FD_mem_t types[], haddr_t addrs
 
                     /* Check for raw data operation */
                     if (type == H5FD_MEM_DRAW)
-                        is_raw = TRUE;
+                        is_raw = true;
                 }
             }
 
@@ -618,7 +618,7 @@ H5FD_write_vector(H5FD_t *file, uint32_t count, H5FD_mem_t types[], haddr_t addr
     H5FD_mem_t type = H5FD_MEM_DEFAULT;
     hid_t      dxpl_id;                 /* DXPL for operation */
     haddr_t    eoa       = HADDR_UNDEF; /* EOA for file */
-    hbool_t    is_raw    = FALSE;       /* Does this include raw data */
+    bool       is_raw    = false;       /* Does this include raw data */
     herr_t     ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 9c8ccdd8de4..2668b27cead 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -38,7 +38,7 @@ static hid_t H5FD_MPIO_g = 0;
 
 /* Whether to allow collective I/O operations */
 /* (Can be changed by setting "HDF5_MPI_OPT_TYPES" environment variable to '0' or '1') */
-hbool_t H5FD_mpi_opt_types_g = true;
+bool H5FD_mpi_opt_types_g = true;
 
 /* Whether the driver initialized MPI on its own */
 static bool H5FD_mpi_self_initialized = false;
diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c
index f570038ddc3..805029f3ca6 100644
--- a/src/H5Fmpi.c
+++ b/src/H5Fmpi.c
@@ -284,7 +284,7 @@ H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F__get_mpi_atomicity(const H5F_t *file, hbool_t *flag)
+H5F__get_mpi_atomicity(const H5F_t *file, bool *flag)
 {
     herr_t ret_value = SUCCEED;
 
diff --git a/src/H5O.c b/src/H5O.c
index e515e19ec63..706a8ec4a36 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -2149,14 +2149,14 @@ H5Oenable_mdc_flushes(hid_t object_id)
 /*-------------------------------------------------------------------------
  * Function:    H5O__are_mdc_flushes_disabled
  *
- * Purpose:     Private version of cork status getter.
+ * Purpose:     Private version of cork status getter
  *
  * Return:      SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O__are_mdc_flushes_disabled(const H5O_loc_t *oloc, hbool_t *are_disabled)
+H5O__are_mdc_flushes_disabled(const H5O_loc_t *oloc, bool *are_disabled)
 {
     herr_t ret_value = SUCCEED;