diff --git a/src/etlng/impl/Extraction.cpp b/src/etlng/impl/Extraction.cpp
index b1e30403..425053b0 100644
--- a/src/etlng/impl/Extraction.cpp
+++ b/src/etlng/impl/Extraction.cpp
@@ -29,13 +29,8 @@
 #include "util/Profiler.hpp"
 #include "util/log/Logger.hpp"
 
-#include <google/protobuf/repeated_field.h>
-#include <sys/types.h>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/base_uint.h>
-#include <xrpl/proto/org/xrpl/rpc/v1/get_ledger.pb.h>
-#include <xrpl/proto/org/xrpl/rpc/v1/ledger.pb.h>
-#include <xrpl/protocol/LedgerHeader.h>
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/TxMeta.h>
@@ -147,8 +142,8 @@ model::BookSuccessor
 extractSuccessor(PBBookSuccessorType successor)
 {
     return {
-        .firstBook = std::move(successor.first_book()),
-        .bookBase = std::move(successor.book_base()),
+        .firstBook = successor.first_book(),
+        .bookBase = successor.book_base(),
     };
 }
 
diff --git a/tests/unit/etlng/ExtractionTests.cpp b/tests/unit/etlng/ExtractionTests.cpp
index 69ff7083..24a3c0b7 100644
--- a/tests/unit/etlng/ExtractionTests.cpp
+++ b/tests/unit/etlng/ExtractionTests.cpp
@@ -28,16 +28,10 @@
 #include <gmock/gmock.h>
 #include <google/protobuf/repeated_ptr_field.h>
 #include <gtest/gtest.h>
-#include <xrpl/basics/Blob.h>
-#include <xrpl/basics/Slice.h>
-#include <xrpl/basics/StringUtilities.h>
-#include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/strHex.h>
 #include <xrpl/proto/org/xrpl/rpc/v1/get_ledger.pb.h>
 #include <xrpl/proto/org/xrpl/rpc/v1/ledger.pb.h>
-#include <xrpl/protocol/LedgerHeader.h>
 #include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/TxFormats.h>
 #include <xrpl/protocol/TxMeta.h>
 
diff --git a/tests/unit/etlng/RegistryTests.cpp b/tests/unit/etlng/RegistryTests.cpp
index 10debb30..e5860382 100644
--- a/tests/unit/etlng/RegistryTests.cpp
+++ b/tests/unit/etlng/RegistryTests.cpp
@@ -25,11 +25,7 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <xrpl/basics/base_uint.h>
-#include <xrpl/protocol/STTx.h>
-#include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/TxFormats.h>
-#include <xrpl/protocol/TxMeta.h>
 
 #include <cstdint>
 #include <string>