diff --git a/src/target.cpp b/src/target.cpp
index a8a58013ff..5dcf98c3a2 100644
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -162,6 +162,7 @@ static const Os os_list[] = {
     OsZen,
 };
 
+// Coordinate with zig_llvm.h
 static const ZigLLVM_EnvironmentType environ_list[] = {
     ZigLLVM_UnknownEnvironment,
 
@@ -182,7 +183,6 @@ static const ZigLLVM_EnvironmentType environ_list[] = {
     ZigLLVM_Itanium,
     ZigLLVM_Cygnus,
     ZigLLVM_CoreCLR,
-    ZigLLVM_OpenCL,
     ZigLLVM_Simulator,
 };
 
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
index 3eb550dcc4..ba915bf064 100644
--- a/src/zig_llvm.cpp
+++ b/src/zig_llvm.cpp
@@ -37,6 +37,7 @@
 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
 #include <llvm/Transforms/IPO/AlwaysInliner.h>
 #include <llvm/Transforms/Scalar.h>
+#include <llvm/Transforms/Utils.h>
 
 #include <lld/Common/Driver.h>
 
diff --git a/src/zig_llvm.h b/src/zig_llvm.h
index af92850fc4..a63524281a 100644
--- a/src/zig_llvm.h
+++ b/src/zig_llvm.h
@@ -376,7 +376,6 @@ enum ZigLLVM_EnvironmentType {
     ZigLLVM_Itanium,
     ZigLLVM_Cygnus,
     ZigLLVM_CoreCLR,
-    ZigLLVM_OpenCL,
     ZigLLVM_Simulator,
 
     ZigLLVM_LastEnvironmentType = ZigLLVM_Simulator