diff --git a/src/main/java/org/dcache/nearline/cta/CtaNearlineStorage.java b/src/main/java/org/dcache/nearline/cta/CtaNearlineStorage.java
index f020570..6442efd 100644
--- a/src/main/java/org/dcache/nearline/cta/CtaNearlineStorage.java
+++ b/src/main/java/org/dcache/nearline/cta/CtaNearlineStorage.java
@@ -29,9 +29,7 @@
 import org.dcache.cta.rpc.CtaRpcGrpc.CtaRpcStub;
 import org.dcache.cta.rpc.RetrieveResponse;
 import org.dcache.nearline.cta.xrootd.DataMover;
-import org.dcache.nearline.cta.xrootd.PendingRequest;
 import org.dcache.pool.nearline.spi.FlushRequest;
-import org.dcache.pool.nearline.spi.NearlineRequest;
 import org.dcache.pool.nearline.spi.NearlineStorage;
 import org.dcache.pool.nearline.spi.RemoveRequest;
 import org.dcache.pool.nearline.spi.StageRequest;
diff --git a/src/main/java/org/dcache/nearline/cta/xrootd/PendingRequest.java b/src/main/java/org/dcache/nearline/cta/PendingRequest.java
similarity index 94%
rename from src/main/java/org/dcache/nearline/cta/xrootd/PendingRequest.java
rename to src/main/java/org/dcache/nearline/cta/PendingRequest.java
index bdc6d99..38a54f1 100644
--- a/src/main/java/org/dcache/nearline/cta/xrootd/PendingRequest.java
+++ b/src/main/java/org/dcache/nearline/cta/PendingRequest.java
@@ -1,4 +1,4 @@
-package org.dcache.nearline.cta.xrootd;
+package org.dcache.nearline.cta;
 
 import java.time.Instant;
 import org.dcache.pool.nearline.spi.NearlineRequest;
diff --git a/src/main/java/org/dcache/nearline/cta/xrootd/DataMover.java b/src/main/java/org/dcache/nearline/cta/xrootd/DataMover.java
index 00a06f3..c51554e 100644
--- a/src/main/java/org/dcache/nearline/cta/xrootd/DataMover.java
+++ b/src/main/java/org/dcache/nearline/cta/xrootd/DataMover.java
@@ -26,7 +26,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentMap;
 import org.dcache.nearline.cta.CtaTransportProvider;
-import org.dcache.pool.nearline.spi.NearlineRequest;
+import org.dcache.nearline.cta.PendingRequest;
 import org.dcache.xrootd.core.XrootdAuthenticationHandlerProvider;
 import org.dcache.xrootd.core.XrootdAuthorizationHandlerProvider;
 import org.dcache.xrootd.core.XrootdDecoder;
diff --git a/src/main/java/org/dcache/nearline/cta/xrootd/DataServerHandler.java b/src/main/java/org/dcache/nearline/cta/xrootd/DataServerHandler.java
index a2b7ecc..d3bbcc7 100644
--- a/src/main/java/org/dcache/nearline/cta/xrootd/DataServerHandler.java
+++ b/src/main/java/org/dcache/nearline/cta/xrootd/DataServerHandler.java
@@ -52,6 +52,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.dcache.nearline.cta.PendingRequest;
 import org.dcache.pool.nearline.spi.FlushRequest;
 import org.dcache.pool.nearline.spi.NearlineRequest;
 import org.dcache.pool.nearline.spi.StageRequest;
diff --git a/src/test/java/org/dcache/nearline/cta/xrootd/DataMoverTest.java b/src/test/java/org/dcache/nearline/cta/xrootd/DataMoverTest.java
index 8823cb5..df015ee 100644
--- a/src/test/java/org/dcache/nearline/cta/xrootd/DataMoverTest.java
+++ b/src/test/java/org/dcache/nearline/cta/xrootd/DataMoverTest.java
@@ -10,7 +10,7 @@
 import java.net.UnknownHostException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import org.dcache.pool.nearline.spi.NearlineRequest;
+import org.dcache.nearline.cta.PendingRequest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/dcache/nearline/cta/xrootd/DataServerHandlerTest.java b/src/test/java/org/dcache/nearline/cta/xrootd/DataServerHandlerTest.java
index 1257071..ce2d822 100644
--- a/src/test/java/org/dcache/nearline/cta/xrootd/DataServerHandlerTest.java
+++ b/src/test/java/org/dcache/nearline/cta/xrootd/DataServerHandlerTest.java
@@ -28,8 +28,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import org.dcache.nearline.cta.PendingRequest;
 import org.dcache.pool.nearline.spi.FlushRequest;
-import org.dcache.pool.nearline.spi.NearlineRequest;
 import org.dcache.pool.nearline.spi.StageRequest;
 import org.dcache.vehicles.FileAttributes;
 import org.dcache.xrootd.core.XrootdException;