diff --git a/include/wx/db.h b/include/wx/db.h
index 225563e3f6..8bff95b46e 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -99,6 +99,11 @@ typedef double SDOUBLE;
 typedef unsigned int UINT;
 #define ULONG UDWORD
 
+// Not available in iODBC
+#ifndef __WXMSW__
+typedef UCHAR SQLTCHAR;
+#endif
+
 #ifndef wxODBC_FWD_ONLY_CURSORS
 #define wxODBC_FWD_ONLY_CURSORS 1
 #endif
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 4afd51e5e7..6dadaecf49 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -594,6 +594,7 @@
         #define  wxFgetchar  fgetchar
         #define  wxFgets     fgets
         #define  wxFputc     fputc
+        #define  wxFputs     fputs
         #define  wxFputchar  fputchar
         #define  wxFprintf   fprintf
         #define  wxFscanf    fscanf
diff --git a/src/common/db.cpp b/src/common/db.cpp
index 539c929609..a68deb2b1d 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -1408,18 +1408,18 @@ void wxDb::Close(void)
 #ifdef __WXDEBUG__
     wxTablesInUse *tiu;
     wxNode *pNode;
-    pNode = TablesInUse.First();
+    pNode = TablesInUse.GetFirst();
     wxString s,s2;
     while (pNode)
     {
-        tiu = (wxTablesInUse *)pNode->Data();
+        tiu = (wxTablesInUse *)pNode->GetData();
         if (tiu->pDb == this)
         {
             s.Printf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb);
             s2.Printf(wxT("Orphaned found using pDb:[%p]"),this);
             wxLogDebug (s.c_str(),s2.c_str());
         }
-        pNode = pNode->Next();
+        pNode = pNode->GetNext();
     }
 #endif