diff --git a/repos/libports/lib/mk/lwip.mk b/repos/libports/lib/mk/lwip.mk
index 3b3e6c7f78..c8838e739b 100644
--- a/repos/libports/lib/mk/lwip.mk
+++ b/repos/libports/lib/mk/lwip.mk
@@ -9,9 +9,6 @@ LWIPDIR := $(LWIP_PORT_DIR)/src/lib/lwip/src
 
 -include $(LWIPDIR)/Filelists.mk
 
-# Genode platform files
-SRC_CC = printf.cc rand.cc sys_arch.cc
-
 # Core files
 SRC_C += $(notdir $(COREFILES))
 
@@ -24,14 +21,12 @@ SRC_C += $(notdir $(CORE6FILES))
 # Network interface files
 SRC_C += $(notdir $(NETIFFILES))
 
-INC_DIR += $(REP_DIR)/include/lwip \
-           $(LWIP_PORT_DIR)/include/lwip \
+INC_DIR += $(LWIP_PORT_DIR)/include/lwip \
            $(LWIPDIR)/include \
            $(LWIPDIR)/include/ipv4 \
            $(LWIPDIR)/include/api \
            $(LWIPDIR)/include/netif \
            $(REP_DIR)/src/lib/lwip/include
 
-vpath %.cc $(REP_DIR)/src/lib/lwip/platform
 vpath %.c  $(sort $(dir \
 	$(COREFILES) $(CORE4FILES) $(CORE6FILES) $(NETIFFILES)))
diff --git a/repos/libports/lib/mk/vfs_lwip.mk b/repos/libports/lib/mk/vfs_lwip.mk
index b71b7174f6..89354fc379 100644
--- a/repos/libports/lib/mk/vfs_lwip.mk
+++ b/repos/libports/lib/mk/vfs_lwip.mk
@@ -1,7 +1,10 @@
-SRC_CC = vfs.cc
+SRC_CC = vfs.cc printf.cc rand.cc sys_arch.cc
 
 VFS_DIR  = $(REP_DIR)/src/lib/vfs/lwip
 INC_DIR += $(VFS_DIR)
+
+REP_INC_DIR += src/lib/lwip/include
+
 LD_OPT  += --version-script=$(VFS_DIR)/symbol.map
 
 LIBS += lwip
diff --git a/repos/libports/recipes/api/lwip/content.mk b/repos/libports/recipes/api/lwip/content.mk
index f83371e43e..c789f04d8d 100644
--- a/repos/libports/recipes/api/lwip/content.mk
+++ b/repos/libports/recipes/api/lwip/content.mk
@@ -1,5 +1,5 @@
 MIRROR_FROM_REP_DIR := \
-	$(shell cd $(REP_DIR); find include/lwip src/lib/lwip -type f) \
+	$(shell cd $(REP_DIR); find src/lib/lwip -type f) \
 	lib/import/import-lwip.mk \
 	lib/mk/lwip.mk \
 
diff --git a/repos/libports/include/lwip/arch/cc.h b/repos/libports/src/lib/lwip/include/arch/cc.h
similarity index 100%
rename from repos/libports/include/lwip/arch/cc.h
rename to repos/libports/src/lib/lwip/include/arch/cc.h
diff --git a/repos/libports/include/lwip/arch/perf.h b/repos/libports/src/lib/lwip/include/arch/perf.h
similarity index 100%
rename from repos/libports/include/lwip/arch/perf.h
rename to repos/libports/src/lib/lwip/include/arch/perf.h
diff --git a/repos/libports/include/lwip/lwipopts.h b/repos/libports/src/lib/lwip/include/lwipopts.h
similarity index 100%
rename from repos/libports/include/lwip/lwipopts.h
rename to repos/libports/src/lib/lwip/include/lwipopts.h
diff --git a/repos/libports/include/lwip/genode_init.h b/repos/libports/src/lib/vfs/lwip/lwip_genode_init.h
similarity index 100%
rename from repos/libports/include/lwip/genode_init.h
rename to repos/libports/src/lib/vfs/lwip/lwip_genode_init.h
diff --git a/repos/libports/include/lwip/nic_netif.h b/repos/libports/src/lib/vfs/lwip/nic_netif.h
similarity index 99%
rename from repos/libports/include/lwip/nic_netif.h
rename to repos/libports/src/lib/vfs/lwip/nic_netif.h
index 004ad00a55..13d11dc5fc 100644
--- a/repos/libports/include/lwip/nic_netif.h
+++ b/repos/libports/src/lib/vfs/lwip/nic_netif.h
@@ -26,7 +26,7 @@
 #endif
 
 /* Genode includes */
-#include <lwip/genode_init.h>
+#include <lwip_genode_init.h>
 #include <nic/packet_allocator.h>
 #include <nic_session/connection.h>
 #include <base/log.h>
diff --git a/repos/libports/src/lib/lwip/platform/printf.cc b/repos/libports/src/lib/vfs/lwip/printf.cc
similarity index 100%
rename from repos/libports/src/lib/lwip/platform/printf.cc
rename to repos/libports/src/lib/vfs/lwip/printf.cc
diff --git a/repos/libports/src/lib/lwip/platform/rand.cc b/repos/libports/src/lib/vfs/lwip/rand.cc
similarity index 100%
rename from repos/libports/src/lib/lwip/platform/rand.cc
rename to repos/libports/src/lib/vfs/lwip/rand.cc
diff --git a/repos/libports/src/lib/lwip/platform/sys_arch.cc b/repos/libports/src/lib/vfs/lwip/sys_arch.cc
similarity index 98%
rename from repos/libports/src/lib/lwip/platform/sys_arch.cc
rename to repos/libports/src/lib/vfs/lwip/sys_arch.cc
index 39b708bb0c..64bbe009a8 100644
--- a/repos/libports/src/lib/lwip/platform/sys_arch.cc
+++ b/repos/libports/src/lib/vfs/lwip/sys_arch.cc
@@ -17,7 +17,7 @@
 #include <util/reconstructible.h>
 #include <base/sleep.h>
 
-#include <lwip/genode_init.h>
+#include <lwip_genode_init.h>
 
 extern "C" {
 /* LwIP includes */
diff --git a/repos/libports/src/lib/vfs/lwip/vfs.cc b/repos/libports/src/lib/vfs/lwip/vfs.cc
index f61f936eb0..03b1d5a3aa 100644
--- a/repos/libports/src/lib/vfs/lwip/vfs.cc
+++ b/repos/libports/src/lib/vfs/lwip/vfs.cc
@@ -24,8 +24,8 @@
 #include <base/log.h>
 
 /* LwIP includes */
-#include <lwip/genode_init.h>
-#include <lwip/nic_netif.h>
+#include <lwip_genode_init.h>
+#include <nic_netif.h>
 
 namespace Lwip {
 extern "C" {