diff --git a/ispc_test.cpp b/ispc_test.cpp
index 485c63c9..2e458374 100644
--- a/ispc_test.cpp
+++ b/ispc_test.cpp
@@ -61,8 +61,15 @@ extern "C" {
 #include <llvm/DerivedTypes.h>
 #include <llvm/Instructions.h>
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
+#if defined(LLVM_3_0) || defined(LLVM_3_0svn)
+  #include <llvm/ExecutionEngine/MCJIT.h>
+  #include <llvm/Support/TargetRegistry.h>
+  #include <llvm/Support/TargetSelect.h>
+#else
+  #include <llvm/Target/TargetRegistry.h>
+  #include <llvm/Target/TargetSelect.h>
+#endif
 #include <llvm/ExecutionEngine/JIT.h>
-#include <llvm/Target/TargetSelect.h>
 #include <llvm/Target/TargetOptions.h>
 #include <llvm/Target/TargetData.h>
 #include <llvm/Transforms/Scalar.h>
diff --git a/module.cpp b/module.cpp
index 1c457573..7f2bf8dd 100644
--- a/module.cpp
+++ b/module.cpp
@@ -72,12 +72,17 @@
 #include <llvm/Support/FormattedStream.h>
 #include <llvm/Support/FileUtilities.h>
 #include <llvm/Target/TargetMachine.h>
-#include <llvm/Target/TargetRegistry.h>
-#include <llvm/Target/TargetSelect.h>
+#if defined(LLVM_3_0) || defined(LLVM_3_0svn)
+  #include <llvm/Support/TargetRegistry.h>
+  #include <llvm/Support/TargetSelect.h>
+#else
+  #include <llvm/Target/TargetRegistry.h>
+  #include <llvm/Target/TargetSelect.h>
+#endif
 #include <llvm/Target/TargetOptions.h>
 #include <llvm/Target/TargetData.h>
 #if !defined(LLVM_3_0) && !defined(LLVM_3_0svn)
-#include <llvm/Target/SubtargetFeature.h>
+  #include <llvm/Target/SubtargetFeature.h>
 #endif // !LLVM_3_0
 #include <llvm/PassManager.h>
 #include <llvm/Analysis/Verifier.h>