diff --git a/pkg/libcoap/0001-Add-RIOT-Makefile.patch b/pkg/libcoap/0001-Add-RIOT-Makefile.patch
index f15c3ec0c39f5b7bd417560bbe242deed5749334..d1d3fa1d4f6baf2868903d46f95e941da6b07e19 100644
Binary files a/pkg/libcoap/0001-Add-RIOT-Makefile.patch and b/pkg/libcoap/0001-Add-RIOT-Makefile.patch differ
diff --git a/pkg/libcoap/Makefile.include b/pkg/libcoap/Makefile.include
index a6fb43a1484b2d7c095149a9e5d2767f0ec1cf60..dab6b7a26a131e46250242eaf8f51d550b168a2f 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 961ca7782eff4f5ee3b4b9c299524717729e99bd..4dfe2d2e2e937a67ea93bb8cc4ea66dfa7dcbaf8 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 16614b5ed71d7660e7178c4a294a2452b55db33b..4d2a4b6b0f43a86272deaf14416c5c9920f21b3b 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 7b46f0acf1000f63e7a3d93f50d76181de736d03..b357ec1f7d03af046d64ffae3ca2a6547305a9e1 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 e55f67826a43394df002d7f50cfe8ae379b57588..f34f4247e23c25fc426299622ed30e9208403de5 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