Index: uspace/lib/net/include/ip_interface.h
===================================================================
--- uspace/lib/net/include/ip_interface.h	(revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce)
+++ uspace/lib/net/include/ip_interface.h	(revision b278b4e488fac57504e4a018c35951206373c032)
@@ -44,18 +44,4 @@
 #include <ip_codes.h>
 
-#ifdef CONFIG_IL_TL_BUNDLE
-
-#include <ip_local.h>
-
-#define ip_received_error_msg  ip_received_error_msg_local
-#define ip_set_gateway_req     ip_set_gateway_req_local
-#define ip_packet_size_req     ip_packet_size_req_local
-#define ip_device_req          ip_device_req_local
-#define ip_add_route_req       ip_add_route_req_local
-#define ip_send_msg            ip_send_msg_local
-#define ip_get_route_req       ip_get_route_req_local
-
-#else
-
 #include <ip_remote.h>
 
@@ -67,6 +53,4 @@
 #define ip_send_msg            ip_send_msg_remote
 #define ip_get_route_req       ip_get_route_req_remote
-
-#endif
 
 /** @name IP module interface
Index: uspace/lib/net/include/netif_nil_bundle.h
===================================================================
--- uspace/lib/net/include/netif_nil_bundle.h	(revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce)
+++ 	(revision )
@@ -1,46 +1,0 @@
-/*
- * Copyright (c) 2010 Martin Decky
- * 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 netif_standalone
- *  @{
- */
-
-#ifndef __NETIF_NIL_BUNDLE_H__
-#define __NETIF_NIL_BUNDLE_H__
-
-#include <ipc/ipc.h>
-#include <async.h>
-
-extern int netif_nil_module_message(const char *, ipc_callid_t, ipc_call_t *,
-    ipc_call_t *, int *);
-extern int netif_nil_module_start(async_client_conn_t);
-
-#endif
-
-/** @}
- */
Index: uspace/lib/net/include/nil_interface.h
===================================================================
--- uspace/lib/net/include/nil_interface.h	(revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce)
+++ uspace/lib/net/include/nil_interface.h	(revision b278b4e488fac57504e4a018c35951206373c032)
@@ -68,14 +68,4 @@
 
 
-#ifdef CONFIG_NETIF_NIL_BUNDLE
-
-#include <nil_local.h>
-#include <packet/packet_server.h>
-
-#define nil_device_state_msg  nil_device_state_msg_local
-#define nil_received_msg      nil_received_msg_local
-
-#else /* CONFIG_NETIF_NIL_BUNDLE */
-
 #include <nil_remote.h>
 #include <packet/packet_server.h>
@@ -84,6 +74,4 @@
 #define nil_received_msg      nil_received_msg_remote
 
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
-
 #endif
 
Index: uspace/lib/net/tl/tl_common.c
===================================================================
--- uspace/lib/net/tl/tl_common.c	(revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce)
+++ uspace/lib/net/tl/tl_common.c	(revision b278b4e488fac57504e4a018c35951206373c032)
@@ -50,5 +50,4 @@
 #include <net_device.h>
 #include <icmp_interface.h>
-#include <ip_local.h>
 #include <ip_remote.h>
 #include <ip_interface.h>