diff --git a/configure.ac b/configure.ac
index 5562a61d..301ad0cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,9 +83,6 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
       #include <netinet/in.h>
    ])
 
-# Needed for plibc.h
-AC_CHECK_DECLS([_stati64, _wstat32i64])
-
 AC_CHECK_PROG(HAVE_CURL_BINARY,[curl],true,false)
 AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY)
 AC_CHECK_PROG(HAVE_MAKEINFO_BINARY,[makeinfo],true,false)
@@ -175,12 +172,6 @@ netbsd*)
      AM_CONDITIONAL(HAVE_W32, true)
      LDFLAGS="$LDFLAGS -lws2_32"
      AM_CONDITIONAL(HAVE_GNU_LD, true)
-     # check if PlibC is available
-     CHECK_PLIBC
-     LIBS="$PLIBC_LIBS $LIBS"
-     AC_SUBST(PLIBC_LIBS)
-     AC_SUBST(PLIBC_LDFLAGS)
-     AC_SUBST(PLIBC_CPPFLAGS)
      os_is_windows=yes
      ;;
 *openedition*)
@@ -262,10 +253,6 @@ if test "x$disable_pipes" = "xyes"; then
 	AC_DEFINE([[MHD_DONT_USE_PIPES]], [[1]], [Define to use pair of sockets instead of pipes for signaling])
 fi
 
-# Check for plibc.h from system, if not found, use our own
-AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1)
-AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1)
-
 AC_CHECK_FUNCS_ONCE(memmem)
 AC_CHECK_FUNCS_ONCE(accept4)
 AC_MSG_CHECKING([[for gmtime_s]])
@@ -635,7 +622,6 @@ doc/examples/Makefile
 m4/Makefile
 src/Makefile
 src/include/Makefile
-src/include/plibc/Makefile
 src/microhttpd/Makefile
 src/microspdy/Makefile
 src/spdy2http/Makefile
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index e4335985..8a385ba8 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,11 +1,6 @@
 SUBDIRS  = .
 
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
 AM_CPPFLAGS = \
-  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include
 
 AM_CFLAGS = @LIBGCRYPT_CFLAGS@
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index f5fd2be0..f8147bbf 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,11 +1,6 @@
 SUBDIRS  = .
 
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
 AM_CPPFLAGS = \
-  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   -DDATA_DIR=\"$(top_srcdir)/src/datadir/\"
 
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index cce55616..66761396 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = plibc .
+SUBDIRS = .
 
 if ENABLE_SPDY
 microspdy = microspdy.h
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 7dd6ba77..b88e6fa9 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -1,13 +1,8 @@
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
 if HAVE_W32
   W32FUNC_SRC = ../platform/w32functions.c ../platform/w32functions.h
 endif
 
 AM_CPPFLAGS = \
-  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)/src/microhttpd \
   -I$(top_srcdir)/src/platform
diff --git a/src/microspdy/Makefile.am b/src/microspdy/Makefile.am
index 1af67a0d..bc480646 100644
--- a/src/microspdy/Makefile.am
+++ b/src/microspdy/Makefile.am
@@ -1,9 +1,4 @@
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
 AM_CPPFLAGS = \
-  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)/src/microspdy
 
diff --git a/src/spdy2http/Makefile.am b/src/spdy2http/Makefile.am
index 8b83ee91..4498fba9 100644
--- a/src/spdy2http/Makefile.am
+++ b/src/spdy2http/Makefile.am
@@ -6,12 +6,7 @@ if USE_COVERAGE
   AM_CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
 AM_CPPFLAGS = \
-  $(PLIBC_INCLUDE) \
  -I$(top_srcdir) \
  -I$(top_srcdir)/src/include \
  -I$(top_srcdir)/src/applicationlayer \
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 33e95d36..627d09a2 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -8,12 +8,7 @@ if ENABLE_HTTPS
   SUBDIRS += https
 endif
 
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
 AM_CPPFLAGS = \
-  $(PLIBC_INCLUDE) \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/microhttpd \
 -I$(top_srcdir)/src/include \
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 2051423d..37313343 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -4,12 +4,7 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage
 endif
 
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
 AM_CPPFLAGS = \
-  $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)/src/microhttpd \
   -I$(top_srcdir)/src/platform \
diff --git a/src/testspdy/Makefile.am b/src/testspdy/Makefile.am
index b7e16fba..769e8bba 100644
--- a/src/testspdy/Makefile.am
+++ b/src/testspdy/Makefile.am
@@ -6,12 +6,7 @@ if USE_COVERAGE
   AM_CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
-
 AM_CPPFLAGS = \
-  $(PLIBC_INCLUDE) \
  -I$(top_srcdir) \
  -I$(top_srcdir)/src/include \
  -I$(top_srcdir)/src/applicationlayer \
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index c2fc9dee..99a1485e 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -4,11 +4,8 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-if USE_PRIVATE_PLIBC_H
- PLIBC_INCLUDE = -I$(top_srcdir)/src/include/plibc
-endif
 
-AM_CPPFLAGS = $(PLIBC_INCLUDE) -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 EXTRA_DIST = README socat.c