diff --git a/example/simple/Makefile.am b/example/simple/Makefile.am
index 326c6f68..89e7f0bb 100644
--- a/example/simple/Makefile.am
+++ b/example/simple/Makefile.am
@@ -10,7 +10,7 @@ noinst_PROGRAMS = ssh2 \
 		sftp_RW_nonblock \
 		sftpdir sftpdir_nonblock
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/src
+INCLUDES = -I$(top_srcdir)/include
 LDADD = $(top_builddir)/src/libssh2.la
 
 ssh2_SOURCES = ssh2.c
diff --git a/example/simple/scp.c b/example/simple/scp.c
index cedacb26..00c13a58 100644
--- a/example/simple/scp.c
+++ b/example/simple/scp.c
@@ -1,11 +1,11 @@
 /*
- * $Id: scp.c,v 1.8 2007/07/14 21:24:38 bagder Exp $
+ * $Id: scp.c,v 1.9 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do a simple SCP transfer.
  */
 
+#include "config.h"
 #include <libssh2.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/scp_nonblock.c b/example/simple/scp_nonblock.c
index f9d98d8c..764f7097 100644
--- a/example/simple/scp_nonblock.c
+++ b/example/simple/scp_nonblock.c
@@ -1,11 +1,11 @@
 /*
- * $Id: scp_nonblock.c,v 1.7 2007/07/14 21:24:38 bagder Exp $
+ * $Id: scp_nonblock.c,v 1.8 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SCP transfers in a non-blocking manner.
  */
 
+#include "config.h"
 #include <libssh2.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/scp_write.c b/example/simple/scp_write.c
index 61c401b5..8483d1fb 100644
--- a/example/simple/scp_write.c
+++ b/example/simple/scp_write.c
@@ -1,11 +1,11 @@
 /*
- * $Id: scp_write.c,v 1.3 2007/07/14 21:24:38 bagder Exp $
+ * $Id: scp_write.c,v 1.4 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do a simple SCP transfer.
  */
 
+#include "config.h"
 #include <libssh2.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/scp_write_nonblock.c b/example/simple/scp_write_nonblock.c
index 87ea21bc..e66c63dc 100644
--- a/example/simple/scp_write_nonblock.c
+++ b/example/simple/scp_write_nonblock.c
@@ -1,11 +1,12 @@
 /*
- * $Id: scp_write_nonblock.c,v 1.5 2007/07/14 21:24:38 bagder Exp $
+ * $Id: scp_write_nonblock.c,v 1.6 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do a simple SCP transfer.
  */
 
+#include "config.h"
+
 #include <libssh2.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftp.c b/example/simple/sftp.c
index 7854a60c..7b45824e 100644
--- a/example/simple/sftp.c
+++ b/example/simple/sftp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftp.c,v 1.11 2007/07/22 02:15:31 gknauf Exp $
+ * $Id: sftp.c,v 1.12 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SFTP transfers.
  *
@@ -9,9 +9,9 @@
  * "sftp 192.168.0.1 user password /tmp/secrets -p|-i|-k"
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftp_RW_nonblock.c b/example/simple/sftp_RW_nonblock.c
index e7cf6b77..85c6feef 100644
--- a/example/simple/sftp_RW_nonblock.c
+++ b/example/simple/sftp_RW_nonblock.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftp_RW_nonblock.c,v 1.8 2007/07/14 21:24:38 bagder Exp $
+ * $Id: sftp_RW_nonblock.c,v 1.9 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SFTP transfers in a non-blocking manner.
  *
@@ -9,9 +9,9 @@
  * Using the SFTP server running on 127.0.0.1
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftp_mkdir.c b/example/simple/sftp_mkdir.c
index 2cff47ef..812263bb 100644
--- a/example/simple/sftp_mkdir.c
+++ b/example/simple/sftp_mkdir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftp_mkdir.c,v 1.5 2007/07/14 21:24:38 bagder Exp $
+ * $Id: sftp_mkdir.c,v 1.6 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SFTP mkdir
  *
@@ -9,9 +9,9 @@
  * "sftp 192.168.0.1 user password /tmp/sftp_mkdir"
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftp_mkdir_nonblock.c b/example/simple/sftp_mkdir_nonblock.c
index d35860ad..f6bd862a 100644
--- a/example/simple/sftp_mkdir_nonblock.c
+++ b/example/simple/sftp_mkdir_nonblock.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftp_mkdir_nonblock.c,v 1.7 2007/07/14 21:24:38 bagder Exp $
+ * $Id: sftp_mkdir_nonblock.c,v 1.8 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SFTP non-blocking mkdir.
  *
@@ -9,9 +9,9 @@
  * "sftp 192.168.0.1 user password /tmp/sftp_write_nonblock.c"
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftp_nonblock.c b/example/simple/sftp_nonblock.c
index ce779332..8834b23f 100644
--- a/example/simple/sftp_nonblock.c
+++ b/example/simple/sftp_nonblock.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftp_nonblock.c,v 1.11 2007/07/14 21:24:38 bagder Exp $
+ * $Id: sftp_nonblock.c,v 1.12 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SFTP non-blocking transfers.
  *
@@ -9,9 +9,9 @@
  * "sftp 192.168.0.1 user password /tmp/secrets"
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftp_write.c b/example/simple/sftp_write.c
index f7c29fc1..5d801594 100644
--- a/example/simple/sftp_write.c
+++ b/example/simple/sftp_write.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftp_write.c,v 1.6 2007/07/14 21:24:38 bagder Exp $
+ * $Id: sftp_write.c,v 1.7 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SFTP write transfers.
  *
@@ -9,9 +9,9 @@
  * "sftp 192.168.0.1 user password sftp_write.c /tmp/secrets"
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftp_write_nonblock.c b/example/simple/sftp_write_nonblock.c
index 1c12c426..f9491b67 100644
--- a/example/simple/sftp_write_nonblock.c
+++ b/example/simple/sftp_write_nonblock.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftp_write_nonblock.c,v 1.8 2007/07/14 21:24:38 bagder Exp $
+ * $Id: sftp_write_nonblock.c,v 1.9 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SFTP non-blocking write transfers.
  *
@@ -9,9 +9,9 @@
  * "sftp 192.168.0.1 user password sftp_write_nonblock.c /tmp/sftp_write_nonblock.c"
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftpdir.c b/example/simple/sftpdir.c
index 8b85c6fa..7c03c435 100644
--- a/example/simple/sftpdir.c
+++ b/example/simple/sftpdir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftpdir.c,v 1.7 2007/07/14 21:24:38 bagder Exp $
+ * $Id: sftpdir.c,v 1.8 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample doing an SFTP directory listing.
  *
@@ -9,9 +9,9 @@
  * "sftpdir 192.168.0.1 user password /tmp/secretdir"
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/sftpdir_nonblock.c b/example/simple/sftpdir_nonblock.c
index e175abd2..bdb484bc 100644
--- a/example/simple/sftpdir_nonblock.c
+++ b/example/simple/sftpdir_nonblock.c
@@ -1,5 +1,5 @@
 /*
- * $Id: sftpdir_nonblock.c,v 1.8 2007/07/14 21:24:38 bagder Exp $
+ * $Id: sftpdir_nonblock.c,v 1.9 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample doing an SFTP directory listing.
  *
@@ -9,9 +9,9 @@
  * "sftpdir 192.168.0.1 user password /tmp/secretdir"
  */
 
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>
-#include <libssh2_config.h>
 
 #ifdef HAVE_WINSOCK2_H
 # include <winsock2.h>
diff --git a/example/simple/ssh2.c b/example/simple/ssh2.c
index 7690c549..420a4f6b 100644
--- a/example/simple/ssh2.c
+++ b/example/simple/ssh2.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ssh2.c,v 1.14 2007/07/20 09:51:05 gknauf Exp $
+ * $Id: ssh2.c,v 1.15 2007/07/31 11:00:29 bagder Exp $
  *
  * Sample showing how to do SSH2 connect.
  *
@@ -9,7 +9,7 @@
  * "ssh2 host user password [-p|-i|-k]"
  */
 
-#include <libssh2_config.h>
+#include "config.h"
 #include <libssh2.h>
 #include <libssh2_sftp.h>