diff --git a/src/test/app/TestHostFunctions.h b/src/test/app/TestHostFunctions.h
index 68cf42b362..205c9cc1a0 100644
--- a/src/test/app/TestHostFunctions.h
+++ b/src/test/app/TestHostFunctions.h
@@ -1,13 +1,13 @@
 #include <test/app/wasm_fixtures/fixtures.h>
 #include <test/jtx.h>
 
-#include <xrpld/app/misc/AmendmentTable.h>
-#include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/app/wasm/HostFunc.h>
 #include <xrpld/app/wasm/WasmVM.h>
 
+#include <xrpl/ledger/AmendmentTable.h>
 #include <xrpl/ledger/detail/ApplyViewBase.h>
 #include <xrpl/protocol/digest.h>
+#include <xrpl/tx/transactors/NFT/NFTokenUtils.h>
 
 namespace xrpl {
 
diff --git a/src/xrpld/app/wasm/HostFuncImpl.h b/src/xrpld/app/wasm/HostFuncImpl.h
index d8e080a8ef..1760be7c02 100644
--- a/src/xrpld/app/wasm/HostFuncImpl.h
+++ b/src/xrpld/app/wasm/HostFuncImpl.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <xrpld/app/tx/detail/ApplyContext.h>
 #include <xrpld/app/wasm/HostFunc.h>
 
+#include <xrpl/tx/ApplyContext.h>
+
 namespace xrpl {
 class WasmHostFunctionsImpl : public HostFunctions
 {
diff --git a/src/xrpld/app/wasm/detail/HostFuncImplLedgerHeader.cpp b/src/xrpld/app/wasm/detail/HostFuncImplLedgerHeader.cpp
index 57ef79e11a..37e2796bf6 100644
--- a/src/xrpld/app/wasm/detail/HostFuncImplLedgerHeader.cpp
+++ b/src/xrpld/app/wasm/detail/HostFuncImplLedgerHeader.cpp
@@ -1,6 +1,6 @@
-#include <xrpld/app/misc/AmendmentTable.h>
 #include <xrpld/app/wasm/HostFuncImpl.h>
 
+#include <xrpl/ledger/AmendmentTable.h>
 #include <xrpl/protocol/digest.h>
 
 namespace xrpl {
@@ -42,7 +42,7 @@ WasmHostFunctionsImpl::isAmendmentEnabled(uint256 const& amendmentId)
 Expected<int32_t, HostFunctionError>
 WasmHostFunctionsImpl::isAmendmentEnabled(std::string_view const& amendmentName)
 {
-    auto const& table = ctx.app.getAmendmentTable();
+    auto const& table = ctx.registry.getAmendmentTable();
     auto const amendment = table.find(std::string(amendmentName));
     return ctx.view().rules().enabled(amendment);
 }
diff --git a/src/xrpld/app/wasm/detail/HostFuncImplNFT.cpp b/src/xrpld/app/wasm/detail/HostFuncImplNFT.cpp
index 7c4ee00406..298cd1f941 100644
--- a/src/xrpld/app/wasm/detail/HostFuncImplNFT.cpp
+++ b/src/xrpld/app/wasm/detail/HostFuncImplNFT.cpp
@@ -1,8 +1,8 @@
-#include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/app/wasm/HostFuncImpl.h>
 
 #include <xrpl/protocol/STBitString.h>
 #include <xrpl/protocol/digest.h>
+#include <xrpl/tx/transactors/NFT/NFTokenUtils.h>
 
 namespace xrpl {
 
diff --git a/src/xrpld/app/wasm/detail/HostFuncWrapper.cpp b/src/xrpld/app/wasm/detail/HostFuncWrapper.cpp
index 0d245c526c..bbe6003d63 100644
--- a/src/xrpld/app/wasm/detail/HostFuncWrapper.cpp
+++ b/src/xrpld/app/wasm/detail/HostFuncWrapper.cpp
@@ -1,9 +1,13 @@
-#include <xrpld/app/tx/detail/NFTokenUtils.h>
 #include <xrpld/app/wasm/HostFunc.h>
 #include <xrpld/app/wasm/HostFuncWrapper.h>
 
 #include <xrpl/protocol/Asset.h>
+#include <xrpl/protocol/KeyType.h>
+#include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STNumber.h>
+#include <xrpl/protocol/SecretKey.h>
+#include <xrpl/protocol/Seed.h>
 #include <xrpl/protocol/digest.h>
 
 namespace xrpl {