Index: uspace/lib/nic/include/nic_driver.h
===================================================================
--- uspace/lib/nic/include/nic_driver.h	(revision 8d7ec69d8e6ebbc57c70b70b6ed09ed1b8ceba0c)
+++ uspace/lib/nic/include/nic_driver.h	(revision 2df6f6fe4f21b8f1ebefce19a6d94cd3137976f0)
@@ -44,5 +44,5 @@
 
 #include <fibril_synch.h>
-#include <net/device.h>
+#include <nic/nic.h>
 #include <async.h>
 
Index: uspace/lib/nic/include/nic_ev.h
===================================================================
--- uspace/lib/nic/include/nic_ev.h	(revision 8d7ec69d8e6ebbc57c70b70b6ed09ed1b8ceba0c)
+++ uspace/lib/nic/include/nic_ev.h	(revision 2df6f6fe4f21b8f1ebefce19a6d94cd3137976f0)
@@ -40,6 +40,5 @@
 
 #include <async.h>
-/* XXX for nic_device_id_t and nic_address_t */
-#include <net/device.h>
+#include <nic/nic.h>
 #include <sys/types.h>
 
Index: uspace/lib/nic/include/nic_impl.h
===================================================================
--- uspace/lib/nic/include/nic_impl.h	(revision 8d7ec69d8e6ebbc57c70b70b6ed09ed1b8ceba0c)
+++ uspace/lib/nic/include/nic_impl.h	(revision 2df6f6fe4f21b8f1ebefce19a6d94cd3137976f0)
@@ -40,7 +40,6 @@
 
 #include <assert.h>
-#include <net/device.h>
+#include <nic/nic.h>
 #include <ddf/driver.h>
-#include <nil_remote.h>
 
 /* Inclusion of this file is not prohibited, because drivers could want to
Index: uspace/lib/nic/include/nic_rx_control.h
===================================================================
--- uspace/lib/nic/include/nic_rx_control.h	(revision 8d7ec69d8e6ebbc57c70b70b6ed09ed1b8ceba0c)
+++ uspace/lib/nic/include/nic_rx_control.h	(revision 2df6f6fe4f21b8f1ebefce19a6d94cd3137976f0)
@@ -45,5 +45,5 @@
 #include <adt/hash_table.h>
 #include <fibril_synch.h>
-#include <net/device.h>
+#include <nic/nic.h>
 
 #include "nic_addr_db.h"
Index: uspace/lib/nic/include/nic_wol_virtues.h
===================================================================
--- uspace/lib/nic/include/nic_wol_virtues.h	(revision 8d7ec69d8e6ebbc57c70b70b6ed09ed1b8ceba0c)
+++ uspace/lib/nic/include/nic_wol_virtues.h	(revision 2df6f6fe4f21b8f1ebefce19a6d94cd3137976f0)
@@ -43,5 +43,5 @@
 #endif
 
-#include <net/device.h>
+#include <nic/nic.h>
 #include <adt/hash_table.h>
 #include "nic.h"