diff --git a/backend/remill/include/remill/Arch/Arch.h b/backend/remill/include/remill/Arch/Arch.h
index 685e66e1..d449578b 100644
--- a/backend/remill/include/remill/Arch/Arch.h
+++ b/backend/remill/include/remill/Arch/Arch.h
@@ -25,7 +25,7 @@
 #pragma clang diagnostic ignored "-Wswitch-enum"
 
 #include <llvm/ADT/SmallVector.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/IRBuilder.h>
 #include <remill/BC/InstructionLifter.h>
diff --git a/backend/remill/include/remill/BC/TraceLifter.h b/backend/remill/include/remill/BC/TraceLifter.h
index f230cb25..45b1eed1 100644
--- a/backend/remill/include/remill/BC/TraceLifter.h
+++ b/backend/remill/include/remill/BC/TraceLifter.h
@@ -25,6 +25,7 @@
 #include <llvm/IR/BasicBlock.h>
 #include <llvm/IR/Constant.h>
 #include <queue>
+#include <set>
 #include <tuple>
 #include <unordered_map>
 
diff --git a/backend/remill/lib/Arch/AArch64/Arch.cpp b/backend/remill/lib/Arch/AArch64/Arch.cpp
index a8ffb932..72233677 100644
--- a/backend/remill/lib/Arch/AArch64/Arch.cpp
+++ b/backend/remill/lib/Arch/AArch64/Arch.cpp
@@ -21,7 +21,7 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <iomanip>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>
diff --git a/backend/remill/lib/Arch/Arch.cpp b/backend/remill/lib/Arch/Arch.cpp
index 7e334c3f..73129dab 100644
--- a/backend/remill/lib/Arch/Arch.cpp
+++ b/backend/remill/lib/Arch/Arch.cpp
@@ -29,6 +29,14 @@
 #include <iostream>
 #include <llvm/ADT/APInt.h>
 #include <llvm/ADT/SmallVector.h>
+#include <llvm/Config/llvm-config.h>
+// `llvm::AttributeMask` moved into its own header in LLVM 17; before that it arrived with
+// <llvm/IR/Attributes.h> and this file does not exist. Version-guarded rather than added
+// unconditionally, because the native build still runs on LLVM 16 and an unguarded include
+// breaks it with `fatal error: 'llvm/IR/AttributeMask.h' file not found`.
+#if LLVM_VERSION_MAJOR >= 17
+#  include <llvm/IR/AttributeMask.h>
+#endif
 #include <llvm/IR/BasicBlock.h>
 #include <llvm/IR/Function.h>
 #include <llvm/IR/IRBuilder.h>
diff --git a/backend/remill/lib/Arch/Name.cpp b/backend/remill/lib/Arch/Name.cpp
index d43a58a5..ef23015b 100644
--- a/backend/remill/lib/Arch/Name.cpp
+++ b/backend/remill/lib/Arch/Name.cpp
@@ -16,7 +16,7 @@
 
 #include "remill/Arch/Name.h"
 
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 
 namespace remill {
 
diff --git a/backend/remill/lib/Arch/Sleigh/AArch32Arch.cpp b/backend/remill/lib/Arch/Sleigh/AArch32Arch.cpp
index 0b2ba09f..dcf1c3df 100644
--- a/backend/remill/lib/Arch/Sleigh/AArch32Arch.cpp
+++ b/backend/remill/lib/Arch/Sleigh/AArch32Arch.cpp
@@ -25,7 +25,7 @@
 
 #include <glog/logging.h>
 #include <iomanip>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>
diff --git a/backend/remill/lib/Arch/Sleigh/ARMBase.cpp b/backend/remill/lib/Arch/Sleigh/ARMBase.cpp
index f0500a15..df67f145 100644
--- a/backend/remill/lib/Arch/Sleigh/ARMBase.cpp
+++ b/backend/remill/lib/Arch/Sleigh/ARMBase.cpp
@@ -1,5 +1,5 @@
 #include <glog/logging.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>
diff --git a/backend/remill/lib/Arch/Sleigh/X86Arch.cpp b/backend/remill/lib/Arch/Sleigh/X86Arch.cpp
index 7c25d457..2efaf85e 100644
--- a/backend/remill/lib/Arch/Sleigh/X86Arch.cpp
+++ b/backend/remill/lib/Arch/Sleigh/X86Arch.cpp
@@ -17,7 +17,7 @@
 #include "Arch.h"
 
 #include <glog/logging.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>
diff --git a/backend/remill/lib/Arch/X86/Arch.cpp b/backend/remill/lib/Arch/X86/Arch.cpp
index 1aebf33a..9ceee9c6 100644
--- a/backend/remill/lib/Arch/X86/Arch.cpp
+++ b/backend/remill/lib/Arch/X86/Arch.cpp
@@ -24,7 +24,7 @@
 
 #include <glog/logging.h>
 #include <iomanip>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/Function.h>
diff --git a/backend/remill/lib/BC/Optimizer.cpp b/backend/remill/lib/BC/Optimizer.cpp
index f83bbedf..52015c39 100644
--- a/backend/remill/lib/BC/Optimizer.cpp
+++ b/backend/remill/lib/BC/Optimizer.cpp
@@ -21,7 +21,7 @@
 #include "remill/BC/Version.h"
 
 #include <glog/logging.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 #include <llvm/Analysis/TargetLibraryInfo.h>
 #include <llvm/IR/Constants.h>
 #include <llvm/IR/DataLayout.h>
diff --git a/backend/remill/lib/OS/OS.cpp b/backend/remill/lib/OS/OS.cpp
index 3ee6b0c9..8b407418 100644
--- a/backend/remill/lib/OS/OS.cpp
+++ b/backend/remill/lib/OS/OS.cpp
@@ -18,7 +18,7 @@
 
 #include <gflags/gflags.h>
 #include <glog/logging.h>
-#include <llvm/ADT/Triple.h>
+#include <llvm/TargetParser/Triple.h>
 
 namespace remill {
 
diff --git a/lifter/Lift.cpp b/lifter/Lift.cpp
index 53ee0429..d24207ca 100644
--- a/lifter/Lift.cpp
+++ b/lifter/Lift.cpp
@@ -30,7 +30,6 @@
 #include "TraceManager.h"
 
 #include <llvm/IR/LegacyPassManager.h>
-#include <llvm/Transforms/IPO/PassManagerBuilder.h>
 #include <remill/BC/HelperMacro.h>
 #include <remill/BC/InstructionLifter.h>
 #include <remill/BC/Lifter.h>