diff --git a/include/pcp/config.h b/include/pcp/config.h
new file mode 100644
index 0000000..108b038
--- /dev/null
+++ b/include/pcp/config.h
@@ -0,0 +1,180 @@
+/* include/pcp/config.h.  Generated from config.h.in by configure.  */
+/* include/pcp/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the `arc4random_buf' function. */
+#define HAVE_ARC4RANDOM_BUF 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the `be32toh' function. */
+/* #undef HAVE_BE32TOH */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <endian.h> header file. */
+/* #undef HAVE_ENDIAN_H */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the <err.h> header file. */
+#define HAVE_ERR_H 1
+
+/* Define to 1 if you have the `fopen' function. */
+#define HAVE_FOPEN 1
+
+/* Define to 1 if you have the `fprintf' function. */
+#define HAVE_FPRINTF 1
+
+/* Define to 1 if you have the `fread' function. */
+#define HAVE_FREAD 1
+
+/* Define to 1 if you have the `free' function. */
+#define HAVE_FREE 1
+
+/* Define to 1 if you have the `fseek' function. */
+#define HAVE_FSEEK 1
+
+/* Define to 1 if you have the `ftruncate' function. */
+#define HAVE_FTRUNCATE 1
+
+/* Define to 1 if you have the `fwrite' function. */
+#define HAVE_FWRITE 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `getopt_long' function. */
+#define HAVE_GETOPT_LONG 1
+
+/* Define to 1 if you have the `htobe32' function. */
+/* #undef HAVE_HTOBE32 */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `isatty' function. */
+#define HAVE_ISATTY 1
+
+/* Define to 1 if you have the `sodium' library (-lsodium). */
+#define HAVE_LIBSODIUM 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the `malloc' function. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the `perror' function. */
+#define HAVE_PERROR 1
+
+/* Define to 1 if you have the `sizeof' function. */
+/* #undef HAVE_SIZEOF */
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlen' function. */
+#define HAVE_STRLEN 1
+
+/* Define to 1 if you have the `strnlen' function. */
+#define HAVE_STRNLEN 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the <sys/endian.h> header file. */
+#define HAVE_SYS_ENDIAN_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the `tcgetattr' function. */
+#define HAVE_TCGETATTR 1
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* Define to 1 if you have the `towlower' function. */
+#define HAVE_TOWLOWER 1
+
+/* Define to 1 if you have the `umask' function. */
+#define HAVE_UMASK 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
+/* Define to 1 if you have the <wctype.h> header file. */
+#define HAVE_WCTYPE_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Name of package */
+#define PACKAGE "pcp"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "pcp@daemon.de"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "pcp"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "pcp 0.1.5"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "pcp"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.1.5"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.1.5"
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
diff --git a/include/pcp/ed.h b/include/pcp/ed.h
index 8198bf8..e57684f 100644
--- a/include/pcp/ed.h
+++ b/include/pcp/ed.h
@@ -22,10 +22,6 @@
 #ifndef _HAVE_PCP_ED_H
 #define _HAVE_PCP_ED_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <sodium.h>
 #include <string.h>
 #include <stdio.h>
@@ -57,8 +53,4 @@ pcp_sig_t *pcp_ed_newsig(unsigned char *hash, char *id);
 
   void pcp_dumpsig(pcp_sig_t *sig);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif // _HAVE_PCP_ED_H
diff --git a/include/pcp/key.h b/include/pcp/key.h
index cc4e372..286bd83 100644
--- a/include/pcp/key.h
+++ b/include/pcp/key.h
@@ -23,10 +23,6 @@
 #ifndef _HAVE_PCP_KEYPAIR_H
 #define _HAVE_PCP_KEYPAIR_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <sodium.h>
 #include <string.h>
 #include <stdio.h>
@@ -163,8 +159,4 @@ void pcp_seckeyblob(void *blob, pcp_key_t *k);
 void pcp_pubkeyblob(void *blob, pcp_pubkey_t *k);
 void *pcp_keyblob(void *k, int type); // allocates blob
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif // _HAVE_PCP_KEYPAIR_H
diff --git a/include/pcp/keyhash.h b/include/pcp/keyhash.h
index b46e702..2cb85c3 100644
--- a/include/pcp/keyhash.h
+++ b/include/pcp/keyhash.h
@@ -22,10 +22,6 @@
 #ifndef _HAVE_KEYHASH_H
 #define _HAVE_KEYHASH_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "uthash.h"
 #include "key.h"
 
@@ -56,8 +52,4 @@ void pcphash_add(void *key, int type);
 int pcphash_count();
 int pcphash_countpub();
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif // _HAVE_KEYHASH_H
diff --git a/include/pcp/stamp-h1 b/include/pcp/stamp-h1
new file mode 100644
index 0000000..17cb7d1
--- /dev/null
+++ b/include/pcp/stamp-h1
@@ -0,0 +1 @@
+timestamp for include/pcp/config.h
diff --git a/include/pcp/zmq_z85.h b/include/pcp/zmq_z85.h
index ff0b710..e1b0b9a 100644
--- a/include/pcp/zmq_z85.h
+++ b/include/pcp/zmq_z85.h
@@ -25,15 +25,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 uint8_t *zmq_z85_decode (uint8_t *dest, char *string);
 char *zmq_z85_encode (char *dest, uint8_t *data, size_t size);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif