diff --git a/classpath/jni-util.h b/classpath/jni-util.h index a73905fadf..bed4658953 100644 --- a/classpath/jni-util.h +++ b/classpath/jni-util.h @@ -15,7 +15,7 @@ #include "stdlib.h" #include "string.h" -#include "util/runtime-array.h" +#include #undef JNIEXPORT diff --git a/src/util/runtime-array.h b/include/avian/util/runtime-array.h similarity index 100% rename from src/util/runtime-array.h rename to include/avian/util/runtime-array.h diff --git a/src/arm.h b/src/arm.h index 5d2835de14..5b8cdab3db 100644 --- a/src/arm.h +++ b/src/arm.h @@ -13,7 +13,7 @@ #include "types.h" #include "common.h" -#include "util/runtime-array.h" +#include #ifdef __APPLE__ # include "libkern/OSAtomic.h" diff --git a/src/builtin.cpp b/src/builtin.cpp index eaa66ed101..865cb5708c 100644 --- a/src/builtin.cpp +++ b/src/builtin.cpp @@ -13,7 +13,7 @@ #include "processor.h" #include "util.h" -#include "util/runtime-array.h" +#include using namespace vm; diff --git a/src/classpath-avian.cpp b/src/classpath-avian.cpp index f313bffa01..de85398707 100644 --- a/src/classpath-avian.cpp +++ b/src/classpath-avian.cpp @@ -12,7 +12,7 @@ #include "classpath-common.h" #include "process.h" -#include "util/runtime-array.h" +#include using namespace vm; diff --git a/src/classpath-common.h b/src/classpath-common.h index 11c22b913f..6298d47695 100644 --- a/src/classpath-common.h +++ b/src/classpath-common.h @@ -13,7 +13,7 @@ #include "tokenizer.h" -#include "util/runtime-array.h" +#include namespace vm { diff --git a/src/codegen/arm/assembler.cpp b/src/codegen/arm/assembler.cpp index 119cc2b31f..56bd71938d 100644 --- a/src/codegen/arm/assembler.cpp +++ b/src/codegen/arm/assembler.cpp @@ -14,7 +14,7 @@ #include "alloc-vector.h" #include -#include "util/runtime-array.h" +#include #define CAST1(x) reinterpret_cast(x) #define CAST2(x) reinterpret_cast(x) diff --git a/src/codegen/compiler.cpp b/src/codegen/compiler.cpp index d67b979406..fa453974e5 100644 --- a/src/codegen/compiler.cpp +++ b/src/codegen/compiler.cpp @@ -10,7 +10,7 @@ #include "target.h" -#include "util/runtime-array.h" +#include #include #include diff --git a/src/codegen/compiler/event.cpp b/src/codegen/compiler/event.cpp index ba8c0c222a..c9bb0dcf79 100644 --- a/src/codegen/compiler/event.cpp +++ b/src/codegen/compiler/event.cpp @@ -9,7 +9,7 @@ details. */ #include "target.h" -#include "util/runtime-array.h" +#include #include "codegen/compiler/context.h" #include "codegen/compiler/event.h" diff --git a/src/codegen/x86/assembler.cpp b/src/codegen/x86/assembler.cpp index c7fcab491b..90eea322fc 100644 --- a/src/codegen/x86/assembler.cpp +++ b/src/codegen/x86/assembler.cpp @@ -15,7 +15,7 @@ #include #include -#include "util/runtime-array.h" +#include #include #define CAST1(x) reinterpret_cast(x) diff --git a/src/compile.cpp b/src/compile.cpp index 63ff48ec94..02a87cd4c8 100644 --- a/src/compile.cpp +++ b/src/compile.cpp @@ -19,7 +19,7 @@ #include #include -#include "util/runtime-array.h" +#include using namespace vm; diff --git a/src/finder.cpp b/src/finder.cpp index 479761c19f..93e95250fd 100644 --- a/src/finder.cpp +++ b/src/finder.cpp @@ -14,7 +14,7 @@ #include "finder.h" #include "lzma.h" -#include "util/runtime-array.h" +#include using namespace vm; diff --git a/src/interpret.cpp b/src/interpret.cpp index 8b9f4e12d9..c025957d48 100644 --- a/src/interpret.cpp +++ b/src/interpret.cpp @@ -16,7 +16,7 @@ #include "process.h" #include "arch.h" -#include "util/runtime-array.h" +#include using namespace vm; diff --git a/src/jnienv.cpp b/src/jnienv.cpp index 37d3a65f13..2f9492bd58 100644 --- a/src/jnienv.cpp +++ b/src/jnienv.cpp @@ -14,7 +14,7 @@ #include "processor.h" #include "constants.h" -#include "util/runtime-array.h" +#include using namespace vm; diff --git a/src/machine.cpp b/src/machine.cpp index 8555878c41..f18ff06552 100644 --- a/src/machine.cpp +++ b/src/machine.cpp @@ -17,7 +17,7 @@ #include "arch.h" #include "lzma.h" -#include "util/runtime-array.h" +#include #if defined(PLATFORM_WINDOWS) # define WIN32_LEAN_AND_MEAN diff --git a/src/main.cpp b/src/main.cpp index e70555e73e..ccd8255940 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,7 +16,7 @@ #include "system.h" #include "finder.h" -#include "util/runtime-array.h" +#include #if (defined __MINGW32__) || (defined _MSC_VER) # define PATH_SEPARATOR ';' diff --git a/src/process.cpp b/src/process.cpp index b13aa7ca4f..6f1c5dbbd8 100644 --- a/src/process.cpp +++ b/src/process.cpp @@ -10,7 +10,7 @@ #include "process.h" -#include "util/runtime-array.h" +#include using namespace vm; diff --git a/src/windows.cpp b/src/windows.cpp index 5c85eb906e..640117ed2c 100644 --- a/src/windows.cpp +++ b/src/windows.cpp @@ -25,7 +25,7 @@ #include "arch.h" #include "system.h" -#include "util/runtime-array.h" +#include #if defined(WINAPI_FAMILY)