X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=vm%2FDalvik.h;h=eecbf8d3792556994ce0297c64ef033e10539f18;hb=c5d0614f778e0f26db913fdc7320f08e9417e984;hp=7164ec4e963efbf53012c5c819391a4a7cf97057;hpb=2813bc84a008b983e75462f287f6cdc001e10d13;p=android-x86%2Fdalvik.git

diff --git a/vm/Dalvik.h b/vm/Dalvik.h
index 7164ec4e9..eecbf8d37 100644
--- a/vm/Dalvik.h
+++ b/vm/Dalvik.h
@@ -17,10 +17,8 @@
 /*
  * All-inclusive internal header file.  Include this to get everything useful.
  */
-#ifndef _DALVIK_DALVIK
-#define _DALVIK_DALVIK
-
-#include <pthread.h>
+#ifndef DALVIK_DALVIK_H_
+#define DALVIK_DALVIK_H_
 
 #include "Common.h"
 #include "Inlines.h"
@@ -28,8 +26,10 @@
 #include "Bits.h"
 #include "BitVector.h"
 #include "libdex/SysUtil.h"
+#include "libdex/DexDebugInfo.h"
 #include "libdex/DexFile.h"
 #include "libdex/DexProto.h"
+#include "libdex/DexUtf.h"
 #include "libdex/ZipArchive.h"
 #include "DvmDex.h"
 #include "RawDexFile.h"
@@ -57,11 +57,9 @@
 #include "alloc/Alloc.h"
 #include "alloc/CardTable.h"
 #include "alloc/HeapDebug.h"
-#include "alloc/HeapWorker.h"
 #include "alloc/WriteBarrier.h"
 #include "oo/AccessCheck.h"
 #include "JarFile.h"
-#include "Properties.h"
 #include "jdwp/Jdwp.h"
 #include "SignalCatcher.h"
 #include "StdioConverter.h"
@@ -86,4 +84,4 @@
 #include "InlineNative.h"
 #include "oo/ObjectInlines.h"
 
-#endif /*_DALVIK_DALVIK*/
+#endif  // DALVIK_DALVIK_H_