Index: uspace/lib/net/generic/net_remote.c
===================================================================
--- uspace/lib/net/generic/net_remote.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/generic/net_remote.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -42,5 +42,5 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <net_interface.h>
 #include <adt/measured_strings.h>
Index: uspace/lib/net/il/arp_remote.c
===================================================================
--- uspace/lib/net/il/arp_remote.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/il/arp_remote.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -43,5 +43,5 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <arp_interface.h>
 #include <adt/measured_strings.h>
Index: uspace/lib/net/il/ip_remote.c
===================================================================
--- uspace/lib/net/il/ip_remote.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/il/ip_remote.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -44,5 +44,5 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <net/inet.h>
 #include <ip_interface.h>
Index: uspace/lib/net/include/arp_interface.h
===================================================================
--- uspace/lib/net/include/arp_interface.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/arp_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -35,5 +35,5 @@
 
 #include <adt/measured_strings.h>
-#include <net_device.h>
+#include <net/device.h>
 
 /** @name ARP module interface
Index: uspace/lib/net/include/icmp_interface.h
===================================================================
--- uspace/lib/net/include/icmp_interface.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/icmp_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -37,5 +37,5 @@
 #include <sys/types.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <adt/measured_strings.h>
 #include <net/packet.h>
Index: uspace/lib/net/include/il_interface.h
===================================================================
--- uspace/lib/net/include/il_interface.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/il_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -44,5 +44,5 @@
 
 #include <net_messages.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <net/packet.h>
 #include <packet_client.h>
Index: uspace/lib/net/include/ip_interface.h
===================================================================
--- uspace/lib/net/include/ip_interface.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/ip_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -38,5 +38,5 @@
 #include <ipc/services.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <net/packet.h>
 
Index: uspace/lib/net/include/net_interface.h
===================================================================
--- uspace/lib/net/include/net_interface.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/net_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -36,5 +36,5 @@
 #include <ipc/services.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <adt/measured_strings.h>
 
Index: uspace/lib/net/include/netif_local.h
===================================================================
--- uspace/lib/net/include/netif_local.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/netif_local.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -46,5 +46,5 @@
 
 #include <adt/measured_strings.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <net/packet.h>
 
Index: uspace/lib/net/include/nil_interface.h
===================================================================
--- uspace/lib/net/include/nil_interface.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/nil_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -43,5 +43,5 @@
 #include <net/packet.h>
 #include <nil_messages.h>
-#include <net_device.h>
+#include <net/device.h>
 
 #define nil_bind_service(service, device_id, me, receiver) \
Index: uspace/lib/net/include/socket_core.h
===================================================================
--- uspace/lib/net/include/socket_core.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/socket_core.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -41,5 +41,5 @@
 
 #include <net/in.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <adt/generic_char_map.h>
 #include <adt/dynamic_fifo.h>
Index: uspace/lib/net/include/tl_common.h
===================================================================
--- uspace/lib/net/include/tl_common.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/tl_common.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -40,5 +40,5 @@
 #include <net/socket_codes.h>
 #include <net/packet.h>
-#include <net_device.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 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/include/tl_interface.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -42,5 +42,5 @@
 
 #include <net_messages.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <net/packet.h>
 #include <packet_client.h>
Index: uspace/lib/net/netif/netif_local.c
===================================================================
--- uspace/lib/net/netif/netif_local.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/netif/netif_local.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -51,5 +51,5 @@
 #include <packet_remote.h>
 #include <adt/measured_strings.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <nil_interface.h>
 #include <netif_local.h>
Index: uspace/lib/net/netif/netif_remote.c
===================================================================
--- uspace/lib/net/netif/netif_remote.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/netif/netif_remote.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -41,5 +41,5 @@
 #include <net/packet.h>
 #include <packet_client.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <netif_remote.h>
 #include <netif_messages.h>
Index: uspace/lib/net/nil/nil_remote.c
===================================================================
--- uspace/lib/net/nil/nil_remote.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/nil/nil_remote.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -37,5 +37,5 @@
 
 #include <net_messages.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <nil_interface.h>
 #include <net/packet.h>
Index: uspace/lib/net/tl/tl_common.c
===================================================================
--- uspace/lib/net/tl/tl_common.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
+++ uspace/lib/net/tl/tl_common.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -48,5 +48,5 @@
 #include <packet_client.h>
 #include <packet_remote.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <icmp_interface.h>
 #include <ip_remote.h>