diff --git a/hermit/Makefile b/hermit/Makefile
index b8e874f1d..1558c9f86 100644
--- a/hermit/Makefile
+++ b/hermit/Makefile
@@ -2,8 +2,7 @@ TERM = xterm
 TOPDIR := $(shell pwd)
 ARCH = x86
 NAME = hermit
-LWIPDIRS = lwip/src/arch lwip/src/api lwip/src/core lwip/src/core/ipv4 lwip/src/netif
-KERNDIRS = kernel mm libkern fs arch/$(ARCH)/kernel arch/$(ARCH)/mm $(LWIPDIRS)
+KERNDIRS = kernel mm libkern fs arch/$(ARCH)/kernel arch/$(ARCH)/mm
 SUBDIRS = $(KERNDIRS)
 GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags)
 TODAY := $(shell date +'%Y%m%d')
diff --git a/hermit/include/stdarg.h b/hermit/include/stdarg.h
deleted file mode 100644
index ff2293b0b..000000000
--- a/hermit/include/stdarg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __ANSI_STDARG_H__
-#define __ANSI_STDARG_H__
-
-#include <hermit/stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define __VALIST 	va_list
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/hermit/include/stddef.h b/hermit/include/stddef.h
deleted file mode 100644
index f7d2e74e3..000000000
--- a/hermit/include/stddef.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ANSI_STDDEF_H__
-#define __ANSI_STDDEF_H__
-
-#include <hermit/stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/hermit/include/string.h b/hermit/include/string.h
deleted file mode 100644
index 5c8b65e5b..000000000
--- a/hermit/include/string.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ANSI_STRING_H__
-#define __ANSI_STRING_H__
-
-#include <hermit/string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/hermit/kernel/main.c b/hermit/kernel/main.c
index 6838b2f86..4cf1dd97d 100644
--- a/hermit/kernel/main.c
+++ b/hermit/kernel/main.c
@@ -39,17 +39,6 @@
 #include <asm/atomic.h>
 #include <asm/page.h>
 
-#include <lwip/init.h>
-#include <lwip/sys.h>
-#include <lwip/stats.h>
-#include <lwip/udp.h>
-#include <lwip/tcp.h>
-#include <lwip/tcpip.h>
-#include <lwip/dhcp.h>
-#include <lwip/netifapi.h>
-#include <lwip/timers.h>
-#include <netif/etharp.h>
-
 /*
  * Note that linker symbols are not variables, they have no memory allocated for
  * maintaining a value, rather their address is their value.
@@ -105,30 +94,6 @@ static int hermit_init(void)
 	return 0;
 }
 
-static void tcpip_init_done(void* arg)
-{
-	sys_sem_t* sem = (sys_sem_t*)arg;
-
-	kprintf("LwIP's tcpip thread has task id %d\n", per_core(current_task)->id);
-
-	sys_sem_signal(sem);
-}
-
-static int init_netifs(void)
-{
-	sys_sem_t	sem;
-
-	if(sys_sem_new(&sem, 0) != ERR_OK)
-		LWIP_ASSERT("Failed to create semaphore", 0);
-
-	tcpip_init(tcpip_init_done, &sem);
-	sys_sem_wait(&sem);
-	kprintf("TCP/IP initialized.\n");
-	sys_sem_free(&sem);
-
-	return 0;
-}
-
 int smp_main(void)
 {
 	int32_t cpu = atomic_int32_inc(&cpu_online);
@@ -159,10 +124,6 @@ static int initd(void* arg)
 	create_user_task(NULL, "/bin/jacobi", argv2, NORMAL_PRIO);
 	//create_user_task(NULL, "/bin/stream", argv3, NORMAL_PRIO);
 
-#if 0
-	init_netifs();
-#endif
-
 	return 0;
 }