Index: uspace/lib/net/include/icmp_client.h
===================================================================
--- uspace/lib/net/include/icmp_client.h	(revision ff2a62d3a210bacf29ceb1453b49ebe59b039133)
+++ uspace/lib/net/include/icmp_client.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
@@ -38,5 +38,5 @@
 #define __NET_ICMP_CLIENT_H__
 
-#include <icmp_codes.h>
+#include <net/icmp_codes.h>
 #include <net/packet.h>
 
Index: uspace/lib/net/include/icmp_header.h
===================================================================
--- uspace/lib/net/include/icmp_header.h	(revision ff2a62d3a210bacf29ceb1453b49ebe59b039133)
+++ uspace/lib/net/include/icmp_header.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
@@ -42,5 +42,5 @@
 
 #include <net/in.h>
-#include <icmp_codes.h>
+#include <net/icmp_codes.h>
 
 /** ICMP header size in bytes.
Index: uspace/lib/net/include/icmp_interface.h
===================================================================
--- uspace/lib/net/include/icmp_interface.h	(revision ff2a62d3a210bacf29ceb1453b49ebe59b039133)
+++ uspace/lib/net/include/icmp_interface.h	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
@@ -42,6 +42,6 @@
 #include <net/inet.h>
 #include <net/ip_codes.h>
-#include <icmp_codes.h>
-#include <icmp_common.h>
+#include <net/icmp_codes.h>
+#include <net/icmp_common.h>
 
 /** @name ICMP module interface
Index: uspace/lib/net/tl/icmp_client.c
===================================================================
--- uspace/lib/net/tl/icmp_client.c	(revision ff2a62d3a210bacf29ceb1453b49ebe59b039133)
+++ uspace/lib/net/tl/icmp_client.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
@@ -43,5 +43,5 @@
 #include <sys/types.h>
 
-#include <icmp_codes.h>
+#include <net/icmp_codes.h>
 #include <icmp_client.h>
 #include <net/packet.h>
Index: uspace/lib/net/tl/icmp_remote.c
===================================================================
--- uspace/lib/net/tl/icmp_remote.c	(revision ff2a62d3a210bacf29ceb1453b49ebe59b039133)
+++ uspace/lib/net/tl/icmp_remote.c	(revision db5f8d3f6b863644336c22fa862b14ad082158ac)
@@ -40,4 +40,5 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/icmp.h>
 #include <sys/types.h>
 
@@ -46,5 +47,4 @@
 #include <icmp_interface.h>
 #include <packet_client.h>
-#include <icmp_messages.h>
 
 int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet){