diff --git a/dispatch/base.h b/dispatch/base.h
index 7123f83ad..ce65f05f6 100644
--- a/dispatch/base.h
+++ b/dispatch/base.h
@@ -323,4 +323,4 @@
 
 typedef void (*dispatch_function_t)(void *_Nullable);
 
-#endif
+#endif /* __DISPATCH_BASE__ */
diff --git a/dispatch/dispatch.h b/dispatch/dispatch.h
index 0c7bdd43a..ef65e38c2 100644
--- a/dispatch/dispatch.h
+++ b/dispatch/dispatch.h
@@ -77,4 +77,4 @@
 #undef __DISPATCH_INDIRECT__
 #endif /* !__DISPATCH_BUILDING_DISPATCH__ */
 
-#endif
+#endif /* __DISPATCH_PUBLIC__ */
diff --git a/dispatch/group.h b/dispatch/group.h
index 6b30b26c6..b98b47c16 100644
--- a/dispatch/group.h
+++ b/dispatch/group.h
@@ -276,4 +276,4 @@ __END_DECLS
 
 DISPATCH_ASSUME_NONNULL_END
 
-#endif
+#endif /* __DISPATCH_GROUP__ */
diff --git a/dispatch/introspection.h b/dispatch/introspection.h
index ea7dcd8f5..d216f462a 100644
--- a/dispatch/introspection.h
+++ b/dispatch/introspection.h
@@ -185,4 +185,4 @@ __END_DECLS
 
 DISPATCH_ASSUME_NONNULL_END
 
-#endif
+#endif /* __DISPATCH_INTROSPECTION__ */
diff --git a/dispatch/object.h b/dispatch/object.h
index 02815f3f2..3f3cf3279 100644
--- a/dispatch/object.h
+++ b/dispatch/object.h
@@ -547,4 +547,4 @@ __END_DECLS
 
 DISPATCH_ASSUME_NONNULL_END
 
-#endif
+#endif /* __DISPATCH_OBJECT__ */
diff --git a/dispatch/once.h b/dispatch/once.h
index fbce4b111..19af4f9a6 100644
--- a/dispatch/once.h
+++ b/dispatch/once.h
@@ -122,4 +122,4 @@ __END_DECLS
 
 DISPATCH_ASSUME_NONNULL_END
 
-#endif
+#endif /* __DISPATCH_ONCE__ */
diff --git a/dispatch/queue.h b/dispatch/queue.h
index 969dc880a..e2f7e05e9 100644
--- a/dispatch/queue.h
+++ b/dispatch/queue.h
@@ -1542,4 +1542,4 @@ __END_DECLS
 
 DISPATCH_ASSUME_NONNULL_END
 
-#endif
+#endif /* __DISPATCH_QUEUE__ */
diff --git a/dispatch/source.h b/dispatch/source.h
index fa960d3c2..9d605a9df 100644
--- a/dispatch/source.h
+++ b/dispatch/source.h
@@ -770,4 +770,4 @@ __END_DECLS
 
 DISPATCH_ASSUME_NONNULL_END
 
-#endif
+#endif /* __DISPATCH_SOURCE__ */
diff --git a/dispatch/time.h b/dispatch/time.h
index 02dd27f6e..9f66c195f 100644
--- a/dispatch/time.h
+++ b/dispatch/time.h
@@ -132,4 +132,4 @@ __END_DECLS
 
 DISPATCH_ASSUME_NONNULL_END
 
-#endif
+#endif /* __DISPATCH_TIME__ */