Index: uspace/srv/net/il/arp/arp.h
===================================================================
--- uspace/srv/net/il/arp/arp.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
+++ uspace/srv/net/il/arp/arp.h	(revision a64c64d04f3d981abf5d095ae65ed7ed4b40a244)
@@ -51,9 +51,4 @@
 
 
-/** Type definition of the ARP global data.
- *  @see arp_globals
- */
-typedef struct arp_globals	arp_globals_t;
-
 /** Type definition of the ARP device specific data.
  *  @see arp_device
@@ -66,4 +61,9 @@
 typedef arp_device_t *		arp_device_ref;
 
+/** Type definition of the ARP global data.
+ *  @see arp_globals
+ */
+typedef struct arp_globals	arp_globals_t;
+
 /** Type definition of the ARP protocol specific data.
  *  @see arp_proto
@@ -75,4 +75,10 @@
  */
 typedef arp_proto_t *		arp_proto_ref;
+
+/** ARP address map.
+ *  Translates addresses.
+ *  @see generic_char_map.h
+ */
+GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t)
 
 /** ARP address cache.
@@ -88,22 +94,7 @@
 INT_MAP_DECLARE(arp_protos, arp_proto_t)
 
-/** ARP address map.
- *  Translates addresses.
- *  @see generic_char_map.h
- */
-GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t)
-
 /** ARP device specific data.
  */
 struct arp_device{
-	/** Device identifier.
-	 */
-	device_id_t device_id;
-	/** Hardware type.
-	 */
-	hw_type_t hardware;
-	/** Packet dimension.
-	 */
-	packet_dimension_t packet_dimension;
 	/** Actual device hardware address.
 	 */
@@ -118,7 +109,13 @@
 	 */
 	char * broadcast_data;
-	/** Device module service.
+	/** Device identifier.
 	 */
-	services_t service;
+	device_id_t device_id;
+	/** Hardware type.
+	 */
+	hw_type_t hardware;
+	/** Packet dimension.
+	 */
+	packet_dimension_t packet_dimension;
 	/** Device module phone.
 	 */
@@ -128,4 +125,25 @@
 	 */
 	arp_protos_t protos;
+	/** Device module service.
+	 */
+	services_t service;
+};
+
+/** ARP global data.
+ */
+struct	arp_globals{
+	/** ARP address cache.
+	 */
+	arp_cache_t cache;
+	/** The client connection processing function.
+	 *  The module skeleton propagates its own one.
+	 */
+	async_client_conn_t client_connection;
+	/** Networking module phone.
+	 */
+	int net_phone;
+	/** Safety lock.
+	 */
+	fibril_rwlock_t lock;
 };
 
@@ -133,7 +151,4 @@
  */
 struct arp_proto{
-	/** Protocol service.
-	 */
-	services_t service;
 	/** Actual device protocol address.
 	 */
@@ -145,22 +160,7 @@
 	 */
 	arp_addr_t addresses;
-};
-
-/** ARP global data.
- */
-struct	arp_globals{
-	/** Networking module phone.
+	/** Protocol service.
 	 */
-	int net_phone;
-	/** Safety lock.
-	 */
-	fibril_rwlock_t lock;
-	/** ARP address cache.
-	 */
-	arp_cache_t cache;
-	/** The client connection processing function.
-	 *  The module skeleton propagates its own one.
-	 */
-	async_client_conn_t client_connection;
+	services_t service;
 };