diff --git a/pkg/libcoap/0001-Add-RIOT-Makefile.patch b/pkg/libcoap/0001-Add-RIOT-Makefile.patch
index f15c3ec0c..d1d3fa1d4 100644
--- a/pkg/libcoap/0001-Add-RIOT-Makefile.patch
+++ b/pkg/libcoap/0001-Add-RIOT-Makefile.patch
@@ -1,24 +1,23 @@
-From b3ef68af33cb65f36666a416b71d7eb768715eca Mon Sep 17 00:00:00 2001
+From bc86f013bbfc1eca7151d4faa2bb9ca33987115c Mon Sep 17 00:00:00 2001
 From: Martine Lenders <mlenders@inf.fu-berlin.de>
 Date: Thu, 31 Oct 2013 13:36:10 +0100
 Subject: [PATCH 1/8] Add RIOT Makefile
 
 ---
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
+ Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
  create mode 100644 Makefile
 
 diff --git a/Makefile b/Makefile
 new file mode 100644
-index 0000000..f90baa1
+index 0000000..7f37ccc
 --- /dev/null
 +++ b/Makefile
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,4 @@
 +MODULE:=$(shell basename $(CURDIR))
-+INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_legacy/include -I$(RIOTBASE)/cpu/arm7_common/include -I$(RIOTBASE)/sys/net/transport_layer/include -I$(RIOTBASE)/sys/net/sixlowpan/include/ -I$(RIOTBASE)/sys/net/ieee802154/include -I$(RIOTBASE)/sys/net/net_help -I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
 +CFLAGS += -DWITH_POSIX
 +
 +include $(RIOTBASE)/Makefile.base
---
-1.8.3.2
+-- 
+1.9.1
 
diff --git a/pkg/libcoap/Makefile.include b/pkg/libcoap/Makefile.include
index a6fb43a14..dab6b7a26 100644
--- a/pkg/libcoap/Makefile.include
+++ b/pkg/libcoap/Makefile.include
@@ -1,4 +1,3 @@
 INCLUDES += -I$(RIOTBASE)/pkg/libcoap/libcoap \
 			-I$(RIOTBASE)/sys/posix/include \
-			-I$(RIOTBASE)/sys/posix/pnet/include \
 			-I$(RIOTBASE)/sys/net/include
diff --git a/pkg/micro-ecc/Makefile b/pkg/micro-ecc/Makefile
index 961ca7782..4dfe2d2e2 100644
--- a/pkg/micro-ecc/Makefile
+++ b/pkg/micro-ecc/Makefile
@@ -8,7 +8,7 @@ endif
 
 ifneq ($(RIOTBASE),)
 INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-			-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
+			-I$(RIOTBASE)/sys/posix/include
 endif
 
 MODULE:=$(shell basename $(CURDIR))
diff --git a/pkg/microcoap/Makefile b/pkg/microcoap/Makefile
index 16614b5ed..4d2a4b6b0 100644
--- a/pkg/microcoap/Makefile
+++ b/pkg/microcoap/Makefile
@@ -9,7 +9,7 @@ endif
 
 ifneq ($(RIOTBASE),)
 INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-			-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
+			-I$(RIOTBASE)/sys/posix/include
 endif
 
 .PHONY: all clean patch reset
diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile
index 7b46f0acf..b357ec1f7 100644
--- a/pkg/oonf_api/Makefile
+++ b/pkg/oonf_api/Makefile
@@ -8,7 +8,7 @@ endif
 
 ifneq ($(RIOTBASE),)
 INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-			-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
+			-I$(RIOTBASE)/sys/posix/include
 endif
 
 MODULE:=$(shell basename $(CURDIR))
diff --git a/sys/Makefile.include b/sys/Makefile.include
index e55f67826..f34f4247e 100644
--- a/sys/Makefile.include
+++ b/sys/Makefile.include
@@ -14,7 +14,7 @@ ifneq (,$(filter posix,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
 endif
 ifneq (,$(filter pnet,$(USEMODULE)))
-    USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/pnet/include
+    USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
 endif
 ifneq (,$(filter pthread,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/pthread/include
diff --git a/sys/posix/pnet/include/arpa/inet.h b/sys/posix/include/arpa/inet.h
similarity index 100%
rename from sys/posix/pnet/include/arpa/inet.h
rename to sys/posix/include/arpa/inet.h
diff --git a/sys/posix/pnet/include/netinet/in.h b/sys/posix/include/netinet/in.h
similarity index 100%
rename from sys/posix/pnet/include/netinet/in.h
rename to sys/posix/include/netinet/in.h
diff --git a/sys/posix/pnet/include/sys/socket.h b/sys/posix/include/sys/socket.h
similarity index 100%
rename from sys/posix/pnet/include/sys/socket.h
rename to sys/posix/include/sys/socket.h