diff --git a/ChangeLog b/ChangeLog
index 0bb4e4e..2ca4fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Fri Apr  8 20:36:51 CDT 2005	Jeff Smith <whydoubt@yahoo.com>
 	* src/gmdb2/gladefiles/Makefile.am:
 	* src/gmdb2/Makefile.am: Clean up minor gmdb makefile issues
+	* include/mdbsql.h: Improve C++ compatibility (Horst Knorr)
 
 Wed Mar 30 23:21:25 CST 2005	Jeff Smith <whydoubt@yahoo.com>
 	* autogen.sh: Improve order of autotools calls
diff --git a/include/mdbsql.h b/include/mdbsql.h
index 5bb3e30..de0accb 100644
--- a/include/mdbsql.h
+++ b/include/mdbsql.h
@@ -1,11 +1,15 @@
+#ifndef _mdbsql_h_
+#define _mdbsql_h_
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
 #include <mdbtools.h>
 
-#ifndef _mdbsql_h_
-#define _mdbsql_h_
-
 typedef struct {
 	MdbHandle *mdb;
 	int all_columns;
@@ -75,4 +79,8 @@ extern int mdb_sql_fetch_row(MdbSQL *sql, MdbTableDef *table);
 extern int mdb_sql_add_temp_col(MdbSQL *sql, MdbTableDef *ttable, int col_num, char *name, int col_type, int col_size, int is_fixed);
 extern void mdb_sql_bind_column(MdbSQL *sql, int colnum, char *varaddr, int *len_ptr);
 
+#ifdef __cplusplus
+  }
+#endif
+
 #endif