diff --git a/src/app/qgsquerybuilder.h b/src/app/qgsquerybuilder.h
diff --git a/src/core/qgscrscache.h b/src/core/qgscrscache.h
@@ -21,7 +21,7 @@
 #include "qgscoordinatereferencesystem.h"
 #include <QHash>
 
-class QgsCRSCache
+class CORE_EXPORT QgsCRSCache
 {
   public:
     static QgsCRSCache* instance();

diff --git a/src/core/qgsdbfilterproxymodel.h b/src/core/qgsdbfilterproxymodel.h
@@ -22,7 +22,7 @@
 
 /**A class that implements a custom filter and can be used
  as a proxy for QgsDbTableModel*/
-class QgsDbFilterProxyModel: public QSortFilterProxyModel
+class CORE_EXPORT QgsDbFilterProxyModel: public QSortFilterProxyModel
 {
   public:
     QgsDbFilterProxyModel( QObject* parent = 0 );

diff --git a/src/core/qgsdbtablemodel.h b/src/core/qgsdbtablemodel.h
@@ -22,7 +22,7 @@ class QIcon;
 /**A model that holds the tables of a database in a hierarchy where the
 schemas are the root elements that contain the individual tables as children.
 The tables have the following columns: Type, Schema, Tablename, Geometry Column, Sql*/
-class QgsDbTableModel : public QStandardItemModel
+class CORE_EXPORT QgsDbTableModel : public QStandardItemModel
 {
     Q_OBJECT
   public:

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -70,6 +70,7 @@ qgstextannotationitem.cpp
 qgsvertexmarker.cpp
 qgsludialog.cpp
 qgssearchquerybuilder.cpp
+qgsquerybuilder.cpp
 )
 
 SET(QGIS_GUI_MOC_HDRS
@@ -125,6 +126,7 @@ qgsludialog.h
 qgsprojectbadlayerguihandler.h
 qgslonglongvalidator.h
 qgssearchquerybuilder.h
+qgsquerybuilder.h
 )
 
 QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})

diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt
@@ -27,7 +27,6 @@ INCLUDE_DIRECTORIES(
   ${GEOS_INCLUDE_DIR}
   ../../core
   ../../gui
-  ../../app
   ${CMAKE_CURRENT_BINARY_DIR}/../../ui
 )
 
@@ -36,6 +35,7 @@ ADD_LIBRARY (postgresprovider MODULE ${PG_SRCS} ${PG_MOC_SRCS})
 TARGET_LINK_LIBRARIES (postgresprovider
   ${POSTGRES_LIBRARY}
   qgis_core
+  qgis_gui
 )
 
 

diff --git a/src/providers/postgres/qgspgsourceselect.cpp b/src/providers/postgres/qgspgsourceselect.cpp
@@ -18,7 +18,6 @@ email                : sherman at mrcc.com
 
 #include "qgspgsourceselect.h"
 
-#include "qgisapp.h"
 #include "qgslogger.h"
 #include "qgsapplication.h"
 #include "qgscontexthelp.h"