diff --git a/buildcraft_client/buildcraft/energy/GuiCombustionEngine.java b/buildcraft_client/buildcraft/energy/GuiCombustionEngine.java
index 7eee0698..67b55897 100644
--- a/buildcraft_client/buildcraft/energy/GuiCombustionEngine.java
+++ b/buildcraft_client/buildcraft/energy/GuiCombustionEngine.java
@@ -12,7 +12,7 @@ package buildcraft.energy;
 import net.minecraft.src.Block;
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.Item;
-import net.minecraft.src.forge.ITextureProvider;
+
 import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
diff --git a/buildcraft_client/buildcraft/energy/TextureFuelFX.java b/buildcraft_client/buildcraft/energy/TextureFuelFX.java
index d39aabef..bcab3d07 100644
--- a/buildcraft_client/buildcraft/energy/TextureFuelFX.java
+++ b/buildcraft_client/buildcraft/energy/TextureFuelFX.java
@@ -11,7 +11,7 @@ package buildcraft.energy;
 
 import buildcraft.BuildCraftEnergy;
 import buildcraft.core.TextureLiquidsFX;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class TextureFuelFX extends TextureLiquidsFX {
 
diff --git a/buildcraft_client/buildcraft/energy/TextureOilFX.java b/buildcraft_client/buildcraft/energy/TextureOilFX.java
index 6f7b1d75..b76aa337 100644
--- a/buildcraft_client/buildcraft/energy/TextureOilFX.java
+++ b/buildcraft_client/buildcraft/energy/TextureOilFX.java
@@ -11,7 +11,7 @@ package buildcraft.energy;
 
 import buildcraft.BuildCraftEnergy;
 import buildcraft.core.TextureLiquidsFX;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class TextureOilFX extends TextureLiquidsFX {
 
diff --git a/buildcraft_client/buildcraft/factory/RenderRefinery.java b/buildcraft_client/buildcraft/factory/RenderRefinery.java
index a08ea2fd..5bda8526 100644
--- a/buildcraft_client/buildcraft/factory/RenderRefinery.java
+++ b/buildcraft_client/buildcraft/factory/RenderRefinery.java
@@ -19,7 +19,7 @@ import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
diff --git a/buildcraft_client/buildcraft/factory/RenderTank.java b/buildcraft_client/buildcraft/factory/RenderTank.java
index 41faa655..4bb36436 100644
--- a/buildcraft_client/buildcraft/factory/RenderTank.java
+++ b/buildcraft_client/buildcraft/factory/RenderTank.java
@@ -17,7 +17,7 @@ import net.minecraft.src.Item;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
diff --git a/buildcraft_client/buildcraft/transport/RenderPipe.java b/buildcraft_client/buildcraft/transport/RenderPipe.java
index 4e0196e2..092499f6 100644
--- a/buildcraft_client/buildcraft/transport/RenderPipe.java
+++ b/buildcraft_client/buildcraft/transport/RenderPipe.java
@@ -24,10 +24,10 @@ import net.minecraft.src.Tessellator;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ForgeHooksClient;
+import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.client.IItemRenderer.ItemRenderType;
-import net.minecraft.src.forge.ITextureProvider;
+
 import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java
index 3435c474..7be77b0f 100644
--- a/common/buildcraft/builders/BlockArchitect.java
+++ b/common/buildcraft/builders/BlockArchitect.java
@@ -29,7 +29,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockArchitect extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java
index 065eea2b..91060bc2 100644
--- a/common/buildcraft/builders/BlockBlueprintLibrary.java
+++ b/common/buildcraft/builders/BlockBlueprintLibrary.java
@@ -23,7 +23,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockBlueprintLibrary extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java
index dd378580..1a8bacdf 100644
--- a/common/buildcraft/builders/BlockBuilder.java
+++ b/common/buildcraft/builders/BlockBuilder.java
@@ -28,7 +28,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockBuilder extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java
index 45288ddf..16200e6c 100644
--- a/common/buildcraft/builders/BlockFiller.java
+++ b/common/buildcraft/builders/BlockFiller.java
@@ -25,7 +25,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockFiller extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java
index 40b69019..357e0357 100644
--- a/common/buildcraft/builders/BlockMarker.java
+++ b/common/buildcraft/builders/BlockMarker.java
@@ -27,7 +27,7 @@ import net.minecraft.src.MovingObjectPosition;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.Vec3;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockMarker extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/core/BlockBuildCraft.java b/common/buildcraft/core/BlockBuildCraft.java
index b5290909..f5c4c5bb 100644
--- a/common/buildcraft/core/BlockBuildCraft.java
+++ b/common/buildcraft/core/BlockBuildCraft.java
@@ -5,7 +5,7 @@ import java.util.Random;
 import net.minecraft.src.BlockContainer;
 import net.minecraft.src.Material;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public abstract class BlockBuildCraft extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java
index 5fa4c8da..2f0f9e2b 100644
--- a/common/buildcraft/core/ItemBuildCraft.java
+++ b/common/buildcraft/core/ItemBuildCraft.java
@@ -12,7 +12,7 @@ package buildcraft.core;
 import buildcraft.core.utils.StringUtil;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class ItemBuildCraft extends Item implements ITextureProvider {
 
diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java
index c06b70d9..2d89ddce 100644
--- a/common/buildcraft/energy/BlockOilFlowing.java
+++ b/common/buildcraft/energy/BlockOilFlowing.java
@@ -20,7 +20,7 @@ import net.minecraft.src.Block;
 import net.minecraft.src.BlockFluid;
 import net.minecraft.src.Material;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockOilFlowing extends BlockFluid implements ITextureProvider, ILiquid {
 
diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java
index e926976f..617efc8f 100644
--- a/common/buildcraft/energy/BlockOilStill.java
+++ b/common/buildcraft/energy/BlockOilStill.java
@@ -16,7 +16,7 @@ import buildcraft.core.DefaultProps;
 import net.minecraft.src.BlockStationary;
 import net.minecraft.src.Material;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockOilStill extends BlockStationary implements ITextureProvider, ILiquid {
 
diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java
index 86551113..1e246624 100644
--- a/common/buildcraft/energy/BlockPollution.java
+++ b/common/buildcraft/energy/BlockPollution.java
@@ -14,7 +14,7 @@ import net.minecraft.src.BlockContainer;
 import net.minecraft.src.IBlockAccess;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockPollution extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java
index 4625d056..5bf2a5b4 100644
--- a/common/buildcraft/energy/ItemBucketOil.java
+++ b/common/buildcraft/energy/ItemBucketOil.java
@@ -14,7 +14,7 @@ import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.StringUtil;
 import net.minecraft.src.ItemBucket;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class ItemBucketOil extends ItemBucket implements ITextureProvider {
 
diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java
index 0a27cd13..f22035ef 100644
--- a/common/buildcraft/factory/BlockFrame.java
+++ b/common/buildcraft/factory/BlockFrame.java
@@ -25,7 +25,7 @@ import net.minecraft.src.Material;
 import net.minecraft.src.MovingObjectPosition;
 import net.minecraft.src.Vec3;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockFrame extends Block implements IFramePipeConnection, ITextureProvider {
 
diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java
index ee2ef1d8..d8d2a987 100644
--- a/common/buildcraft/factory/BlockMiningWell.java
+++ b/common/buildcraft/factory/BlockMiningWell.java
@@ -22,7 +22,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockMiningWell extends BlockMachineRoot implements ITextureProvider {
 
diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java
index d5a7ad3b..6e2431ca 100644
--- a/common/buildcraft/factory/BlockPlainPipe.java
+++ b/common/buildcraft/factory/BlockPlainPipe.java
@@ -20,7 +20,7 @@ import net.minecraft.src.Block;
 import net.minecraft.src.IBlockAccess;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockPlainPipe extends Block implements IFramePipeConnection, ITextureProvider {
 
diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java
index 1397e79f..70a6af1f 100644
--- a/common/buildcraft/factory/BlockPump.java
+++ b/common/buildcraft/factory/BlockPump.java
@@ -19,7 +19,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockPump extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java
index 68eb782e..c26cb5ff 100644
--- a/common/buildcraft/factory/BlockQuarry.java
+++ b/common/buildcraft/factory/BlockQuarry.java
@@ -34,7 +34,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockQuarry extends BlockMachineRoot implements ITextureProvider {
 
diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java
index 88100bf3..8c2639cb 100644
--- a/common/buildcraft/factory/BlockTank.java
+++ b/common/buildcraft/factory/BlockTank.java
@@ -26,7 +26,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockTank extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java
index 9a7db82d..12914262 100644
--- a/common/buildcraft/silicon/BlockAssemblyTable.java
+++ b/common/buildcraft/silicon/BlockAssemblyTable.java
@@ -15,7 +15,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockAssemblyTable extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java
index d005fb2f..21c71716 100644
--- a/common/buildcraft/silicon/BlockLaser.java
+++ b/common/buildcraft/silicon/BlockLaser.java
@@ -20,7 +20,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockLaser extends BlockContainer implements ITextureProvider {
 
diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java
index 6c7b8e4a..f9bdbeb5 100644
--- a/common/buildcraft/transport/BlockGenericPipe.java
+++ b/common/buildcraft/transport/BlockGenericPipe.java
@@ -33,7 +33,7 @@ import net.minecraft.src.MovingObjectPosition;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.Vec3;
 import net.minecraft.src.World;
-import net.minecraft.src.forge.ITextureProvider;
+
 
 public class BlockGenericPipe extends BlockContainer implements ITextureProvider {