diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java
index 7bd852d6a07ad78d34a69f97ecd73dd91e0556c6..73eab6ba9e5f22ce7f0f508dd3825c44df5f86b8 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.plugin.lora.L2PWriter;
 import org.briarproject.bramble.plugin.lora.L2PReader;
 import org.briarproject.bramble.plugin.lora.L2PReaderFactory;
 import org.briarproject.bramble.api.Pair;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionHandler;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.Backoff;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPluginFactory.java
index d78e6234a22cb9180d2ee549092d5afa5e81ff29..9d97885b5bdc5f2f0df1b11c20817d19606e5878 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPluginFactory.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPluginFactory.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.network.NetworkManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/L2PTagManager.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/L2PTagManager.java
index f904152e6e472fef415b7e8fa5aa8ab7423fc6be..e9f3b9e1b49965084305feea8203295ad29c24ad 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/L2PTagManager.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/L2PTagManager.java
@@ -33,7 +33,7 @@ import org.bouncycastle.crypto.digests.Blake2bDigest;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireExactlyOneNull;
+import static org.briarproject.nullsafety.NullSafety.requireExactlyOneNull;
 import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
 import static org.briarproject.bramble.api.transport.TransportConstants.PROTOCOL_VERSION;
 import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH;
diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java
index 0ec2e705ab66deb196242b1b89dd80ca50099d38..24fb5417b9af03efd82f09de31ed63bbec81952f 100644
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java
@@ -5,7 +5,7 @@ import com.sun.jna.Native;
 
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.network.NetworkManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.system.Clock;
diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java
index 7721580fd10024c3d339113d254ec24cba4a4ddd..81645650efdb844e9ab4002406adac45eab44c4a 100644
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.network.NetworkManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;