=== Makefile.am
==================================================================
--- Makefile.am	(revision 11841)
+++ Makefile.am	(local)
@@ -14,7 +14,7 @@
 	test/test-eof.c test/test-weof.c test/test-time.c \
 	test/test-init.c test/test.sh \
 	compat/sys/queue.h compat/sys/tree.h compat/sys/_time.h \
-	WIN32-Code/config.h WIN32-Code/misc.c \
+	WIN32-Code/evconfig.h WIN32-Code/misc.c \
 	WIN32-Code/win32.c WIN32-Code/misc.h \
 	WIN32-Prj/event_test/event_test.dsp \
 	WIN32-Prj/event_test/test.txt WIN32-Prj/libevent.dsp \
@@ -46,7 +46,7 @@
 libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
 libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
 
-include_HEADERS = event.h evhttp.h evdns.h
+include_HEADERS = event.h evhttp.h evdns.h evconfig.h
 
 INCLUDES = -Icompat $(SYS_INCLUDES)
 
=== WIN32-Code/win32.c
==================================================================
--- WIN32-Code/win32.c	(revision 11841)
+++ WIN32-Code/win32.c	(local)
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef _MSC_VER
-#include "config.h"
+#include "evconfig.h"
 #else
 /* Avoid the windows/msvc thing. */
-#include "../config.h"
+#include "../evconfig.h"
 #endif
 
 #include <windows.h>
=== WIN32-Prj/libevent.dsp
==================================================================
--- WIN32-Prj/libevent.dsp	(revision 11841)
+++ WIN32-Prj/libevent.dsp	(local)
@@ -109,7 +109,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE="..\WIN32-Code\config.h"
+SOURCE="..\WIN32-Code\evconfig.h"
 # End Source File
 # Begin Source File
 
=== buffer.c
==================================================================
--- buffer.c	(revision 11841)
+++ buffer.c	(local)
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_VASPRINTF
=== configure.in
==================================================================
--- configure.in	(revision 11841)
+++ configure.in	(local)
@@ -3,7 +3,7 @@
 AC_INIT(event.c)
 
 AM_INIT_AUTOMAKE(libevent,1.2)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(evconfig.h)
 AM_MAINTAINER_MODE
 
 dnl Initialize prefix.
=== devpoll.c
==================================================================
--- devpoll.c	(revision 11841)
+++ devpoll.c	(local)
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== epoll.c
==================================================================
--- epoll.c	(revision 11841)
+++ epoll.c	(local)
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <stdint.h>
=== evbuffer.c
==================================================================
--- evbuffer.c	(revision 11841)
+++ evbuffer.c	(local)
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H
=== evdns.c
==================================================================
--- evdns.c	(revision 11841)
+++ evdns.c	(local)
@@ -36,7 +36,7 @@
 
 #include <sys/types.h>
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32
=== event.c
==================================================================
--- event.c	(revision 11841)
+++ event.c	(local)
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32
=== event.h
==================================================================
--- event.h	(revision 11841)
+++ event.h	(local)
@@ -31,6 +31,7 @@
 extern "C" {
 #endif
 
+#include <evconfig.h>
 #include <stdarg.h>
 
 #ifdef WIN32
=== event_tagging.c
==================================================================
--- event_tagging.c	(revision 11841)
+++ event_tagging.c	(local)
@@ -29,7 +29,7 @@
 #include <sys/param.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32
=== evport.c
==================================================================
--- evport.c	(revision 11841)
+++ evport.c	(local)
@@ -52,7 +52,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H
=== evrpc.c
==================================================================
--- evrpc.c	(revision 11841)
+++ evrpc.c	(local)
@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32
=== http.c
==================================================================
--- http.c	(revision 11841)
+++ http.c	(local)
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef HAVE_SYS_TIME_H
=== kqueue.c
==================================================================
--- kqueue.c	(revision 11841)
+++ kqueue.c	(local)
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== log.c
==================================================================
--- log.c	(revision 11841)
+++ log.c	(local)
@@ -38,7 +38,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #ifdef WIN32
=== poll.c
==================================================================
--- poll.c	(revision 11841)
+++ poll.c	(local)
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== rtsig.c
==================================================================
--- rtsig.c	(revision 11841)
+++ rtsig.c	(local)
@@ -148,7 +148,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 /* Enable F_SETSIG and F_SETOWN */
=== sample/Makefile.am
==================================================================
--- sample/Makefile.am	(revision 11841)
+++ sample/Makefile.am	(local)
@@ -2,7 +2,7 @@
 
 LDADD = ../libevent.la
 CPPFPLAGS = -I.. 
-CFLAGS = -I../compat
+CFLAGS = -I../compat -I..
 
 noinst_PROGRAMS = event-test time-test signal-test
 
=== sample/signal-test.c
==================================================================
--- sample/signal-test.c	(revision 11841)
+++ sample/signal-test.c	(local)
@@ -5,10 +5,6 @@
 
 #include <sys/types.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/stat.h>
 #ifndef WIN32
 #include <sys/queue.h>
=== sample/time-test.c
==================================================================
--- sample/time-test.c	(revision 11841)
+++ sample/time-test.c	(local)
@@ -2,13 +2,10 @@
  * Compile with:
  * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent
  */
+#include <evconfig.h>
 
 #include <sys/types.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/stat.h>
 #ifndef WIN32
 #include <sys/queue.h>
=== select.c
==================================================================
--- select.c	(revision 11841)
+++ select.c	(local)
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== signal.c
==================================================================
--- signal.c	(revision 11841)
+++ signal.c	(local)
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== strlcpy-internal.h
==================================================================
--- strlcpy-internal.h	(revision 11841)
+++ strlcpy-internal.h	(local)
@@ -6,7 +6,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif /* HAVE_CONFIG_H */
 
 #ifndef HAVE_STRLCPY
=== strlcpy.c
==================================================================
--- strlcpy.c	(revision 11841)
+++ strlcpy.c	(local)
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif /* HAVE_CONFIG_H */
 
 #ifndef HAVE_STRLCPY
=== test/bench.c
==================================================================
--- test/bench.c	(revision 11841)
+++ test/bench.c	(local)
@@ -34,7 +34,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== test/regress.c
==================================================================
--- test/regress.c	(revision 11841)
+++ test/regress.c	(local)
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== test/regress_dns.c
==================================================================
--- test/regress_dns.c	(revision 11841)
+++ test/regress_dns.c	(local)
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== test/regress_http.c
==================================================================
--- test/regress_http.c	(revision 11841)
+++ test/regress_http.c	(local)
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>
=== test/regress_rpc.c
==================================================================
--- test/regress_rpc.c	(revision 11841)
+++ test/regress_rpc.c	(local)
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "evconfig.h"
 #endif
 
 #include <sys/types.h>