diff --git a/src/fd_control.c b/src/fd_control.c
index ccf83335c2afaf029d058dc02bca2e7b55da4c14..722a7cabb0b859e8e0ce2edef116f526e4f003a6 100644
--- a/src/fd_control.c
+++ b/src/fd_control.c
@@ -10,7 +10,7 @@
 #include "pike_error.h"
 #include "fdlib.h"
 
-RCSID("$Id: fd_control.c,v 1.38 2002/01/16 02:54:12 nilsson Exp $");
+RCSID("$Id: fd_control.c,v 1.39 2002/01/27 01:00:53 mast Exp $");
 
 #else /* TESTING */
 
@@ -98,7 +98,9 @@ PMOD_EXPORT int set_nonblocking(int fd,int which)
     ret=fcntl(fd, F_SETFL, which?FNDELAY:0);
 #else
 
+#ifndef DISABLE_BINARY
 #error Do not know how to set your filedescriptors nonblocking.
+#endif
 
 #endif
 #endif
diff --git a/src/modules/Mysql/mysql.c b/src/modules/Mysql/mysql.c
index 023b012621ea1aac5e19e748e373c55ef0cb2a13..054c50b540a28226aacf8f1027e1cb0cf0b936ae 100644
--- a/src/modules/Mysql/mysql.c
+++ b/src/modules/Mysql/mysql.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mysql.c,v 1.52 2002/01/02 06:20:37 per-bash Exp $
+ * $Id: mysql.c,v 1.53 2002/01/27 01:00:53 mast Exp $
  *
  * SQL database functionality for Pike
  *
@@ -34,7 +34,9 @@
 #ifdef HAVE_MYSQL_MYSQL_H
 #include <mysql/mysql.h>
 #else
+#ifndef DISABLE_BINARY
 #error Need mysql.h header-file
+#endif
 #endif /* HAVE_MYSQL_MYSQL_H */
 #endif /* HAVE_MYSQL_H */
 #ifndef _mysql_h
@@ -91,7 +93,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: mysql.c,v 1.52 2002/01/02 06:20:37 per-bash Exp $");
+RCSID("$Id: mysql.c,v 1.53 2002/01/27 01:00:53 mast Exp $");
 
 /*! @module Mysql
  *!
diff --git a/src/modules/Mysql/result.c b/src/modules/Mysql/result.c
index ea425d0e0d6542dd221b762e45c9e2163f0b9498..be9901124f546ba4f8d8cd1a398081c9ff204e1d 100644
--- a/src/modules/Mysql/result.c
+++ b/src/modules/Mysql/result.c
@@ -1,5 +1,5 @@
 /*
- * $Id: result.c,v 1.23 2001/10/28 18:33:43 nilsson Exp $
+ * $Id: result.c,v 1.24 2002/01/27 01:00:53 mast Exp $
  *
  * mysql query result
  *
@@ -32,7 +32,9 @@
 #ifdef HAVE_MYSQL_MYSQL_H
 #include <mysql/mysql.h>
 #else
+#ifndef DISABLE_BINARY
 #error Need mysql.h header-file
+#endif
 #endif /* HAVE_MYSQL_MYSQL_H */
 #endif /* HAVE_MYSQL_H */
 #ifndef _mysql_h
@@ -83,7 +85,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: result.c,v 1.23 2001/10/28 18:33:43 nilsson Exp $");
+RCSID("$Id: result.c,v 1.24 2002/01/27 01:00:53 mast Exp $");
 
 struct program *mysql_result_program = NULL;