diff --git a/.gitignore b/.gitignore
index 318bbe66..5c182a85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,8 @@ Makefile.in
 examples/[cdv]webp
 examples/gif2webp
 examples/webpmux
+src/webp/config.h*
+src/webp/stamp-h1
 /output
 /doc/output
 *.idb
diff --git a/configure.ac b/configure.ac
index e88e5b41..128b76b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -459,7 +459,7 @@ AM_CONDITIONAL([BUILD_LIBWEBPDECODER], [test "$enable_libwebpdecoder" = "yes"])
 dnl =========================
 
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([src/webp/config.h])
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile \
                  examples/Makefile src/dec/Makefile \
                  src/enc/Makefile src/dsp/Makefile \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index f3b96e41..a333c6dc 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
 
 bin_PROGRAMS = dwebp cwebp
 if BUILD_VWEBP
diff --git a/examples/cwebp.c b/examples/cwebp.c
index c0692c9a..5f97dcf7 100644
--- a/examples/cwebp.c
+++ b/examples/cwebp.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #include "webp/encode.h"
diff --git a/examples/dwebp.c b/examples/dwebp.c
index 85c66622..9bde6ec2 100644
--- a/examples/dwebp.c
+++ b/examples/dwebp.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #ifdef WEBP_HAVE_PNG
diff --git a/examples/gif2webp.c b/examples/gif2webp.c
index ed0640aa..135d9e15 100644
--- a/examples/gif2webp.c
+++ b/examples/gif2webp.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #ifdef WEBP_HAVE_GIF
diff --git a/examples/jpegdec.c b/examples/jpegdec.c
index 823e22e2..c06da8dc 100644
--- a/examples/jpegdec.c
+++ b/examples/jpegdec.c
@@ -12,7 +12,7 @@
 #include "./jpegdec.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #include <stdio.h>
diff --git a/examples/pngdec.c b/examples/pngdec.c
index 21666bb9..e282ca4b 100644
--- a/examples/pngdec.c
+++ b/examples/pngdec.c
@@ -12,7 +12,7 @@
 #include "./pngdec.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #include <stdio.h>
diff --git a/examples/tiffdec.c b/examples/tiffdec.c
index 8fc61740..449d3b94 100644
--- a/examples/tiffdec.c
+++ b/examples/tiffdec.c
@@ -12,7 +12,7 @@
 #include "./tiffdec.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #include <stdio.h>
diff --git a/examples/vwebp.c b/examples/vwebp.c
index 1679132c..64c0f632 100644
--- a/examples/vwebp.c
+++ b/examples/vwebp.c
@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #include <stdio.h>
diff --git a/examples/webpmux.c b/examples/webpmux.c
index a72efe3b..ec261c60 100644
--- a/examples/webpmux.c
+++ b/examples/webpmux.c
@@ -46,7 +46,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #include <assert.h>
diff --git a/examples/wicdec.c b/examples/wicdec.c
index 22248922..ab6ba698 100644
--- a/examples/wicdec.c
+++ b/examples/wicdec.c
@@ -12,7 +12,7 @@
 #include "./wicdec.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "webp/config.h"
 #endif
 
 #include <stdio.h>
diff --git a/src/demux/demux.c b/src/demux/demux.c
index fa64a248..76441a64 100644
--- a/src/demux/demux.c
+++ b/src/demux/demux.c
@@ -11,7 +11,7 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../webp/config.h"
 #endif
 
 #include <assert.h>
diff --git a/src/dsp/dsp.h b/src/dsp/dsp.h
index 09fd524e..596febb3 100644
--- a/src/dsp/dsp.h
+++ b/src/dsp/dsp.h
@@ -15,7 +15,7 @@
 #define WEBP_DSP_DSP_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../webp/config.h"
 #endif
 
 #include "../webp/types.h"
diff --git a/src/enc/histogram.c b/src/enc/histogram.c
index 1bbef3d9..7c6abb4d 100644
--- a/src/enc/histogram.c
+++ b/src/enc/histogram.c
@@ -10,7 +10,7 @@
 // Author: Jyrki Alakuijala (jyrki@google.com)
 //
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../webp/config.h"
 #endif
 
 #include <math.h>
diff --git a/src/utils/thread.h b/src/utils/thread.h
index aef33bda..f482bad1 100644
--- a/src/utils/thread.h
+++ b/src/utils/thread.h
@@ -15,7 +15,7 @@
 #define WEBP_UTILS_THREAD_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../webp/config.h"
 #endif
 
 #ifdef __cplusplus