diff --git a/include/tool.h.base b/include/tool.h.base
index 74e624c06..09b406482 100644
--- a/include/tool.h.base
+++ b/include/tool.h.base
@@ -79,8 +79,11 @@ extern const Char *VG_(libdir);
 /* The major version number indicates binary-incompatible changes to the
    interface;  if the core and tool major versions don't match, Valgrind
    will abort.  The minor version indicates binary-compatible changes.
+
+   (Update: as it happens, we're never using the minor version number, because
+   there's no point in doing so.)
 */
-#define VG_CORE_INTERFACE_MAJOR_VERSION   6
+#define VG_CORE_INTERFACE_MAJOR_VERSION   7
 #define VG_CORE_INTERFACE_MINOR_VERSION   0
 
 typedef struct _ToolInfo {
diff --git a/valgrind.pc.in b/valgrind.pc.in
index 1b5e3384d..883f56987 100644
--- a/valgrind.pc.in
+++ b/valgrind.pc.in
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/valgrind
 
 Name: Valgrind
 Description: Program supervision framework for x86-GNU/Linux
 Version: @VERSION@
 Requires:
 Libs:
-Cflags: -I${includedir} -I${includedir}/@VG_ARCH@ -I${includedir}/@VG_PLATFORM@
+Cflags: -I${includedir} -I${includedir}/@VG_ARCH@ -I${includedir}/@VG_OS@ -I${includedir}/@VG_PLATFORM@ @ARCH_TOOL_AM_CFLAGS@