diff --git a/.gitattributes b/.gitattributes
index 0326065c23a93134c70027d03f07a26708f6bc1f..9f073ad74c49b4f14296c4075953ca7e0f16b140 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -208,18 +208,8 @@ testfont binary
 /lib/modules/SSL.pmod/state.pike foreign_ident
 /lib/modules/SSL.pmod/testsuite.in foreign_ident
 /lib/modules/Sql.pmod/Sql.pike foreign_ident
-/lib/modules/Sql.pmod/dsn.pike foreign_ident
-/lib/modules/Sql.pmod/dsn_result.pike foreign_ident
-/lib/modules/Sql.pmod/mysql.pike foreign_ident
-/lib/modules/Sql.pmod/mysql_result.pike foreign_ident
-/lib/modules/Sql.pmod/mysqls.pike foreign_ident
-/lib/modules/Sql.pmod/odbc.pike foreign_ident
-/lib/modules/Sql.pmod/odbc_result.pike foreign_ident
-/lib/modules/Sql.pmod/oracle.pike foreign_ident
-/lib/modules/Sql.pmod/postgres.pike foreign_ident
 /lib/modules/Sql.pmod/sql_result.pike foreign_ident
 /lib/modules/Sql.pmod/sql_util.pmod foreign_ident
-/lib/modules/Sql.pmod/sybase.pike foreign_ident
 /lib/modules/Sql.pmod/tds.pike foreign_ident
 /lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod foreign_ident
 /lib/modules/Standards.pmod/ASN1.pmod/Types.pmod foreign_ident
diff --git a/lib/modules/Sql.pmod/dsn.pike b/lib/modules/Sql.pmod/dsn.pike
index f62945d0610c493cb504a8ec5a6489213d142313..2647a0f2cb95d508eea97667185677b8654c0643 100644
--- a/lib/modules/Sql.pmod/dsn.pike
+++ b/lib/modules/Sql.pmod/dsn.pike
@@ -1,5 +1,5 @@
 /*
- * $Id: dsn.pike,v 1.2 2005/01/26 19:26:29 grubba Exp $
+ * $Id$
  *
  * Glue for the ODBC-module
  *
@@ -8,6 +8,10 @@
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Odbc.odbc)
 inherit Odbc.odbc;
 
diff --git a/lib/modules/Sql.pmod/dsn_result.pike b/lib/modules/Sql.pmod/dsn_result.pike
index 982cbeabcafff4810c8d2c25877d281c141b70d5..a7223739548fad4c8cdae0c36928f6ca7d4cec05 100644
--- a/lib/modules/Sql.pmod/dsn_result.pike
+++ b/lib/modules/Sql.pmod/dsn_result.pike
@@ -1,11 +1,15 @@
 /*
- * $Id: dsn_result.pike,v 1.1 2005/01/26 18:57:45 grubba Exp $
+ * $Id$
  *
  * Glue for the ODBC-module
  */
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Odbc.odbc_result)
 inherit Odbc.odbc_result;
 #else /* !constant(Odbc.odbc_result) */
diff --git a/lib/modules/Sql.pmod/msql.pike b/lib/modules/Sql.pmod/msql.pike
index 76af9ffc3e2972216afc102a17d2c4753ed6be4e..9a06601dedcfe0e6a6afeca61adebb317615bada 100644
--- a/lib/modules/Sql.pmod/msql.pike
+++ b/lib/modules/Sql.pmod/msql.pike
@@ -4,6 +4,10 @@
 //! Implements the glue needed to access the Msql-module from the generic
 //! SQL module.
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Msql.msql)
 inherit Msql.msql;
 
diff --git a/lib/modules/Sql.pmod/mysql.pike b/lib/modules/Sql.pmod/mysql.pike
index 99753c4e4b13a3a835cccdeb34844f6d867a769e..c843da74807bada5a988d39cfa7777f4cccf70c7 100644
--- a/lib/modules/Sql.pmod/mysql.pike
+++ b/lib/modules/Sql.pmod/mysql.pike
@@ -1,5 +1,5 @@
 /*
- * $Id: mysql.pike,v 1.46 2010/01/04 17:18:18 mast Exp $
+ * $Id$
  *
  * Glue for the Mysql-module
  */
@@ -9,6 +9,10 @@
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Mysql.mysql)
 
 inherit Mysql.mysql;
diff --git a/lib/modules/Sql.pmod/mysql_result.pike b/lib/modules/Sql.pmod/mysql_result.pike
index cde5b29a247c7e97fabaa959a83eb2e027eb3772..3c1cf69392701308016d0de8f11821a546c38ee3 100644
--- a/lib/modules/Sql.pmod/mysql_result.pike
+++ b/lib/modules/Sql.pmod/mysql_result.pike
@@ -1,11 +1,15 @@
 /*
- * $Id: mysql_result.pike,v 1.7 2008/06/28 16:49:55 nilsson Exp $
+ * $Id$
  *
  * Glue for the Mysql-module
  */
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Mysql.mysql_result)
 inherit Mysql.mysql_result;
 #else /* !constant(Mysql.mysql_result) */
diff --git a/lib/modules/Sql.pmod/mysqls.pike b/lib/modules/Sql.pmod/mysqls.pike
index 1a6ee99bff595ce77f7abc1ae481b95b0f50b708..c19833a4d50c4312c8b8d176077c685faacb14b6 100644
--- a/lib/modules/Sql.pmod/mysqls.pike
+++ b/lib/modules/Sql.pmod/mysqls.pike
@@ -1,5 +1,5 @@
 /*
- * $Id: mysqls.pike,v 1.5 2004/04/16 12:12:46 grubba Exp $
+ * $Id$
  *
  * Glue for the Mysql-module using SSL
  */
@@ -19,6 +19,10 @@
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Mysql.mysql.CLIENT_SSL)
 
 inherit Sql.mysql;
diff --git a/lib/modules/Sql.pmod/mysqls_result.pike b/lib/modules/Sql.pmod/mysqls_result.pike
index 72b508da08296afd0c8f4ee0cc0868764380bcc0..426dad875f86837b69ab981f6ee93e4f3386d7ac 100644
--- a/lib/modules/Sql.pmod/mysqls_result.pike
+++ b/lib/modules/Sql.pmod/mysqls_result.pike
@@ -1,5 +1,9 @@
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Mysql.mysql.CLIENT_SSL)
 
 inherit Sql.mysql_result;
diff --git a/lib/modules/Sql.pmod/odbc.pike b/lib/modules/Sql.pmod/odbc.pike
index 3b761c5a3f1dfc386f86adb33073a8aa1ae17735..1928f7142bd354bf506113484897f120bdeb2fe2 100644
--- a/lib/modules/Sql.pmod/odbc.pike
+++ b/lib/modules/Sql.pmod/odbc.pike
@@ -1,11 +1,15 @@
 /*
- * $Id: odbc.pike,v 1.14 2004/04/16 12:12:46 grubba Exp $
+ * $Id$
  *
  * Glue for the ODBC-module
  */
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Odbc.odbc)
 inherit Odbc.odbc;
 
diff --git a/lib/modules/Sql.pmod/odbc_result.pike b/lib/modules/Sql.pmod/odbc_result.pike
index 37a8479b535b12acf6e0dd250b0f732164be9d78..a7223739548fad4c8cdae0c36928f6ca7d4cec05 100644
--- a/lib/modules/Sql.pmod/odbc_result.pike
+++ b/lib/modules/Sql.pmod/odbc_result.pike
@@ -1,11 +1,15 @@
 /*
- * $Id: odbc_result.pike,v 1.6 2004/04/16 12:12:46 grubba Exp $
+ * $Id$
  *
  * Glue for the ODBC-module
  */
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Odbc.odbc_result)
 inherit Odbc.odbc_result;
 #else /* !constant(Odbc.odbc_result) */
diff --git a/lib/modules/Sql.pmod/oracle.pike b/lib/modules/Sql.pmod/oracle.pike
index 74e165ae5b3735e2bd893132b8136017953256ff..2aa76c6d20df4b12a1050a4d70151e2921509483 100644
--- a/lib/modules/Sql.pmod/oracle.pike
+++ b/lib/modules/Sql.pmod/oracle.pike
@@ -1,11 +1,15 @@
 /*
- * $Id: oracle.pike,v 1.7 2002/11/27 15:40:34 mast Exp $
+ * $Id$
  *
  * Glue for the Oracle-module
  */
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Oracle.oracle)
 inherit Oracle.oracle;
 
diff --git a/lib/modules/Sql.pmod/postgres.pike b/lib/modules/Sql.pmod/postgres.pike
index a274c24718254fcf971fe6fa51b9e52f4f58ae6a..abd483eecdb9ab3d499a7b2f6399635d8e36875b 100644
--- a/lib/modules/Sql.pmod/postgres.pike
+++ b/lib/modules/Sql.pmod/postgres.pike
@@ -1,12 +1,16 @@
 /*
  * This is part of the Postgres module for Pike.
  *
- * $Id: postgres.pike,v 1.41 2010/02/21 22:42:16 srb Exp $
+ * $Id$
  *
  */
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Postgres.postgres)
 
 //! This is an interface to the Postgres (Postgres95, pgsql) database
diff --git a/lib/modules/Sql.pmod/postgres_result.pike b/lib/modules/Sql.pmod/postgres_result.pike
index e9b2bb24ca710a43ea779c0d9f8167105b2d63af..868be6648efafed58a8a7892d0a51e2cd656f676 100644
--- a/lib/modules/Sql.pmod/postgres_result.pike
+++ b/lib/modules/Sql.pmod/postgres_result.pike
@@ -3,6 +3,10 @@
 //! Sql.postgres_result contains the result of a Postgres-query.
 //! See @[Sql.postgres] for a description of this program's functions.
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(Postgres.postgres_result)
 inherit Postgres.postgres_result;
 #else /* !constant(Postgres.postgres_result) */
diff --git a/lib/modules/Sql.pmod/sqlite.pike b/lib/modules/Sql.pmod/sqlite.pike
index 9597d5e3e8357e9227d4cad0aff4ab3ef8bf6d5e..089008d0e9290ab94f86ecf6d3b70ae45070c631 100644
--- a/lib/modules/Sql.pmod/sqlite.pike
+++ b/lib/modules/Sql.pmod/sqlite.pike
@@ -1,6 +1,10 @@
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(SQLite.SQLite)
 inherit SQLite.SQLite;
 
diff --git a/lib/modules/Sql.pmod/sybase.pike b/lib/modules/Sql.pmod/sybase.pike
index 18d59bbbfb513a80e13da40ef18e8e06a08f3b26..a8aeb9891fcce06e94e5d47b4cf618459fd49dbd 100644
--- a/lib/modules/Sql.pmod/sybase.pike
+++ b/lib/modules/Sql.pmod/sybase.pike
@@ -2,12 +2,16 @@
  * Sybase driver for the Pike programming language.
  * By Francesco Chemolli <kinkie@roxen.com> 10/12/1999
  *
- * $Id: sybase.pike,v 1.11 2008/01/09 14:26:07 mast Exp $
+ * $Id$
  *
  */
 
 #pike __REAL_VERSION__
 
+// Cannot dump this since the #if constant(...) check below may depend
+// on the presence of system libs at runtime.
+constant dont_dump_program = 1;
+
 #if constant(sybase.sybase)
 
 inherit sybase.sybase:mo;