diff --git a/Makefile.am b/Makefile.am
index 7447424..8464358 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ libpkgconf_la_LDFLAGS = -version-info 1:0:0
 pkgconf_MANS     = pkgconf.1
 pkgconf_LDADD    = libpkgconf.la
 pkgconf_SOURCES  = main.c getopt_long.c
+noinst_HEADERS   = getopt_long.h
 
 dist_doc_DATA = README.md AUTHORS
 
diff --git a/getopt_long.c b/getopt_long.c
index 4db51e6..240c5ad 100644
--- a/getopt_long.c
+++ b/getopt_long.c
@@ -56,15 +56,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-
 #include "getopt_long.h"
 
-#include "stdinc.h"
-
 #include <errno.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #define PKGCONF_HACK_LOGICAL_OR_ALL_VALUES
 
diff --git a/getopt_long.h b/getopt_long.h
index 79b7e4f..b124291 100644
--- a/getopt_long.h
+++ b/getopt_long.h
@@ -30,12 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-
 #ifndef _GETOPT_LONG_H_
 #define _GETOPT_LONG_H_
 
-#include "stdinc.h"
+#include <stdint.h>
 
 /*
  * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.