diff --git a/src/modules/mysql/configure.in b/src/modules/mysql/configure.in
index 28205fc7cde674ba264f24a5c459a63674c5377c..1d0fad69ae0f3251dc85e2da9091f2ceccc302cd 100644
--- a/src/modules/mysql/configure.in
+++ b/src/modules/mysql/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.13 1997/02/01 00:58:00 grubba Exp $
+# $Id: configure.in,v 1.14 1997/02/01 14:44:37 grubba Exp $
 #
 # Configure script for the mysql-module
 #
@@ -73,6 +73,10 @@ if test x$with_mysql = xyes; then
     CPPFLAGS="-I$pike_cv_mysql_include_dir ${CPPFLAGS}"
   fi
 
+  # Header file
+
+  AC_CHECK_HEADERS(mysql.h mysql/mysql.h)
+
   # Mysql libs
 
   pike_cv_mysql="no"
diff --git a/src/modules/mysql/mysql.c b/src/modules/mysql/mysql.c
index 13347ac0dfbf5cc88f2b4fdb4a4f94cbf3843986..a0877c88b1045663fd38f87fc24cfb94be28f2d5 100644
--- a/src/modules/mysql/mysql.c
+++ b/src/modules/mysql/mysql.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mysql.c,v 1.15 1997/02/01 01:14:43 grubba Exp $
+ * $Id: mysql.c,v 1.16 1997/02/01 14:44:39 grubba Exp $
  *
  * SQL database functionality for Pike
  *
@@ -21,7 +21,15 @@
  * multiple inclusion.
  */
 #ifndef _mysql_h
+#ifdef HAVE_MYSQL_H
 #include <mysql.h>
+#else
+#ifdef HAVE_MYSQL_MYSQL_H
+#include <mysql/mysql.h>
+#else
+#error Need mysql.h header-file
+#endif /* HAVE_MYSQL_MYSQL_H */
+#endif /* HAVE_MYSQL_H */
 #ifndef _mysql_h
 #define _mysql_h
 #endif
@@ -63,7 +71,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: mysql.c,v 1.15 1997/02/01 01:14:43 grubba Exp $");
+RCSID("$Id: mysql.c,v 1.16 1997/02/01 14:44:39 grubba Exp $");
 
 struct program *mysql_program = NULL;
 
diff --git a/src/modules/mysql/precompiled_mysql.h b/src/modules/mysql/precompiled_mysql.h
index 100c752aa9a171e2d0322fe6b6effa5f4bf1d5c0..84c7b229624bb2238dc7ba1f9ef5cc431a274483 100644
--- a/src/modules/mysql/precompiled_mysql.h
+++ b/src/modules/mysql/precompiled_mysql.h
@@ -1,5 +1,5 @@
 /*
- * $Id: precompiled_mysql.h,v 1.2 1997/01/08 01:49:26 grubba Exp $
+ * $Id: precompiled_mysql.h,v 1.3 1997/02/01 14:44:41 grubba Exp $
  *
  * SQL database connectivity for Pike
  *
@@ -13,12 +13,24 @@
  * Includes
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 /* From the mysql-dist */
 /* Workaround for versions prior to 3.20.0 not beeing protected for
  * multiple inclusion.
  */
 #ifndef _mysql_h
+#ifdef HAVE_MYSQL_H
 #include <mysql.h>
+#else
+#ifdef HAVE_MYSQL_MYSQL_H
+#include <mysql/mysql.h>
+#else
+#error Need mysql.h header-file
+#endif /* HAVE_MYSQL_MYSQL_H */
+#endif /* HAVE_MYSQL_H */
 #ifndef _mysql_h
 #define _mysql_h
 #endif
diff --git a/src/modules/mysql/result.c b/src/modules/mysql/result.c
index d39dec27feb0785eacb08223cbf168a76aa05933..2515bcdf7d4a32738806ae1cd3e7346e0f1e6376 100644
--- a/src/modules/mysql/result.c
+++ b/src/modules/mysql/result.c
@@ -1,5 +1,5 @@
 /*
- * $Id: result.c,v 1.14 1997/02/01 01:14:44 grubba Exp $
+ * $Id: result.c,v 1.15 1997/02/01 14:44:43 grubba Exp $
  *
  * mysql query result
  *
@@ -20,7 +20,15 @@
  * multiple inclusion.
  */
 #ifndef _mysql_h
+#ifdef HAVE_MYSQL_H
 #include <mysql.h>
+#else
+#ifdef HAVE_MYSQL_MYSQL_H
+#include <mysql/mysql.h>
+#else
+#error Need mysql.h header-file
+#endif /* HAVE_MYSQL_MYSQL_H */
+#endif /* HAVE_MYSQL_H */
 #ifndef _mysql_h
 #define _mysql_h
 #endif
@@ -66,7 +74,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: result.c,v 1.14 1997/02/01 01:14:44 grubba Exp $");
+RCSID("$Id: result.c,v 1.15 1997/02/01 14:44:43 grubba Exp $");
 
 struct program *mysql_result_program = NULL;