diff --git a/include/llvm/Transforms/Obfuscation/Obfuscation.h b/include/llvm/Transforms/Obfuscation/Obfuscation.h
index 8b2948fb9..7833e70af 100644
--- a/include/llvm/Transforms/Obfuscation/Obfuscation.h
+++ b/include/llvm/Transforms/Obfuscation/Obfuscation.h
@@ -11,6 +11,17 @@
 #include "llvm/Transforms/Obfuscation/FunctionWrapper.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Transforms/Utils/ModuleUtils.h"
+#include "llvm/IR/Verifier.h"
+#include "llvm/IR/NoFolder.h"
+#include "llvm/IR/CFG.h"
+#include "llvm/IR/Dominators.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/InlineAsm.h"
+#include "llvm/Transforms/Obfuscation/CryptoUtils.h"
+#include "llvm/Transforms/Scalar.h"
+#if __has_include("llvm/Transforms/Utils.h")
+#include "llvm/Transforms/Utils.h"
+#endif
 using namespace std;
 using namespace llvm;
 
diff --git a/lib/Transforms/Obfuscation/Flattening.cpp b/lib/Transforms/Obfuscation/Flattening.cpp
index 715734572..14ba0f658 100644
--- a/lib/Transforms/Obfuscation/Flattening.cpp
+++ b/lib/Transforms/Obfuscation/Flattening.cpp
@@ -11,10 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Obfuscation/Flattening.h"
-#include "llvm/Bitcode/BitcodeWriter.h"
+#include "llvm/Transforms/Obfuscation/Obfuscation.h"
 #include "llvm/Transforms/Obfuscation/CryptoUtils.h"
-#include "llvm/Transforms/Scalar.h"
 #include <fcntl.h>
 #include <sys/stat.h>