diff --git a/libafl_cc/src/autotokens-pass.cc b/libafl_cc/src/autotokens-pass.cc
index 9f46460c86..eef3b8fa94 100644
--- a/libafl_cc/src/autotokens-pass.cc
+++ b/libafl_cc/src/autotokens-pass.cc
@@ -45,7 +45,9 @@
   #include "llvm/IR/LegacyPassManager.h"
 #endif
 
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+#if LLVM_VERSION_MAJOR < 11
+  #include "llvm/Transforms/IPO/PassManagerBuilder.h"
+#endif
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/DebugInfo.h"
@@ -53,7 +55,6 @@
 #include "llvm/IR/Verifier.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/ValueTracking.h"
@@ -224,7 +225,6 @@ void dict2file(int fd, uint8_t *mem, uint32_t len) {
 PreservedAnalyses AutoTokensPass::run(Module &M, ModuleAnalysisManager &MAM) {
 #else
 bool AutoTokensPass::runOnModule(Module &M) {
-
 #endif
 
   DenseMap<Value *, std::string *> valueMap;
@@ -683,6 +683,7 @@ bool AutoTokensPass::runOnModule(Module &M) {
 #if USE_NEW_PM
 
 #else
+  #if LLVM_VERSION_MAJOR < 11
 static void registerAutoTokensPass(const PassManagerBuilder &,
                                    legacy::PassManagerBase &PM) {
   PM.add(new AutoTokensPass());
@@ -697,4 +698,5 @@ static RegisterStandardPasses RegisterAutoTokensPass(
 
 static RegisterStandardPasses RegisterAutoTokensPass0(
     PassManagerBuilder::EP_EnabledOnOptLevel0, registerAutoTokensPass);
+  #endif
 #endif
diff --git a/libafl_cc/src/cmplog-routines-pass.cc b/libafl_cc/src/cmplog-routines-pass.cc
index 04e92f3b61..267143138a 100644
--- a/libafl_cc/src/cmplog-routines-pass.cc
+++ b/libafl_cc/src/cmplog-routines-pass.cc
@@ -40,7 +40,9 @@
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+#if LLVM_VERSION_MAJOR < 11
+  #include "llvm/Transforms/IPO/PassManagerBuilder.h"
+#endif
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Pass.h"
 #include "llvm/Analysis/ValueTracking.h"
@@ -142,7 +144,6 @@ class CmpLogRoutines : public ModulePass {
   const char *getPassName() const override {
   #else
   StringRef getPassName() const override {
-
   #endif
     return "cmplog routines";
   }
@@ -465,6 +466,7 @@ bool CmpLogRoutines::runOnModule(Module &M) {
 
 #if USE_NEW_PM
 #else
+  #if LLVM_VERSION_MAJOR < 11 /* use old pass manager */
 static void registerCmpLogRoutinesPass(const PassManagerBuilder &,
                                        legacy::PassManagerBase &PM) {
   auto p = new CmpLogRoutines();
@@ -477,10 +479,9 @@ static RegisterStandardPasses RegisterCmpLogRoutinesPass(
 static RegisterStandardPasses RegisterCmpLogRoutinesPass0(
     PassManagerBuilder::EP_EnabledOnOptLevel0, registerCmpLogRoutinesPass);
 
-  #if LLVM_VERSION_MAJOR >= 11
 static RegisterStandardPasses RegisterCmpLogRoutinesPassLTO(
     PassManagerBuilder::EP_FullLinkTimeOptimizationLast,
     registerCmpLogRoutinesPass);
-  #endif
 
+  #endif
 #endif