diff --git a/src/H5AC.c b/src/H5AC.c
index 60f0230f559..31caf90efe3 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -2432,7 +2432,7 @@ H5AC_evict_tagged_metadata(H5F_t *f, haddr_t metadata_tag, hbool_t match_global)
 /*------------------------------------------------------------------------------
  * Function:    H5AC_expunge_tag_type_metadata()
  *
- * Purpose:     Wrapper for cache level function which expunge entries with
+ * Purpose:     Wrapper for cache level function which expunges entries with
  *              a specific tag and type id.
  *
  * Return:      SUCCEED on success, FAIL otherwise.
diff --git a/src/H5C.c b/src/H5C.c
index fa20165e5eb..77f3069a41a 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -61,16 +61,16 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"   /* Generic Functions */
-#include "H5Cpkg.h"      /* Cache */
-#include "H5CXprivate.h" /* API Contexts */
-#include "H5Eprivate.h"  /* Error handling */
-#include "H5Fpkg.h"      /* Files */
-#include "H5FLprivate.h" /* Free Lists */
-#include "H5Iprivate.h"  /* IDs */
-#include "H5MFprivate.h" /* File memory management */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h"  /* Property lists */
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Cpkg.h"      /* Cache                        */
+#include "H5CXprivate.h" /* API Contexts                 */
+#include "H5Eprivate.h"  /* Error handling               */
+#include "H5Fpkg.h"      /* Files                        */
+#include "H5FLprivate.h" /* Free Lists                   */
+#include "H5Iprivate.h"  /* IDs                          */
+#include "H5MFprivate.h" /* File memory management       */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Pprivate.h"  /* Property lists               */
 
 /****************/
 /* Local Macros */
diff --git a/src/H5FD.c b/src/H5FD.c
index 4357aa44fc1..65848434291 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -2193,7 +2193,7 @@ H5FD_ctl(H5FD_t *file, uint64_t op_code, uint64_t flags, const void *input, void
     else if (flags & H5FD_CTL__FAIL_IF_UNKNOWN_FLAG) {
 
         HGOTO_ERROR(H5E_VFL, H5E_FCNTL, FAIL,
-                    "VFD ctl request failed (no ctl and fail if unknown flag is set)")
+                    "VFD ctl request failed (no ctl callback and fail if unknown flag is set)")
     }
 
 done:
diff --git a/src/H5Oflush.c b/src/H5Oflush.c
index 5d5c5dadcb9..d7c7c0299ab 100644
--- a/src/H5Oflush.c
+++ b/src/H5Oflush.c
@@ -37,7 +37,6 @@
 #include "H5CXprivate.h" /* API Contexts */
 #include "H5Dprivate.h"  /* Datasets */
 #include "H5Eprivate.h"  /* Errors   */
-#include "H5ESprivate.h" /* Event Sets */
 #include "H5Fprivate.h"  /* Files    */
 #include "H5Gprivate.h"  /* Groups   */
 #include "H5Iprivate.h"  /* IDs      */