Index: uspace/lib/c/include/byteorder.h
===================================================================
--- uspace/lib/c/include/byteorder.h	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ uspace/lib/c/include/byteorder.h	(revision 2687bdbc4faca1a8782e8afa0768320dcf8ee0c3)
@@ -80,4 +80,9 @@
 #endif
 
+#define htons(n)	host2uint16_t_be((n))
+#define htonl(n)	host2uint32_t_be((n))
+#define ntohs(n)	uint16_t_be2host((n))
+#define ntohl(n)	uint32_t_be2host((n))
+
 static inline uint64_t uint64_t_byteorder_swap(uint64_t n)
 {
Index: uspace/lib/socket/include/inet.h
===================================================================
--- uspace/lib/socket/include/inet.h	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ uspace/lib/socket/include/inet.h	(revision 2687bdbc4faca1a8782e8afa0768320dcf8ee0c3)
@@ -39,6 +39,5 @@
 
 #include <sys/types.h>
-
-#include <net_byteorder.h>
+#include <byteorder.h>
 
 /** Type definition of the socket address.
Index: pace/lib/socket/include/net_byteorder.h
===================================================================
--- uspace/lib/socket/include/net_byteorder.h	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ 	(revision )
@@ -1,71 +1,0 @@
-/*
- * Copyright (c) 2009 Lukas Mejdrech
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup net
- *  @{
- */
-
-/** @file
- *  Host - network byte order manipulation functions.
- */
-
-#ifndef __NET_BYTEORDER_H__
-#define __NET_BYTEORDER_H__
-
-#include <byteorder.h>
-#include <sys/types.h>
-
-
-/** Converts the given short number (16 bit) from the host byte order to the network byte order (big endian).
- *  @param[in] number The number in the host byte order to be converted.
- *  @returns The number in the network byte order.
- */
-#define htons(number)		host2uint16_t_be(number)
-
-/** Converts the given long number (32 bit) from the host byte order to the network byte order (big endian).
- *  @param[in] number The number in the host byte order to be converted.
- *  @returns The number in the network byte order.
- */
-#define htonl(number)		host2uint32_t_be(number)
-
-/** Converts the given short number (16 bit) from the network byte order (big endian) to the host byte order.
- *  @param[in] number The number in the network byte order to be converted.
- *  @returns The number in the host byte order.
- */
-#define ntohs(number) 	uint16_t_be2host(number)
-
-/** Converts the given long number (32 bit) from the network byte order (big endian) to the host byte order.
- *  @param[in] number The number in the network byte order to be converted.
- *  @returns The number in the host byte order.
- */
-#define ntohl(number)		uint32_t_be2host(number)
-
-#endif
-
-/** @}
- */
Index: uspace/lib/socket/include/socket.h
===================================================================
--- uspace/lib/socket/include/socket.h	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ uspace/lib/socket/include/socket.h	(revision 2687bdbc4faca1a8782e8afa0768320dcf8ee0c3)
@@ -41,6 +41,6 @@
 
 #include <net/socket_codes.h>
-
-#include <net_byteorder.h>
+#include <byteorder.h>
+
 #include <in.h>
 #include <in6.h>
Index: uspace/srv/hw/netif/dp8390/dp8390.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390.c	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ uspace/srv/hw/netif/dp8390/dp8390.c	(revision 2687bdbc4faca1a8782e8afa0768320dcf8ee0c3)
@@ -34,7 +34,7 @@
 
 #include <assert.h>
+#include <byteorder.h>
 #include <errno.h>
 
-#include <net_byteorder.h>
 #include <netif_local.h>
 #include <packet/packet.h>
Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ uspace/srv/net/il/arp/arp.c	(revision 2687bdbc4faca1a8782e8afa0768320dcf8ee0c3)
@@ -45,9 +45,9 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <byteorder.h>
 #include <err.h>
 
 #include <net_messages.h>
 #include <net_modules.h>
-#include <net_byteorder.h>
 #include <net_device.h>
 #include <arp_interface.h>
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ uspace/srv/net/il/ip/ip.c	(revision 2687bdbc4faca1a8782e8afa0768320dcf8ee0c3)
@@ -45,4 +45,5 @@
 #include <ipc/services.h>
 #include <sys/types.h>
+#include <byteorder.h>
 
 #include <net/socket_codes.h>
@@ -51,5 +52,4 @@
 #include <net_modules.h>
 #include <arp_interface.h>
-#include <net_byteorder.h>
 #include <net_checksum.h>
 #include <net_device.h>
Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ uspace/srv/net/nil/eth/eth.c	(revision 2687bdbc4faca1a8782e8afa0768320dcf8ee0c3)
@@ -40,4 +40,5 @@
 #include <mem.h>
 #include <stdio.h>
+#include <byteorder.h>
 #include <str.h>
 #include <err.h>
@@ -48,5 +49,4 @@
 #include <net_messages.h>
 #include <net_modules.h>
-#include <net_byteorder.h>
 #include <net_checksum.h>
 #include <ethernet_lsap.h>
Index: uspace/srv/net/tl/icmp/icmp.c
===================================================================
--- uspace/srv/net/tl/icmp/icmp.c	(revision fe5d3c1b64b0aa0d725ebec36da66268182df69e)
+++ uspace/srv/net/tl/icmp/icmp.c	(revision 2687bdbc4faca1a8782e8afa0768320dcf8ee0c3)
@@ -46,4 +46,5 @@
 #include <sys/time.h>
 #include <sys/types.h>
+#include <byteorder.h>
 #include <errno.h>
 #include <err.h>
@@ -56,5 +57,4 @@
 #include <packet/packet_client.h>
 #include <packet_remote.h>
-#include <net_byteorder.h>
 #include <net_checksum.h>
 #include <icmp_api.h>