diff --git a/liteeth/core/arp.py b/liteeth/core/arp.py
index 8043f39..99e47a9 100644
--- a/liteeth/core/arp.py
+++ b/liteeth/core/arp.py
@@ -8,7 +8,7 @@ from liteeth.common import *
 
 from migen.genlib.misc import WaitTimer
 
-from litex.soc.interconnect.packet import Depacketizer, Packetizer
+from liteeth.packet import Depacketizer, Packetizer
 
 # ARP Layouts --------------------------------------------------------------------------------------
 
diff --git a/liteeth/core/icmp.py b/liteeth/core/icmp.py
index fd72c1d..e1703dc 100644
--- a/liteeth/core/icmp.py
+++ b/liteeth/core/icmp.py
@@ -6,7 +6,8 @@
 
 from liteeth.common import *
 
-from litex.soc.interconnect.packet import Depacketizer, Packetizer, PacketFIFO
+from litex.soc.interconnect.packet import PacketFIFO
+from liteeth.packet import Depacketizer, Packetizer
 
 # ICMP TX ------------------------------------------------------------------------------------------
 
diff --git a/liteeth/core/ip.py b/liteeth/core/ip.py
index e588342..8a3f240 100644
--- a/liteeth/core/ip.py
+++ b/liteeth/core/ip.py
@@ -7,7 +7,7 @@
 from liteeth.common import *
 from liteeth.crossbar import LiteEthCrossbar
 
-from litex.soc.interconnect.packet import Depacketizer, Packetizer
+from liteeth.packet import Depacketizer, Packetizer
 
 # IP Crossbar --------------------------------------------------------------------------------------
 
diff --git a/liteeth/core/udp.py b/liteeth/core/udp.py
index 2f9b587..253a144 100644
--- a/liteeth/core/udp.py
+++ b/liteeth/core/udp.py
@@ -8,7 +8,8 @@ from liteeth.common import *
 from liteeth.crossbar import LiteEthCrossbar
 
 from litex.soc.interconnect import stream
-from litex.soc.interconnect.packet import Depacketizer, Packetizer
+
+from liteeth.packet import Depacketizer, Packetizer
 
 # UDP Crossbar -------------------------------------------------------------------------------------
 
diff --git a/liteeth/frontend/etherbone.py b/liteeth/frontend/etherbone.py
index 28c3fbe..e489aad 100644
--- a/liteeth/frontend/etherbone.py
+++ b/liteeth/frontend/etherbone.py
@@ -20,6 +20,8 @@ from liteeth.common import *
 from litex.soc.interconnect import wishbone
 from litex.soc.interconnect.packet import *
 
+from liteeth.packet import Depacketizer, Packetizer
+
 # Etherbone Packet ---------------------------------------------------------------------------------
 
 class LiteEthEtherbonePacketPacketizer(Packetizer):
diff --git a/liteeth/mac/common.py b/liteeth/mac/common.py
index 4d3dcb7..b0160d9 100644
--- a/liteeth/mac/common.py
+++ b/liteeth/mac/common.py
@@ -7,7 +7,7 @@
 from liteeth.common import *
 from liteeth.crossbar import LiteEthCrossbar
 
-from litex.soc.interconnect.packet import Depacketizer, Packetizer
+from liteeth.packet import Depacketizer, Packetizer
 
 # MAC Packetizer/Depacketizer ----------------------------------------------------------------------