Index: uspace/srv/hw/netif/dp8390/dp8390_module.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -48,5 +48,5 @@
 #include <packet_client.h>
 #include <adt/measured_strings.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <nil_interface.h>
 #include <netif_interface.h>
Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/il/arp/arp.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -50,5 +50,5 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <arp_interface.h>
 #include <nil_interface.h>
Index: uspace/srv/net/il/arp/arp.h
===================================================================
--- uspace/srv/net/il/arp/arp.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/il/arp/arp.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -43,5 +43,5 @@
 #include <ipc/services.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <net_hardware.h>
 #include <adt/generic_char_map.h>
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/il/ip/ip.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -56,5 +56,5 @@
 #include <arp_interface.h>
 #include <net_checksum.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <icmp_client.h>
 #include <net/icmp_codes.h>
Index: uspace/srv/net/il/ip/ip.h
===================================================================
--- uspace/srv/net/il/ip/ip.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/il/ip/ip.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -42,5 +42,5 @@
 #include <ipc/services.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <net/inet.h>
 #include <ip_interface.h>
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/net/net.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -57,5 +57,5 @@
 #include <il_messages.h>
 #include <netif_remote.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <nil_interface.h>
 #include <net_interface.h>
Index: uspace/srv/net/net/net.h
===================================================================
--- uspace/srv/net/net/net.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/net/net.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -41,5 +41,5 @@
 #include <ipc/ipc.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <adt/char_map.h>
 #include <adt/generic_char_map.h>
Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/netif/lo/lo.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -48,5 +48,5 @@
 #include <adt/measured_strings.h>
 #include <packet_client.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <nil_interface.h>
 #include <nil_messages.h>
Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/nil/eth/eth.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -53,5 +53,5 @@
 #include <ethernet_protocols.h>
 #include <protocol_map.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <netif_interface.h>
 #include <net_interface.h>
Index: uspace/srv/net/nil/eth/eth.h
===================================================================
--- uspace/srv/net/nil/eth/eth.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/nil/eth/eth.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -41,5 +41,5 @@
 #include <ipc/services.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <adt/measured_strings.h>
 
Index: uspace/srv/net/nil/nildummy/nildummy.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/nil/nildummy/nildummy.c	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -47,5 +47,5 @@
 #include <net_messages.h>
 #include <net/modules.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <netif_interface.h>
 #include <nil_interface.h>
Index: uspace/srv/net/nil/nildummy/nildummy.h
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/nil/nildummy/nildummy.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -41,5 +41,5 @@
 #include <ipc/services.h>
 
-#include <net_device.h>
+#include <net/device.h>
 #include <adt/measured_strings.h>
 
Index: uspace/srv/net/tl/tcp/tcp.h
===================================================================
--- uspace/srv/net/tl/tcp/tcp.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
+++ uspace/srv/net/tl/tcp/tcp.h	(revision e526f08e005a95740d8b5d3b30f7cdf1db353104)
@@ -41,5 +41,5 @@
 
 #include <net/packet.h>
-#include <net_device.h>
+#include <net/device.h>
 #include <socket_core.h>
 #include <tl_common.h>