diff --git a/.gitignore b/.gitignore
index ddd7705..2f38378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ tests/bandwidth-server-one
 tests/random-test-client
 tests/random-test-server
 tests/unit-test-client
+tests/unit-test.h
 tests/unit-test-server
 tests/version
 doc/*.html
diff --git a/configure.ac b/configure.ac
index 39d3160..0d9bc8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,17 +16,15 @@ m4_define([libmodbus_version_minor], [0])
 m4_define([libmodbus_version_micro], [1])
 
 m4_define([libmodbus_release_status],
-            [m4_if(m4_eval(libmodbus_version_minor % 2), [1], [snapshot],
-               [release])])
+    [m4_if(m4_eval(libmodbus_version_minor % 2), [1], [snapshot], [release])])
 
 m4_define([libmodbus_version],
-        [libmodbus_version_major.libmodbus_version_minor.libmodbus_version_micro])
+    [libmodbus_version_major.libmodbus_version_minor.libmodbus_version_micro])
 
 AC_PREREQ([2.63])
 AC_INIT([libmodbus],[libmodbus_version],
 [https://github.com/stephane/libmodbus/issues])
-AC_CONFIG_SRCDIR([src/modbus.c])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h tests/unit-test.h])
 AM_INIT_AUTOMAKE([foreign])
 # enable nice build output on automake1.11
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/tests/unit-test.h b/tests/unit-test.h.in
index 78575c1..d2aa14c 100644
--- a/tests/unit-test.h
+++ b/tests/unit-test.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
+ * Copyright © 2008-2011 Stéphane Raimbault <stephane.raimbault@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,9 @@
 #ifndef _UNIT_TEST_H_
 #define _UNIT_TEST_H_
 
-#include <config.h>
+/* Constants defined by configure.ac */
+#define HAVE_INTTYPES_H @HAVE_INTTYPES_H@
+#define HAVE_STDINT_H @HAVE_STDINT_H@
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>