fixup headers a bit

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3717

diff --git a/coregrind/core.h b/coregrind/core.h
index 0c9a1e8dea7ab8e62c3b782b91af49320723ba48..05049fcd4303e33038af822bf9419905d729ff4d 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -83,7 +83,6 @@
 */
 
 #include "tool.h"          // tool stuff
-#include "core_asm.h"
 #include "core_arch.h"     // arch-specific stuff,  eg. x86/core_arch.h
 
 // Ugly: this is needed by linux/core_os.h
@@ -96,8 +95,6 @@ typedef struct _ThreadState ThreadState;
 #include "pub_core_mallocfree.h"  // for type 'ArenaId'
 #include "pub_core_stacktrace.h"  // for type 'StackTrace'
 
-#include "valgrind.h"
-
 /* ---------------------------------------------------------------------
    Global macros.
    ------------------------------------------------------------------ */

diff --git a/coregrind/m_mallocfree.c b/coregrind/m_mallocfree.c
index f2908a6a3ab0d4af91adba4b4828e64d3c2d5ba5..2be038a7b9698278df48398c24d34c68e63a8e84 100644 (file)
--- a/coregrind/m_mallocfree.c
+++ b/coregrind/m_mallocfree.c
@@ -32,6 +32,7 @@
 
 #include "core.h"
 #include "pub_core_aspacemgr.h"
+#include "valgrind.h"
 
 //zz#include "memcheck/memcheck.h"
 

diff --git a/coregrind/vg_messages.c b/coregrind/vg_messages.c
index 75c87a1e645d23cb23e0f12e84441f3cdd19a5db..2780d6e9dd7a5c6873d7e73c14df69cf085946e1 100644 (file)
--- a/coregrind/vg_messages.c
+++ b/coregrind/vg_messages.c
@@ -30,6 +30,7 @@
 */
 
 #include "core.h"
+#include "valgrind.h"
 
 #include <time.h>
 #include <sys/time.h>