diff --git a/api/buildcraft/api/robots/IRobotRegistry.java b/api/buildcraft/api/robots/IRobotRegistry.java
index 9537b3b3..707a73b7 100755
--- a/api/buildcraft/api/robots/IRobotRegistry.java
+++ b/api/buildcraft/api/robots/IRobotRegistry.java
@@ -14,8 +14,6 @@ import net.minecraft.nbt.NBTTagCompound;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.core.robots.ResourceId;
-
 public interface IRobotRegistry {
 
 	long getNextRobotId();
diff --git a/common/buildcraft/core/robots/ResourceId.java b/api/buildcraft/api/robots/ResourceId.java
similarity index 98%
rename from common/buildcraft/core/robots/ResourceId.java
rename to api/buildcraft/api/robots/ResourceId.java
index c98e3edb..543a220b 100755
--- a/common/buildcraft/core/robots/ResourceId.java
+++ b/api/buildcraft/api/robots/ResourceId.java
@@ -6,7 +6,7 @@
  * License 1.0, or MMPL. Please check the contents of the license located in
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
-package buildcraft.core.robots;
+package buildcraft.api.robots;
 
 import net.minecraft.nbt.NBTTagCompound;
 
diff --git a/common/buildcraft/core/robots/ResourceIdAssemblyTable.java b/common/buildcraft/core/robots/ResourceIdAssemblyTable.java
index 1bdd9570..43b082a6 100755
--- a/common/buildcraft/core/robots/ResourceIdAssemblyTable.java
+++ b/common/buildcraft/core/robots/ResourceIdAssemblyTable.java
@@ -9,6 +9,7 @@
 package buildcraft.core.robots;
 
 import buildcraft.api.core.BlockIndex;
+import buildcraft.api.robots.ResourceId;
 import buildcraft.silicon.TileAssemblyTable;
 
 public class ResourceIdAssemblyTable extends ResourceId {
diff --git a/common/buildcraft/core/robots/ResourceIdBlock.java b/common/buildcraft/core/robots/ResourceIdBlock.java
index 166f9b79..a6ca2ca6 100755
--- a/common/buildcraft/core/robots/ResourceIdBlock.java
+++ b/common/buildcraft/core/robots/ResourceIdBlock.java
@@ -11,6 +11,7 @@ package buildcraft.core.robots;
 import net.minecraft.tileentity.TileEntity;
 
 import buildcraft.api.core.BlockIndex;
+import buildcraft.api.robots.ResourceId;
 
 public class ResourceIdBlock extends ResourceId {
 
diff --git a/common/buildcraft/core/robots/ResourceIdRequest.java b/common/buildcraft/core/robots/ResourceIdRequest.java
index b7fa13f5..3770028d 100755
--- a/common/buildcraft/core/robots/ResourceIdRequest.java
+++ b/common/buildcraft/core/robots/ResourceIdRequest.java
@@ -11,6 +11,7 @@ package buildcraft.core.robots;
 import net.minecraft.tileentity.TileEntity;
 
 import buildcraft.api.core.BlockIndex;
+import buildcraft.api.robots.ResourceId;
 
 public class ResourceIdRequest extends ResourceId {
 
diff --git a/common/buildcraft/core/robots/RobotRegistry.java b/common/buildcraft/core/robots/RobotRegistry.java
index f42ede02..0e9499eb 100755
--- a/common/buildcraft/core/robots/RobotRegistry.java
+++ b/common/buildcraft/core/robots/RobotRegistry.java
@@ -25,6 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.api.robots.EntityRobotBase;
 import buildcraft.api.robots.IDockingStation;
 import buildcraft.api.robots.IRobotRegistry;
+import buildcraft.api.robots.ResourceId;
 
 public class RobotRegistry extends WorldSavedData implements IRobotRegistry {