diff --git a/basex-api/src/main/java/org/basex/http/HTTPContext.java b/basex-api/src/main/java/org/basex/http/HTTPContext.java
index d5ecf56d75..e3ee3929f6 100644
--- a/basex-api/src/main/java/org/basex/http/HTTPContext.java
+++ b/basex-api/src/main/java/org/basex/http/HTTPContext.java
@@ -20,6 +20,7 @@
 import org.basex.io.serial.*;
 import org.basex.server.*;
 import org.basex.util.*;
+import org.basex.util.Base64;
 import org.basex.util.list.*;
 import org.basex.util.options.*;
 
diff --git a/basex-api/src/test/java/org/basex/http/HTTPTest.java b/basex-api/src/test/java/org/basex/http/HTTPTest.java
index d49c9d64ec..44ae42a492 100644
--- a/basex-api/src/test/java/org/basex/http/HTTPTest.java
+++ b/basex-api/src/test/java/org/basex/http/HTTPTest.java
@@ -14,6 +14,7 @@
 import org.basex.io.in.*;
 import org.basex.io.out.*;
 import org.basex.util.*;
+import org.basex.util.Base64;
 import org.basex.util.list.*;
 import org.junit.*;
 
diff --git a/basex-core/src/main/java/org/basex/query/util/http/HTTPClient.java b/basex-core/src/main/java/org/basex/query/util/http/HTTPClient.java
index 764913b7db..3fdcfc3c4b 100644
--- a/basex-core/src/main/java/org/basex/query/util/http/HTTPClient.java
+++ b/basex-core/src/main/java/org/basex/query/util/http/HTTPClient.java
@@ -21,6 +21,7 @@
 import org.basex.query.value.item.*;
 import org.basex.query.value.node.*;
 import org.basex.util.*;
+import org.basex.util.Base64;
 import org.basex.util.hash.*;
 
 /**