Index: uspace/lib/net/generic/packet_client.c
===================================================================
--- uspace/lib/net/generic/packet_client.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/generic/packet_client.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -44,6 +44,6 @@
 
 #include <net_messages.h>
-#include <packet/packet.h>
-#include <packet/packet_header.h>
+#include <net/packet.h>
+#include <net/packet_header.h>
 
 int packet_copy_data(packet_t packet, const void * data, size_t length)
Index: uspace/lib/net/generic/packet_remote.c
===================================================================
--- uspace/lib/net/generic/packet_remote.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/generic/packet_remote.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -47,6 +47,6 @@
 #include <packet_remote.h>
 
-#include <packet/packet.h>
-#include <packet/packet_header.h>
+#include <net/packet.h>
+#include <net/packet_header.h>
 
 /** Obtain the packet from the packet server as the shared memory block.
Index: uspace/lib/net/generic/socket_core.c
===================================================================
--- uspace/lib/net/generic/socket_core.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/generic/socket_core.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -46,5 +46,5 @@
 #include <adt/dynamic_fifo.h>
 #include <adt/int_map.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_client.h>
 #include <packet_remote.h>
Index: uspace/lib/net/il/ip_client.c
===================================================================
--- uspace/lib/net/il/ip_client.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/il/ip_client.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -43,5 +43,5 @@
 #include <ip_header.h>
 
-#include <packet/packet.h>
+#include <net/packet.h>
 
 size_t ip_client_header_length(packet_t packet){
Index: uspace/lib/net/include/icmp_client.h
===================================================================
--- uspace/lib/net/include/icmp_client.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/icmp_client.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -39,5 +39,5 @@
 
 #include <icmp_codes.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 
 /** Processes the received packet prefixed with an ICMP header.
Index: uspace/lib/net/include/icmp_interface.h
===================================================================
--- uspace/lib/net/include/icmp_interface.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/icmp_interface.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -39,5 +39,5 @@
 #include <net_device.h>
 #include <adt/measured_strings.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <net/inet.h>
 #include <ip_codes.h>
Index: uspace/lib/net/include/il_interface.h
===================================================================
--- uspace/lib/net/include/il_interface.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/il_interface.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -45,5 +45,5 @@
 #include <net_messages.h>
 #include <net_device.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_client.h>
 #include <il_messages.h>
Index: uspace/lib/net/include/ip_client.h
===================================================================
--- uspace/lib/net/include/ip_client.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/ip_client.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -41,5 +41,5 @@
 #include <sys/types.h>
 
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <ip_codes.h>
 #include <ip_interface.h>
Index: uspace/lib/net/include/ip_interface.h
===================================================================
--- uspace/lib/net/include/ip_interface.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/ip_interface.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -39,5 +39,5 @@
 
 #include <net_device.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 
 #include <net/in.h>
Index: uspace/lib/net/include/netif_local.h
===================================================================
--- uspace/lib/net/include/netif_local.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/netif_local.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -48,5 +48,5 @@
 #include <adt/measured_strings.h>
 #include <net_device.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 
 /** Network interface device specific data.
Index: uspace/lib/net/include/nil_interface.h
===================================================================
--- uspace/lib/net/include/nil_interface.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/nil_interface.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -41,5 +41,5 @@
 #include <net_messages.h>
 #include <adt/measured_strings.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <nil_messages.h>
 #include <net_device.h>
Index: uspace/lib/net/include/packet_client.h
===================================================================
--- uspace/lib/net/include/packet_client.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/packet_client.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -45,5 +45,5 @@
 #define __NET_PACKET_CLIENT_H__
 
-#include <packet/packet.h>
+#include <net/packet.h>
 
 /** @name Packet client interface
Index: uspace/lib/net/include/packet_remote.h
===================================================================
--- uspace/lib/net/include/packet_remote.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/packet_remote.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -34,5 +34,5 @@
 #define __NET_PACKET_REMOTE_H__
 
-#include <packet/packet.h>
+#include <net/packet.h>
 
 extern int packet_translate_remote(int, packet_ref, packet_id_t);
Index: uspace/lib/net/include/tl_common.h
===================================================================
--- uspace/lib/net/include/tl_common.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/tl_common.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -39,6 +39,5 @@
 
 #include <net/socket_codes.h>
-
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <net_device.h>
 #include <net/inet.h>
Index: uspace/lib/net/include/tl_interface.h
===================================================================
--- uspace/lib/net/include/tl_interface.h	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/include/tl_interface.h	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -43,5 +43,5 @@
 #include <net_messages.h>
 #include <net_device.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_client.h>
 #include <tl_messages.h>
Index: uspace/lib/net/netif/netif_local.c
===================================================================
--- uspace/lib/net/netif/netif_local.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/netif/netif_local.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -46,5 +46,5 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_client.h>
 #include <packet/packet_server.h>
Index: uspace/lib/net/netif/netif_nil_bundle.c
===================================================================
--- uspace/lib/net/netif/netif_nil_bundle.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/netif/netif_nil_bundle.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -40,5 +40,5 @@
 #include <ipc/net.h>
 
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <netif_nil_bundle.h>
 #include <netif_local.h>
Index: uspace/lib/net/netif/netif_remote.c
===================================================================
--- uspace/lib/net/netif/netif_remote.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/netif/netif_remote.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -39,5 +39,5 @@
 #include <net/modules.h>
 #include <adt/measured_strings.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_client.h>
 #include <net_device.h>
Index: uspace/lib/net/nil/nil_remote.c
===================================================================
--- uspace/lib/net/nil/nil_remote.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/nil/nil_remote.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -39,5 +39,5 @@
 #include <net_device.h>
 #include <nil_interface.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_client.h>
 #include <nil_messages.h>
Index: uspace/lib/net/tl/icmp_client.c
===================================================================
--- uspace/lib/net/tl/icmp_client.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/tl/icmp_client.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -45,5 +45,5 @@
 #include <icmp_codes.h>
 #include <icmp_client.h>
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_client.h>
 #include <icmp_header.h>
Index: uspace/lib/net/tl/tl_common.c
===================================================================
--- uspace/lib/net/tl/tl_common.c	(revision 0a866eebd91749e0380adb6b7af11e95a433af59)
+++ uspace/lib/net/tl/tl_common.c	(revision c69d327931c88d2878c9d58f4aa911edd6e873ea)
@@ -45,5 +45,5 @@
 #include <err.h>
 
-#include <packet/packet.h>
+#include <net/packet.h>
 #include <packet_client.h>
 #include <packet_remote.h>