From: Nicholas Nethercote <njn@valgrind.org>
Date: Sun, 15 May 2005 03:52:40 +0000 (+0000)
Subject: fixup headers a bit
X-Git-Tag: svn/VALGRIND_3_0_0~601
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=944f1aa854bad2e3214699eed7fa8bfa5b900e6d;p=thirdparty%2Fvalgrind.git

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 0c9a1e8dea..05049fcd43 100644
--- 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 f2908a6a3a..2be038a7b9 100644
--- 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 75c87a1e64..2780d6e9dd 100644
--- 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>