diff --git a/coregrind/core.h b/coregrind/core.h
index 69a57a0..4b55377 100644
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -1633,5 +1633,5 @@
 #include "config.h"
 
 /*--------------------------------------------------------------------*/
-/*--- end                                                   core.h ---*/
+/*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/
diff --git a/coregrind/docs/coregrind_core.html b/coregrind/docs/coregrind_core.html
index 765096a..feaf757 100644
--- a/coregrind/docs/coregrind_core.html
+++ b/coregrind/docs/coregrind_core.html
@@ -294,7 +294,7 @@
 situation you might as well stop your program and fix it, because
 Valgrind won't tell you anything else useful after this.  Note that
 the 300/30000 limits apply after suppressed errors are removed.  These
-limits are defined in <code>vg_include.h</code> and can be increased
+limits are defined in <code>core.h</code> and can be increased
 if necessary.
 
 <p>
diff --git a/include/vg_kerneliface.h b/include/vg_kerneliface.h
index 7dc4825..69d61f9 100644
--- a/include/vg_kerneliface.h
+++ b/include/vg_kerneliface.h
@@ -33,7 +33,7 @@
 #ifndef __VG_KERNELIFACE_H
 #define __VG_KERNELIFACE_H
 
-/* This file is ONLY to be included into vg_include.h.  Do not include
+/* This file is ONLY to be included into core.h.  Do not include
    it directly into valgrind source .c files.  This file defines types
    and constants for the kernel interface, and to make that clear
    everything is prefixed VKI. */