diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index a0b1596cc..7a8343be9 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -37,7 +37,6 @@ val_PROGRAMS = \
 
 noinst_HEADERS = \
 	core.h			\
-	core_asm.h		\
 	pub_core_aspacemgr.h	\
 	pub_core_debuglog.h	\
 	pub_core_demangle.h	\
@@ -55,6 +54,7 @@ noinst_HEADERS = \
 	pub_core_tooliface.h	\
 	pub_core_translate.h	\
 	pub_core_transtab.h	\
+	pub_core_transtab_asm.h	\
 	ume.h			\
 	vg_symtab2.h		\
 	vg_symtypes.h
diff --git a/coregrind/core.h b/coregrind/core.h
index 8e67b44e6..d7c654cc4 100644
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -82,8 +82,8 @@
    external tools.
 */
 
-#include "core_asm.h"      // asm stuff
 #include "tool.h"          // tool stuff
+#include "tool_asm.h"      // XXX: temporary, for VG_() and friends
 #include "core_arch.h"     // arch-specific stuff,  eg. x86/core_arch.h
 
 // Ugly: this is needed by linux/core_os.h
diff --git a/coregrind/m_dispatch/dispatch-amd64.S b/coregrind/m_dispatch/dispatch-amd64.S
index a097b300c..58983c5df 100644
--- a/coregrind/m_dispatch/dispatch-amd64.S
+++ b/coregrind/m_dispatch/dispatch-amd64.S
@@ -31,6 +31,7 @@
 
 #include "core_asm.h"
 #include "pub_core_dispatch_asm.h"
+#include "pub_core_transtab_asm.h"
 #include "libvex_guest_offsets.h"	/* for OFFSET_amd64_RIP */
 
 
diff --git a/coregrind/m_dispatch/dispatch-arm.S b/coregrind/m_dispatch/dispatch-arm.S
index 8468a84b8..9d91a5197 100644
--- a/coregrind/m_dispatch/dispatch-arm.S
+++ b/coregrind/m_dispatch/dispatch-arm.S
@@ -31,6 +31,7 @@
 
 #include "core_asm.h"
 #include "pub_core_dispatch_asm.h"
+#include "pub_core_transtab_asm.h"
 
 .globl VG_(run_innerloop)
 VG_(run_innerloop):
diff --git a/coregrind/m_dispatch/dispatch-x86.S b/coregrind/m_dispatch/dispatch-x86.S
index 68ef22971..9b037e6f5 100644
--- a/coregrind/m_dispatch/dispatch-x86.S
+++ b/coregrind/m_dispatch/dispatch-x86.S
@@ -31,6 +31,7 @@
 
 #include "core_asm.h"
 #include "pub_core_dispatch_asm.h"
+#include "pub_core_transtab_asm.h"
 #include "libvex_guest_offsets.h"	/* for OFFSET_x86_EIP */
 
 
diff --git a/coregrind/pub_core_debuglog.h b/coregrind/pub_core_debuglog.h
index 8ee1653ca..16540775a 100644
--- a/coregrind/pub_core_debuglog.h
+++ b/coregrind/pub_core_debuglog.h
@@ -47,7 +47,7 @@
    portable way to avoid using stdarg.h. */
 #include <stdarg.h>
 
-#include "core_asm.h"   /* For definition of VG_ macro */
+#include "tool_asm.h"   /* For definition of VG_ macro */
 
 /* There are no tool-visible exports from m_debuglog, hence no header
    file for it. */
diff --git a/coregrind/pub_core_transtab.h b/coregrind/pub_core_transtab.h
index 6d1e46bda..4d1f5befa 100644
--- a/coregrind/pub_core_transtab.h
+++ b/coregrind/pub_core_transtab.h
@@ -37,6 +37,8 @@
 // enabling fast look-ups of them.
 //--------------------------------------------------------------------
 
+#include "pub_core_transtab_asm.h"
+
 /* The fast-cache for tt-lookup, and for finding counters. */
 extern ULong* VG_(tt_fast) [VG_TT_FAST_SIZE];
 extern UInt*  VG_(tt_fastN)[VG_TT_FAST_SIZE];
diff --git a/coregrind/core_asm.h b/coregrind/pub_core_transtab_asm.h
similarity index 79%
rename from coregrind/core_asm.h
rename to coregrind/pub_core_transtab_asm.h
index 07a06440e..60be73266 100644
--- a/coregrind/core_asm.h
+++ b/coregrind/pub_core_transtab_asm.h
@@ -1,13 +1,13 @@
 
 /*--------------------------------------------------------------------*/
-/*--- Asm-specific core stuff.                          core_asm.h ---*/
+/*--- Asm-only TransTab stuff.             pub_core_transtab_asm.h ---*/
 /*--------------------------------------------------------------------*/
 
 /*
    This file is part of Valgrind, a dynamic binary instrumentation
    framework.
 
-   Copyright (C) 2000-2005 Julian Seward 
+   Copyright (C) 2000-2005 Julian Seward
       jseward@acm.org
 
    This program is free software; you can redistribute it and/or
@@ -28,22 +28,15 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#ifndef __CORE_ASM_H
-#define __CORE_ASM_H
-
-#include "tool_asm.h"            // tool asm stuff
-#include "core_arch_asm.h"       // arch-specific asm stuff
-
-/* This file is included in all Valgrind source files, including
-   assembly ones. */
-
+#ifndef __PUB_CORE_TRANSTAB_ASM_H
+#define __PUB_CORE_TRANSTAB_ASM_H
 
 /* Constants for the fast translation lookup cache. */
 #define VG_TT_FAST_BITS 16
 #define VG_TT_FAST_SIZE (1 << VG_TT_FAST_BITS)
 #define VG_TT_FAST_MASK ((VG_TT_FAST_SIZE) - 1)
 
-#endif /* __CORE_ASM_H */
+#endif   // __PUB_CORE_TRANSTAB_ASM_H
 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/