diff --git a/src/plugins/sqlanywhere/saquerybuilder.cpp b/src/plugins/sqlanywhere/saquerybuilder.cpp
diff --git a/src/plugins/sqlanywhere/saquerybuilder.h b/src/plugins/sqlanywhere/saquerybuilder.h
diff --git a/src/plugins/sqlanywhere/sasourceselect.cpp b/src/plugins/sqlanywhere/sasourceselect.cpp
@@ -26,7 +26,7 @@
 
 #include "sasourceselect.h"
 #include "sanewconnection.h"
-#include "saquerybuilder.h"
+#include "qgsquerybuilder.h"
 
 #include "qgisapp.h"
 #include "qgslogger.h"
@@ -464,7 +464,7 @@ void SaSourceSelect::setSql( const QModelIndex &index )
   }
 
   // create a query builder object
-  SaQueryBuilder *qb = new SaQueryBuilder( vlayer, this );
+  QgsQueryBuilder *qb = new QgsQueryBuilder( vlayer, this );
   if ( qb->exec() )
   {
     mTableModel.setSql( mProxyModel.mapToSource( index ), qb->sql() );

diff --git a/src/plugins/sqlanywhere/sasourceselect.h b/src/plugins/sqlanywhere/sasourceselect.h
@@ -28,7 +28,7 @@
 #define SASOURCESELECT_H
 
 #include "ui_sasourceselectbase.h"
-#include "sadbfilterproxymodel.h"
+#include "qgsdbfilterproxymodel.h"
 #include "sadbtablemodel.h"
 #include "sqlanyconnection.h"
 #include "sqlanystatement.h"
@@ -181,7 +181,7 @@ class SaSourceSelect : public QDialog, private Ui::SaSourceSelectBase
 
     //! Model that acts as datasource for mTableTreeWidget
     SaDbTableModel mTableModel;
-    SaDbFilterProxyModel mProxyModel;
+    QgsDbFilterProxyModel mProxyModel;
 
     // button for building queries
     QPushButton *mBuildQueryButton;

diff --git a/src/providers/postgres/qgsdbfilterproxymodel.cpp b/src/providers/postgres/qgsdbfilterproxymodel.cpp
diff --git a/src/providers/postgres/qgsdbfilterproxymodel.h b/src/providers/postgres/qgsdbfilterproxymodel.h