diff --git a/Makefile.am.inc b/Makefile.am.inc
index b1ebce8..5886498 100644
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -1,2 +1,2 @@
-AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+AM_CFLAGS = -Wall -Wwrite-strings -D_REENTRANT
 
diff --git a/configure.in b/configure.in
index bcb9027..eadf4f9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,14 +1,17 @@
 AC_PREREQ(2.52)
 
 # Process this file with autoconf to produce a configure script.
-AC_INIT([json-c], 0.10, [json-c@googlegroups.com])
+AC_INIT([json-c], [0.10], [json-c@googlegroups.com])
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AC_PROG_MAKE_SET
 
 # Checks for programs.
-
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
+ 
 # Checks for libraries.
 
 # Checks for header files.
diff --git a/linkhash.c b/linkhash.c
index ddedc12..7f9426d 100644
--- a/linkhash.c
+++ b/linkhash.c
@@ -17,6 +17,7 @@
 #include <stddef.h>
 #include <limits.h>
 
+#include "config.h"
 #include "linkhash.h"
 
 void lh_abort(const char *msg, ...)
diff --git a/tests/test1.c b/tests/test1.c
index 9802eb1..71582c8 100644
--- a/tests/test1.c
+++ b/tests/test1.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/tests/test2.c b/tests/test2.c
index 4a6b660..73afb5b 100644
--- a/tests/test2.c
+++ b/tests/test2.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/tests/test_printbuf.c b/tests/test_printbuf.c
index ee3f80d..c704e22 100644
--- a/tests/test_printbuf.c
+++ b/tests/test_printbuf.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <stddef.h>
 #include <stdio.h>