Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision f4af04852e6bee8988dc6681347f478d474a4eb1)
+++ uspace/srv/net/il/ip/ip.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
@@ -58,5 +58,5 @@
 #include <net_device.h>
 #include <icmp_client.h>
-#include <icmp_codes.h>
+#include <net/icmp_codes.h>
 #include <icmp_interface.h>
 #include <il_interface.h>
Index: uspace/srv/net/tl/icmp/icmp.c
===================================================================
--- uspace/srv/net/tl/icmp/icmp.c	(revision f4af04852e6bee8988dc6681347f478d474a4eb1)
+++ uspace/srv/net/tl/icmp/icmp.c	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
@@ -44,4 +44,5 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/icmp.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -59,8 +60,8 @@
 #include <packet_remote.h>
 #include <net_checksum.h>
-#include <icmp_api.h>
+#include <net/icmp_api.h>
 #include <icmp_client.h>
-#include <icmp_codes.h>
-#include <icmp_common.h>
+#include <net/icmp_codes.h>
+#include <net/icmp_common.h>
 #include <icmp_interface.h>
 #include <il_interface.h>
@@ -71,5 +72,4 @@
 #include <tl_interface.h>
 #include <tl_local.h>
-#include <icmp_messages.h>
 #include <icmp_header.h>
 
Index: uspace/srv/net/tl/icmp/icmp.h
===================================================================
--- uspace/srv/net/tl/icmp/icmp.h	(revision f4af04852e6bee8988dc6681347f478d474a4eb1)
+++ uspace/srv/net/tl/icmp/icmp.h	(revision 753bca36deef6be542a11061ac60bd262f76f43f)
@@ -40,5 +40,5 @@
 #include <fibril_synch.h>
 
-#include <icmp_codes.h>
+#include <net/icmp_codes.h>
 #include <adt/int_map.h>
 #include <icmp_header.h>