Index: uspace/srv/net/il/arp/Makefile
===================================================================
--- uspace/srv/net/il/arp/Makefile	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ uspace/srv/net/il/arp/Makefile	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -1,4 +1,5 @@
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27,25 +28,20 @@
 #
 
-NAME = arp
+NET_BASE = ../..
+USPACE_PREFIX = ../../../..
+BINARY = arp
 
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+SOURCES = \
+	arp.c \
+	arp_module.c \
+	$(NET_BASE)/module.c \
+	$(NET_BASE)/modules.c \
+	$(NET_BASE)/net/net_remote.c \
+	$(NET_BASE)/nil/nil_remote.c \
+	$(NET_BASE)/structures/char_map.c \
+	$(NET_BASE)/structures/measured_strings.c \
+	$(NET_BASE)/structures/packet/packet.c \
+	$(NET_BASE)/structures/packet/packet_client.c \
+	$(NET_BASE)/structures/packet/packet_remote.c
 
-## Sources
-#
-
-OUTPUT = $(NAME)
-SOURCES = \
-	$(NAME).c \
-	$(NAME)_module.c \
-	$(NET_BASE)module.c \
-	$(NET_BASE)modules.c \
-	$(NET_BASE)net/net_remote.c \
-	$(NET_BASE)nil/nil_remote.c \
-	$(STRUCTURES)char_map.c \
-	$(STRUCTURES)measured_strings.c \
-	$(STRUCTURES)packet/packet.c \
-	$(STRUCTURES)packet/packet_client.c \
-	$(STRUCTURES)packet/packet_remote.c
-
-include $(NET_BASE)Makefile.module
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/net/il/ip/Makefile
===================================================================
--- uspace/srv/net/il/ip/Makefile	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ uspace/srv/net/il/ip/Makefile	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -1,4 +1,5 @@
 #
-# Copyright (c) 2009 Lukas Mejdrech
+# Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27,33 +28,28 @@
 #
 
-NAME = ip
+NET_BASE = ../..
+USPACE_PREFIX = ../../../..
+BINARY = ip
 
-NET_BASE = ../../
-STRUCTURES = $(NET_BASE)structures/
+SOURCES = \
+	ip.c \
+	ip_client.c \
+	ip_module.c \
+	$(NET_BASE)/checksum.c \
+	$(NET_BASE)/inet.c \
+	$(NET_BASE)/module.c \
+	$(NET_BASE)/modules.c \
+	$(NET_BASE)/il/arp/arp_remote.c \
+	$(NET_BASE)/nil/nil_remote.c \
+	$(NET_BASE)/net/net_remote.c \
+	$(NET_BASE)/tl/icmp/icmp_client.c \
+	$(NET_BASE)/tl/icmp/icmp_common.c \
+	$(NET_BASE)/tl/icmp/icmp_remote.c \
+	$(NET_BASE)/structures/char_map.c \
+	$(NET_BASE)/structures/measured_strings.c \
+	$(NET_BASE)/structures/module_map.c \
+	$(NET_BASE)/structures/packet/packet.c \
+	$(NET_BASE)/structures/packet/packet_client.c \
+	$(NET_BASE)/structures/packet/packet_remote.c
 
-## Sources
-#
-
-OUTPUT = $(NAME)
-SOURCES = \
-	$(NAME).c \
-	$(NAME)_client.c \
-	$(NAME)_module.c \
-	$(NET_BASE)checksum.c \
-	$(NET_BASE)inet.c \
-	$(NET_BASE)module.c \
-	$(NET_BASE)modules.c \
-	$(NET_BASE)il/arp/arp_remote.c \
-	$(NET_BASE)nil/nil_remote.c \
-	$(NET_BASE)net/net_remote.c \
-	$(NET_BASE)tl/icmp/icmp_client.c \
-	$(NET_BASE)tl/icmp/icmp_common.c \
-	$(NET_BASE)tl/icmp/icmp_remote.c \
-	$(STRUCTURES)char_map.c \
-	$(STRUCTURES)measured_strings.c \
-	$(STRUCTURES)module_map.c \
-	$(STRUCTURES)packet/packet.c \
-	$(STRUCTURES)packet/packet_client.c \
-	$(STRUCTURES)packet/packet_remote.c
-
-include $(NET_BASE)Makefile.module
+include $(USPACE_PREFIX)/Makefile.common