diff --git a/coregrind/m_debuglog.c b/coregrind/m_debuglog.c
index 961d86c54..86e7fc845 100644
--- a/coregrind/m_debuglog.c
+++ b/coregrind/m_debuglog.c
@@ -54,7 +54,7 @@
 #include "pub_core_basics.h"     /* basic types */
 #include "pub_core_vkiscnums.h"  /* for syscall numbers */
 #include "pub_core_debuglog.h"   /* our own iface */
-#include "valgrind.h"            /* for RUNNING_ON_VALGRIND */
+#include "pub_core_clreq.h"      /* for RUNNING_ON_VALGRIND */
 
 static Bool clo_xml;
 
diff --git a/coregrind/m_gdbserver/server.h b/coregrind/m_gdbserver/server.h
index 41c9adb0f..ca016e98c 100644
--- a/coregrind/m_gdbserver/server.h
+++ b/coregrind/m_gdbserver/server.h
@@ -45,7 +45,7 @@
 #include "pub_core_gdbserver.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_vki.h"
-#include "valgrind.h"
+#include "pub_core_clreq.h"
 
 /*------------- interface m_gdbserver <=> low level gdbserver */
 
diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
index ecffc8356..094f7d52b 100644
--- a/coregrind/m_libcprint.c
+++ b/coregrind/m_libcprint.c
@@ -38,7 +38,7 @@
 #include "pub_core_libcprint.h"
 #include "pub_core_libcproc.h"   // VG_(getpid)(), VG_(read_millisecond_timer()
 #include "pub_core_options.h"
-#include "valgrind.h"            // For RUNNING_ON_VALGRIND
+#include "pub_core_clreq.h"      // For RUNNING_ON_VALGRIND
 
 
 /* ---------------------------------------------------------------------
diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 65fe23d35..93bc58e6a 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -68,7 +68,7 @@
 #include "pub_core_transtab.h"
 #include "pub_core_inner.h"
 #if defined(ENABLE_INNER_CLIENT_REQUEST)
-#include "valgrind.h"
+#include "pub_core_clreq.h"
 #endif 
 
 
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index e948bd555..bf515d98e 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -57,7 +57,7 @@
 #include "pub_core_syswrap.h"
 #include "pub_core_inner.h"
 #if defined(ENABLE_INNER_CLIENT_REQUEST)
-#include "valgrind.h"
+#include "pub_core_clreq.h"
 #endif
 
 #include "priv_types_n_macros.h"
diff --git a/drd/drd_darwin_intercepts.c b/drd/drd_darwin_intercepts.c
index d1c265100..7c611e854 100644
--- a/drd/drd_darwin_intercepts.c
+++ b/drd/drd_darwin_intercepts.c
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 #include "drd.h"
 #include "pub_tool_redir.h"
 
diff --git a/drd/drd_strmem_intercepts.c b/drd/drd_strmem_intercepts.c
index d5fb6e1e2..90af72da5 100644
--- a/drd/drd_strmem_intercepts.c
+++ b/drd/drd_strmem_intercepts.c
@@ -34,7 +34,7 @@
 #include "pub_tool_hashtable.h"
 #include "pub_tool_redir.h"
 #include "pub_tool_tooliface.h"
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 
 
 #define STRNLEN(soname, fnname)                                         \
diff --git a/exp-sgcheck/h_intercepts.c b/exp-sgcheck/h_intercepts.c
index 4c054d983..f8b4eca6f 100644
--- a/exp-sgcheck/h_intercepts.c
+++ b/exp-sgcheck/h_intercepts.c
@@ -37,7 +37,7 @@
 #include "pub_tool_hashtable.h"
 #include "pub_tool_redir.h"
 #include "pub_tool_tooliface.h"
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 
 
 /* The following intercepts are copied verbatim from
diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index ae68939a7..693d318dd 100644
--- a/helgrind/hg_intercepts.c
+++ b/helgrind/hg_intercepts.c
@@ -54,7 +54,7 @@
 
 #include "pub_tool_basics.h"
 #include "pub_tool_redir.h"
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 #include "helgrind.h"
 #include "config.h"
 
diff --git a/massif/ms_main.c b/massif/ms_main.c
index 9e60043e4..8ce620d3c 100644
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -182,7 +182,7 @@ Number of snapshots: 50
 #include "pub_tool_clientstate.h"
 #include "pub_tool_gdbserver.h"
 
-#include "valgrind.h"           // For {MALLOC,FREE}LIKE_BLOCK
+#include "pub_tool_clreq.h"           // For {MALLOC,FREE}LIKE_BLOCK
 
 //------------------------------------------------------------*/
 //--- Overview of operation                                ---*/
diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index 64df1c387..7474249fe 100644
--- a/memcheck/mc_replace_strmem.c
+++ b/memcheck/mc_replace_strmem.c
@@ -35,7 +35,7 @@
 #include "pub_tool_hashtable.h"
 #include "pub_tool_redir.h"
 #include "pub_tool_tooliface.h"
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 
 #include "mc_include.h"
 #include "memcheck.h"