diff --git a/src/app/qgsattributeactiondialog.h b/src/app/qgsattributeactiondialog.h
@@ -30,7 +30,7 @@ back to QgsVectorLayer.
 
 class QgsAttributeAction;
 
-class QgsAttributeActionDialog: public QWidget, private Ui::QgsAttributeActionDialogBase
+class APP_EXPORT QgsAttributeActionDialog: public QWidget, private Ui::QgsAttributeActionDialogBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsattributetabledialog.h b/src/app/qgsattributetabledialog.h
@@ -41,7 +41,7 @@ class QgsAttributeTableModel;
 class QgsAttributeTableFilterModel;
 class QgsAttributeTableView;
 
-class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDialog
+class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDialog
 {
     Q_OBJECT
 

diff --git a/src/app/qgsattributetypedialog.h b/src/app/qgsattributetypedialog.h
@@ -25,7 +25,7 @@ class QDialog;
 class QLayout;
 class QgsField;
 
-class QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttributeTypeDialog
+class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttributeTypeDialog
 {
     Q_OBJECT
 

diff --git a/src/app/qgsattributetypeloaddialog.h b/src/app/qgsattributetypeloaddialog.h
@@ -28,7 +28,7 @@ class QLayout;
 class QgsField;
 class QgsMapCanvas;
 
-class QgsAttributeTypeLoadDialog: public QDialog, private Ui::QgsAttributeLoadValues
+class APP_EXPORT QgsAttributeTypeLoadDialog: public QDialog, private Ui::QgsAttributeLoadValues
 {
     Q_OBJECT
 

diff --git a/src/app/qgsbookmarks.h b/src/app/qgsbookmarks.h
@@ -21,7 +21,7 @@
 
 #include <QDialog>
 
-class QgsBookmarks : public QDialog, private Ui::QgsBookmarksBase
+class APP_EXPORT QgsBookmarks : public QDialog, private Ui::QgsBookmarksBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h
@@ -25,7 +25,7 @@ class QgsLayerItem;
 class QgsDataItem;
 class QgsBrowserTreeFilterProxyModel;
 
-class QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrowserDockWidgetBase
+class APP_EXPORT QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrowserDockWidgetBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsclipboard.h b/src/app/qgsclipboard.h
@@ -50,7 +50,7 @@ class QgsVectorLayer;
  */
 #define QGSCLIPBOARD_STYLE_MIME "application/qgis.style"
 
-class QgsClipboard : public QObject
+class APP_EXPORT QgsClipboard : public QObject
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsconfigureshortcutsdialog.h b/src/app/qgsconfigureshortcutsdialog.h
@@ -20,7 +20,7 @@
 
 #include "ui_qgsconfigureshortcutsdialog.h"
 
-class QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsConfigureShortcutsDialog
+class APP_EXPORT QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsConfigureShortcutsDialog
 {
     Q_OBJECT
 

diff --git a/src/app/qgscustomization.h b/src/app/qgscustomization.h
@@ -30,7 +30,7 @@ class QString;
 class QWidget;
 class QTreeWidgetItem;
 
-class QgsCustomizationDialog : public QMainWindow, private Ui::QgsCustomizationDialogBase
+class APP_EXPORT QgsCustomizationDialog : public QMainWindow, private Ui::QgsCustomizationDialogBase
 {
     Q_OBJECT
   public:
@@ -100,7 +100,7 @@ class QgsCustomizationDialog : public QMainWindow, private Ui::QgsCustomizationD
     QSettings* mSettings;
 };
 
-class QgsCustomization : public QObject
+class APP_EXPORT QgsCustomization : public QObject
 {
     Q_OBJECT
 

diff --git a/src/app/qgscustomprojectiondialog.h b/src/app/qgscustomprojectiondialog.h
@@ -29,7 +29,7 @@ The custom projection widget is used to define the projection family, ellipsoid
 
 @author Tim Sutton
 */
-class QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectionDialogBase
+class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectionDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsdecorationcopyright.h b/src/app/qgsdecorationcopyright.h
@@ -29,7 +29,7 @@ class QPainter;
 
 class QgsDecorationCopyrightDialog;
 
-class QgsDecorationCopyright : public QgsDecorationItem
+class APP_EXPORT QgsDecorationCopyright : public QgsDecorationItem
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsdecorationcopyrightdialog.h b/src/app/qgsdecorationcopyrightdialog.h
@@ -19,7 +19,7 @@ class QFont;
 
 class QgsDecorationCopyright;
 
-class QgsDecorationCopyrightDialog : public QDialog, private Ui::QgsDecorationCopyrightDialog
+class APP_EXPORT QgsDecorationCopyrightDialog : public QDialog, private Ui::QgsDecorationCopyrightDialog
 {
     Q_OBJECT
 

diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h
@@ -29,7 +29,7 @@ class QgsMarkerSymbolV2;
 #include <QPen>
 #include <QFont>
 
-class QgsDecorationGrid: public QgsDecorationItem
+class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsdecorationgriddialog.h b/src/app/qgsdecorationgriddialog.h
@@ -28,7 +28,7 @@ class QgsMarkerSymbolV2;
 /**
 @author Etienne Tourigny
 */
-class QgsDecorationGridDialog : public QDialog, private Ui::QgsDecorationGridDialog
+class APP_EXPORT QgsDecorationGridDialog : public QDialog, private Ui::QgsDecorationGridDialog
 {
     Q_OBJECT
 

diff --git a/src/app/qgsdecorationitem.h b/src/app/qgsdecorationitem.h
@@ -23,7 +23,7 @@
 
 class QPainter;
 
-class QgsDecorationItem: public QObject
+class APP_EXPORT QgsDecorationItem: public QObject
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsdecorationnortharrow.h b/src/app/qgsdecorationnortharrow.h
@@ -27,7 +27,7 @@ class QAction;
 class QToolBar;
 class QPainter;
 
-class QgsDecorationNorthArrow: public QgsDecorationItem
+class APP_EXPORT QgsDecorationNorthArrow: public QgsDecorationItem
 {
     Q_OBJECT
 

diff --git a/src/app/qgsdecorationnortharrowdialog.h b/src/app/qgsdecorationnortharrowdialog.h
@@ -16,7 +16,7 @@
 
 class QgsDecorationNorthArrow;
 
-class QgsDecorationNorthArrowDialog : public QDialog, private Ui::QgsDecorationNorthArrowDialog
+class APP_EXPORT QgsDecorationNorthArrowDialog : public QDialog, private Ui::QgsDecorationNorthArrowDialog
 {
     Q_OBJECT
 

diff --git a/src/app/qgsdecorationscalebar.h b/src/app/qgsdecorationscalebar.h
@@ -28,7 +28,7 @@ class QPainter;
 
 #include <QColor>
 
-class QgsDecorationScaleBar: public QgsDecorationItem
+class APP_EXPORT QgsDecorationScaleBar: public QgsDecorationItem
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsdecorationscalebardialog.h b/src/app/qgsdecorationscalebardialog.h
@@ -20,7 +20,7 @@ class QgsDecorationScaleBar;
 /**
 @author Peter Brewer
 */
-class QgsDecorationScaleBarDialog : public QDialog, private Ui::QgsDecorationScaleBarDialog
+class APP_EXPORT QgsDecorationScaleBarDialog : public QDialog, private Ui::QgsDecorationScaleBarDialog
 {
     Q_OBJECT
 

diff --git a/src/app/qgsdelattrdialog.h b/src/app/qgsdelattrdialog.h
@@ -24,7 +24,7 @@
 
 class QgsVectorLayer;
 
-class QgsDelAttrDialog: public QDialog, private Ui::QgsDelAttrDialogBase
+class APP_EXPORT QgsDelAttrDialog: public QDialog, private Ui::QgsDelAttrDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsdiagramproperties.h b/src/app/qgsdiagramproperties.h
@@ -23,7 +23,7 @@
 
 class QgsVectorLayer;
 
-class QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPropertiesBase
+class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPropertiesBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsdisplayangle.h b/src/app/qgsdisplayangle.h
@@ -20,7 +20,7 @@
 #include "ui_qgsdisplayanglebase.h"
 
 /**A class that displays results of angle measurements with the proper unit*/
-class QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase
+class APP_EXPORT QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsfeatureaction.h b/src/app/qgsfeatureaction.h
@@ -28,7 +28,7 @@ class QgsVectorLayer;
 class QgsHighlight;
 class QgsAttributeDialog;
 
-class QgsFeatureAction : public QAction
+class APP_EXPORT QgsFeatureAction : public QAction
 {
     Q_OBJECT
 

diff --git a/src/app/qgsfieldcalculator.h b/src/app/qgsfieldcalculator.h
@@ -22,7 +22,7 @@
 class QgsVectorLayer;
 
 /**A dialog class that provides calculation of new fields using existing fields, values and a set of operators*/
-class QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalculatorBase
+class APP_EXPORT QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalculatorBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h
@@ -24,7 +24,7 @@
 #include "qgsvectorlayer.h"
 #include "ui_qgsfieldspropertiesbase.h"
 
-class QgsAttributesTree : public QTreeWidget
+class APP_EXPORT QgsAttributesTree : public QTreeWidget
 {
     Q_OBJECT
   public:
@@ -42,7 +42,7 @@ class QgsAttributesTree : public QTreeWidget
 };
 
 
-class QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
+class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsformannotationdialog.h b/src/app/qgsformannotationdialog.h
@@ -20,7 +20,7 @@
 
 class QgsAnnotationWidget;
 
-class QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
+class APP_EXPORT QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgshandlebadlayers.h b/src/app/qgshandlebadlayers.h
@@ -20,7 +20,7 @@
 #include "ui_qgshandlebadlayersbase.h"
 #include "qgsproject.h"
 
-class QgsHandleBadLayersHandler
+class APP_EXPORT QgsHandleBadLayersHandler
       : public QObject
       , public QgsProjectBadLayerHandler
 {
@@ -36,7 +36,7 @@ class QgsHandleBadLayersHandler
 
 class QPushButton;
 
-class QgsHandleBadLayers
+class APP_EXPORT QgsHandleBadLayers
       : public QDialog
       , private Ui::QgsHandleBadLayersBase
 {

diff --git a/src/app/qgshtmlannotationdialog.h b/src/app/qgshtmlannotationdialog.h
@@ -20,7 +20,7 @@
 
 class QgsAnnotationWidget;
 
-class QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
+class APP_EXPORT QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
@@ -46,7 +46,7 @@ class QDockWidget;
  *@author Gary E.Sherman
  */
 
-class QgsIdentifyResultsWebView : public QWebView
+class APP_EXPORT QgsIdentifyResultsWebView : public QWebView
 {
     Q_OBJECT;
   public:
@@ -59,7 +59,7 @@ class QgsIdentifyResultsWebView : public QWebView
     QWebView *createWindow( QWebPage::WebWindowType type );
 };
 
-class QgsIdentifyResultsFeatureItem: public QTreeWidgetItem
+class APP_EXPORT QgsIdentifyResultsFeatureItem: public QTreeWidgetItem
 {
   public:
     QgsIdentifyResultsFeatureItem( const QgsFields &fields, const QgsFeature &feature, const QgsCoordinateReferenceSystem &crs, const QStringList & strings = QStringList() );
@@ -73,7 +73,7 @@ class QgsIdentifyResultsFeatureItem: public QTreeWidgetItem
     QgsCoordinateReferenceSystem mCrs;
 };
 
-class QgsIdentifyResultsWebViewItem: public QObject, public QTreeWidgetItem
+class APP_EXPORT QgsIdentifyResultsWebViewItem: public QObject, public QTreeWidgetItem
 {
     Q_OBJECT
 
@@ -89,7 +89,7 @@ class QgsIdentifyResultsWebViewItem: public QObject, public QTreeWidgetItem
     QgsIdentifyResultsWebView *mWebView;
 };
 
-class QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdentifyResultsBase
+class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdentifyResultsBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgslabeldialog.h b/src/app/qgslabeldialog.h
@@ -23,7 +23,7 @@ class QgsLabel;
 
 
 /** QgsLabelDialog is the dialog for label. */
-class QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase
+class APP_EXPORT QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgslabelengineconfigdialog.h b/src/app/qgslabelengineconfigdialog.h
@@ -21,7 +21,7 @@
 
 class QgsPalLabeling;
 
-class QgsLabelEngineConfigDialog : public QDialog, private Ui::QgsEngineConfigDialog
+class APP_EXPORT QgsLabelEngineConfigDialog : public QDialog, private Ui::QgsEngineConfigDialog
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgslabelinggui.h b/src/app/qgslabelinggui.h
@@ -28,7 +28,7 @@ class QgsCharacterSelectorDialog;
 
 #include "qgspallabeling.h"
 
-class QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
+class APP_EXPORT QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgslabelpreview.h b/src/app/qgslabelpreview.h
@@ -21,7 +21,7 @@
 
 class QgsRenderContext;
 
-class QgsLabelPreview : public QLabel
+class APP_EXPORT QgsLabelPreview : public QLabel
 {
   public:
     QgsLabelPreview( QWidget* parent = NULL );

diff --git a/src/app/qgslabelpropertydialog.h b/src/app/qgslabelpropertydialog.h
@@ -26,7 +26,7 @@
 class QgsMapRenderer;
 
 /**A dialog to enter data defined label attributes*/
-class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialogBase
+class APP_EXPORT QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsloadstylefromdbdialog.h b/src/app/qgsloadstylefromdbdialog.h
@@ -14,7 +14,7 @@
 #include "qgisgui.h"
 #include "qgsfield.h"
 
-class QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout
+class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout
 {
     QString mSelectedStyleId;
     int mSectionLimit;

diff --git a/src/app/qgsmaptooladdfeature.h b/src/app/qgsmaptooladdfeature.h
@@ -17,7 +17,7 @@
 #include "qgsfeature.h"
 
 /**This tool adds new point/line/polygon features to already existing vector layers*/
-class QgsMapToolAddFeature : public QgsMapToolCapture
+class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptooladdpart.h b/src/app/qgsmaptooladdpart.h
@@ -16,7 +16,7 @@
 #include "qgsmaptoolcapture.h"
 
 /**A map tool that adds new parts to multipart features*/
-class QgsMapToolAddPart : public QgsMapToolCapture
+class APP_EXPORT QgsMapToolAddPart : public QgsMapToolCapture
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptooladdring.h b/src/app/qgsmaptooladdring.h
@@ -16,7 +16,7 @@
 #include "qgsmaptoolcapture.h"
 
 /**A tool to cut holes into polygons and multipolygon features*/
-class QgsMapToolAddRing: public QgsMapToolCapture
+class APP_EXPORT QgsMapToolAddRing: public QgsMapToolCapture
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolannotation.h b/src/app/qgsmaptoolannotation.h
@@ -21,7 +21,7 @@
 #include "qgsmaptool.h"
 #include "qgsannotationitem.h"
 
-class QgsMapToolAnnotation: public QgsMapTool
+class APP_EXPORT QgsMapToolAnnotation: public QgsMapTool
 {
   public:
     QgsMapToolAnnotation( QgsMapCanvas* canvas );

diff --git a/src/app/qgsmaptoolcapture.h b/src/app/qgsmaptoolcapture.h
@@ -30,7 +30,7 @@ class QgsVertexMarker;
 class QgsMapLayer;
 class QgsGeometryValidator;
 
-class QgsMapToolCapture : public QgsMapToolEdit
+class APP_EXPORT QgsMapToolCapture : public QgsMapToolEdit
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolchangelabelproperties.h b/src/app/qgsmaptoolchangelabelproperties.h
@@ -20,7 +20,7 @@
 
 #include "qgsmaptoollabel.h"
 
-class QgsMapToolChangeLabelProperties: public QgsMapToolLabel
+class APP_EXPORT QgsMapToolChangeLabelProperties: public QgsMapToolLabel
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptooldeletepart.h b/src/app/qgsmaptooldeletepart.h
@@ -21,7 +21,7 @@
 class QgsVertexMarker;
 
 /**Map tool to delete vertices from line/polygon features*/
-class QgsMapToolDeletePart: public QgsMapToolVertexEdit
+class APP_EXPORT QgsMapToolDeletePart: public QgsMapToolVertexEdit
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptooldeletering.h b/src/app/qgsmaptooldeletering.h
@@ -21,7 +21,7 @@
 class QgsVertexMarker;
 /**Map tool to delete vertices from line/polygon features*/
 
-class QgsMapToolDeleteRing : public QgsMapToolVertexEdit
+class APP_EXPORT QgsMapToolDeleteRing : public QgsMapToolVertexEdit
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptooledit.h b/src/app/qgsmaptooledit.h
@@ -23,7 +23,7 @@ class QgsRubberBand;
 class QKeyEvent;
 
 /**Base class for map tools that edit vector geometry*/
-class QgsMapToolEdit: public QgsMapTool
+class APP_EXPORT QgsMapToolEdit: public QgsMapTool
 {
   public:
     QgsMapToolEdit( QgsMapCanvas* canvas );

diff --git a/src/app/qgsmaptoolfeatureaction.h b/src/app/qgsmaptoolfeatureaction.h
@@ -27,7 +27,7 @@ class QgsVectorLayer;
 /**
   \brief Map tool for running feature actions on the current layer
 */
-class QgsMapToolFeatureAction : public QgsMapTool
+class APP_EXPORT QgsMapToolFeatureAction : public QgsMapTool
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolformannotation.h b/src/app/qgsmaptoolformannotation.h
@@ -20,7 +20,7 @@
 
 #include "qgsmaptoolannotation.h"
 
-class QgsMapToolFormAnnotation: public QgsMapToolAnnotation
+class APP_EXPORT QgsMapToolFormAnnotation: public QgsMapToolAnnotation
 {
   public:
     QgsMapToolFormAnnotation( QgsMapCanvas* canvas );

diff --git a/src/app/qgsmaptoolhtmlannotation.h b/src/app/qgsmaptoolhtmlannotation.h
@@ -20,7 +20,7 @@
 
 #include "qgsmaptoolannotation.h"
 
-class QgsMapToolHtmlAnnotation: public QgsMapToolAnnotation
+class APP_EXPORT QgsMapToolHtmlAnnotation: public QgsMapToolAnnotation
 {
   public:
     QgsMapToolHtmlAnnotation( QgsMapCanvas* canvas );

diff --git a/src/app/qgsmaptoolidentifyaction.h b/src/app/qgsmaptoolidentifyaction.h
@@ -41,7 +41,7 @@ class QgsVectorLayer;
   - for vector layers shows feature attributes within search radius
     (allows to edit values when vector layer is in editing mode)
 */
-class QgsMapToolIdentifyAction : public QgsMapToolIdentify
+class APP_EXPORT QgsMapToolIdentifyAction : public QgsMapToolIdentify
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoollabel.h b/src/app/qgsmaptoollabel.h
@@ -25,7 +25,7 @@
 class QgsRubberBand;
 
 /**Base class for map tools that modify label properties*/
-class QgsMapToolLabel: public QgsMapTool
+class APP_EXPORT QgsMapToolLabel: public QgsMapTool
 {
   public:
     QgsMapToolLabel( QgsMapCanvas* canvas );

diff --git a/src/app/qgsmaptoolmeasureangle.h b/src/app/qgsmaptoolmeasureangle.h
@@ -25,7 +25,7 @@ class QgsDisplayAngle;
 class QgsRubberBand;
 
 /**Map tool to measure angle between two segments*/
-class QgsMapToolMeasureAngle: public QgsMapTool
+class APP_EXPORT QgsMapToolMeasureAngle: public QgsMapTool
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolmovefeature.h b/src/app/qgsmaptoolmovefeature.h
@@ -20,7 +20,7 @@
 #include "qgsvectorlayer.h"
 
 /**Map tool for translating feature position by mouse drag*/
-class QgsMapToolMoveFeature: public QgsMapToolEdit
+class APP_EXPORT QgsMapToolMoveFeature: public QgsMapToolEdit
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolmovelabel.h b/src/app/qgsmaptoolmovelabel.h
@@ -21,7 +21,7 @@
 #include "qgsmaptoollabel.h"
 
 /**A map tool for dragging label positions*/
-class QgsMapToolMoveLabel: public QgsMapToolLabel
+class APP_EXPORT QgsMapToolMoveLabel: public QgsMapToolLabel
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptooloffsetcurve.h b/src/app/qgsmaptooloffsetcurve.h
@@ -24,7 +24,7 @@ class QgsVertexMarker;
 class QDoubleSpinBox;
 class QGraphicsProxyWidget;
 
-class QgsMapToolOffsetCurve: public QgsMapToolEdit
+class APP_EXPORT QgsMapToolOffsetCurve: public QgsMapToolEdit
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolpinlabels.h b/src/app/qgsmaptoolpinlabels.h
@@ -27,7 +27,7 @@ class QgsHighlight;
 class QgsLabelPosition;
 
 /**A map tool for pinning (writing to attribute table) and unpinning labelpositions and rotation*/
-class QgsMapToolPinLabels: public QgsMapToolLabel
+class APP_EXPORT QgsMapToolPinLabels: public QgsMapToolLabel
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolreshape.h b/src/app/qgsmaptoolreshape.h
@@ -19,7 +19,7 @@
 #include "qgsmaptoolcapture.h"
 
 /**A map tool that draws a line and splits the features cut by the line*/
-class QgsMapToolReshape: public QgsMapToolCapture
+class APP_EXPORT QgsMapToolReshape: public QgsMapToolCapture
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolrotatefeature.h b/src/app/qgsmaptoolrotatefeature.h
@@ -22,7 +22,7 @@
 class QgsVertexMarker;
 
 /**Map tool for translating feature position by mouse drag*/
-class QgsMapToolRotateFeature: public QgsMapToolEdit
+class APP_EXPORT QgsMapToolRotateFeature: public QgsMapToolEdit
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolrotatelabel.h b/src/app/qgsmaptoolrotatelabel.h
@@ -21,7 +21,7 @@
 #include "qgsmaptoollabel.h"
 class QgsPointRotationItem;
 
-class QgsMapToolRotateLabel: public QgsMapToolLabel
+class APP_EXPORT QgsMapToolRotateLabel: public QgsMapToolLabel
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolrotatepointsymbols.h b/src/app/qgsmaptoolrotatepointsymbols.h
@@ -22,7 +22,7 @@
 class QgsPointRotationItem;
 
 /**A class that allows to interactively manipulate the value of the rotation field(s) for point layers*/
-class QgsMapToolRotatePointSymbols: public QgsMapToolEdit
+class APP_EXPORT QgsMapToolRotatePointSymbols: public QgsMapToolEdit
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolselect.h b/src/app/qgsmaptoolselect.h
@@ -21,7 +21,7 @@
 class QgsMapCanvas;
 class QMouseEvent;
 
-class QgsMapToolSelect : public QgsMapTool
+class APP_EXPORT QgsMapToolSelect : public QgsMapTool
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolselectfreehand.h b/src/app/qgsmaptoolselectfreehand.h
@@ -22,7 +22,7 @@ class QgsMapCanvas;
 class QgsRubberBand;
 
 
-class QgsMapToolSelectFreehand : public QgsMapTool
+class APP_EXPORT QgsMapToolSelectFreehand : public QgsMapTool
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolselectpolygon.h b/src/app/qgsmaptoolselectpolygon.h
@@ -22,7 +22,7 @@ class QgsMapCanvas;
 class QgsRubberBand;
 
 
-class QgsMapToolSelectPolygon : public QgsMapTool
+class APP_EXPORT QgsMapToolSelectPolygon : public QgsMapTool
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolselectradius.h b/src/app/qgsmaptoolselectradius.h
@@ -24,7 +24,7 @@ class QgsMapCanvas;
 class QgsRubberBand;
 
 
-class QgsMapToolSelectRadius : public QgsMapTool
+class APP_EXPORT QgsMapToolSelectRadius : public QgsMapTool
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolselectrectangle.h b/src/app/qgsmaptoolselectrectangle.h
@@ -28,7 +28,7 @@ class QgsGeometry;
 class QgsRubberBand;
 
 
-class QgsMapToolSelectRectangle : public QgsMapTool
+class APP_EXPORT QgsMapToolSelectRectangle : public QgsMapTool
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolshowhidelabels.h b/src/app/qgsmaptoolshowhidelabels.h
@@ -23,7 +23,7 @@
 
 
 /**A map tool for showing or hidding a feature's label*/
-class QgsMapToolShowHideLabels : public QgsMapToolLabel
+class APP_EXPORT QgsMapToolShowHideLabels : public QgsMapToolLabel
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolsimplify.h b/src/app/qgsmaptoolsimplify.h
@@ -25,7 +25,7 @@
 class QgsRubberBand;
 
 
-class QgsSimplifyDialog : public QDialog, private Ui::SimplifyLineDialog
+class APP_EXPORT QgsSimplifyDialog : public QDialog, private Ui::SimplifyLineDialog
 {
     Q_OBJECT
 
@@ -52,7 +52,7 @@ class QgsSimplifyDialog : public QDialog, private Ui::SimplifyLineDialog
 
 
 /** Map tool to simplify line/polygon features */
-class QgsMapToolSimplify: public QgsMapToolEdit
+class APP_EXPORT QgsMapToolSimplify: public QgsMapToolEdit
 {
     Q_OBJECT
 
@@ -106,7 +106,7 @@ class QgsMapToolSimplify: public QgsMapToolEdit
 /**
   Implementation of Douglas-Peucker simplification algorithm.
  */
-class QgsSimplifyFeature
+class APP_EXPORT QgsSimplifyFeature
 {
     /** structure for one entry in stack for simplification algorithm */
     struct StackEntry

diff --git a/src/app/qgsmaptoolsplitfeatures.h b/src/app/qgsmaptoolsplitfeatures.h
@@ -19,7 +19,7 @@
 #include "qgsmaptoolcapture.h"
 
 /**A map tool that draws a line and splits the features cut by the line*/
-class QgsMapToolSplitFeatures: public QgsMapToolCapture
+class APP_EXPORT QgsMapToolSplitFeatures: public QgsMapToolCapture
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolsvgannotation.h b/src/app/qgsmaptoolsvgannotation.h
@@ -20,7 +20,7 @@
 
 #include "qgsmaptoolannotation.h"
 
-class QgsMapToolSvgAnnotation: public QgsMapToolAnnotation
+class APP_EXPORT QgsMapToolSvgAnnotation: public QgsMapToolAnnotation
 {
   public:
     QgsMapToolSvgAnnotation( QgsMapCanvas* canvas );

diff --git a/src/app/qgsmaptooltextannotation.h b/src/app/qgsmaptooltextannotation.h
@@ -20,7 +20,7 @@
 
 #include "qgsmaptoolannotation.h"
 
-class QgsMapToolTextAnnotation: public QgsMapToolAnnotation
+class APP_EXPORT QgsMapToolTextAnnotation: public QgsMapToolAnnotation
 {
   public:
     QgsMapToolTextAnnotation( QgsMapCanvas* canvas );

diff --git a/src/app/qgsmaptoolvertexedit.h b/src/app/qgsmaptoolvertexedit.h
@@ -23,7 +23,7 @@
 /**Base class for vertex manipulation tools.
  Inherited by QgsMapToolMoveVertex, QgsMapToolAddVertex,
 QgsMapToolDeleteVertex*/
-class QgsMapToolVertexEdit: public QgsMapToolEdit
+class APP_EXPORT QgsMapToolVertexEdit: public QgsMapToolEdit
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h
@@ -26,7 +26,7 @@
 class QCloseEvent;
 class QgsMeasureTool;
 
-class QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
+class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmeasuretool.h b/src/app/qgsmeasuretool.h
@@ -27,7 +27,7 @@ class QgsRubberBand;
 
 
 
-class QgsMeasureTool : public QgsMapTool
+class APP_EXPORT QgsMeasureTool : public QgsMapTool
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmergeattributesdialog.h b/src/app/qgsmergeattributesdialog.h
@@ -29,7 +29,7 @@ class QComboBox;
 
 
 /**A dialog to insert the merge behaviour for attributes (e.g. for the union features editing tool)*/
-class QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeAttributesDialogBase
+class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeAttributesDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsnewspatialitelayerdialog.h b/src/app/qgsnewspatialitelayerdialog.h
@@ -29,7 +29,7 @@ extern "C"
 #include <spatialite.h>
 }
 
-class QgsNewSpatialiteLayerDialog: public QDialog, private Ui::QgsNewSpatialiteLayerDialogBase
+class APP_EXPORT QgsNewSpatialiteLayerDialog: public QDialog, private Ui::QgsNewSpatialiteLayerDialogBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h
@@ -33,7 +33,7 @@
  * \class QgsOptions
  * \brief Set user options and preferences
  */
-class QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOptionsBase
+class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOptionsBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgspastetransformations.h b/src/app/qgspastetransformations.h
@@ -27,7 +27,7 @@ class QPushButton;
 /*!
  * \brief Dialog to allow the user to set up how source fields are transformed to destination fields in copy/paste operations
  */
-class QgsPasteTransformations : public QDialog, private Ui::QgsPasteTransformationsBase
+class APP_EXPORT QgsPasteTransformations : public QDialog, private Ui::QgsPasteTransformationsBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgspluginmetadata.h b/src/app/qgspluginmetadata.h
@@ -26,7 +26,7 @@ class QgisPlugin;
 * the instantiated object. This allows the plugin manager to tell the plugin to
 * unload itself.
 */
-class QgsPluginMetadata
+class APP_EXPORT QgsPluginMetadata
 {
   public:
     QgsPluginMetadata( QString _libraryPath, QString _name, QgisPlugin *_plugin );

diff --git a/src/app/qgspluginregistry.h b/src/app/qgspluginregistry.h
@@ -20,8 +20,8 @@
 #define QGSPLUGINREGISTRY_H
 
 #include <QMap>
+#include "qgspluginmetadata.h"
 
-class QgsPluginMetadata;
 class QgsPythonUtils;
 class QgisPlugin;
 class QgisInterface;
@@ -36,7 +36,7 @@ class QString;
 * - C++ plugins: base name of plugin library, e.g. libgrassplugin
 * - Python plugins: module name (directory) of plugin, e.g. db_manager
 */
-class QgsPluginRegistry
+class APP_EXPORT QgsPluginRegistry
 {
   public:
     //! Returns the instance pointer, creating the object on the first call

diff --git a/src/app/qgspointrotationitem.h b/src/app/qgspointrotationitem.h
@@ -21,7 +21,7 @@
 #include <QPixmap>
 
 /**An item that shows a rotated point symbol (e.g. arrow) centered to a map location together with a text displaying the rotation value*/
-class QgsPointRotationItem: public QgsMapCanvasItem
+class APP_EXPORT QgsPointRotationItem: public QgsMapCanvasItem
 {
   public:
 

diff --git a/src/app/qgsprojectlayergroupdialog.h b/src/app/qgsprojectlayergroupdialog.h
@@ -21,7 +21,7 @@
 class QDomElement;
 
 /**A dialog to select layers and groups from a qgs project*/
-class QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProjectLayerGroupDialogBase
+class APP_EXPORT QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProjectLayerGroupDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h
@@ -31,7 +31,7 @@ class QgsStyleV2;
   @note actual state is stored in QgsProject singleton instance
 
  */
-class QgsProjectProperties : public QgsOptionsDialogBase, private Ui::QgsProjectPropertiesBase
+class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui::QgsProjectPropertiesBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsrastercalcdialog.h b/src/app/qgsrastercalcdialog.h
@@ -22,7 +22,7 @@
 #include "qgsrastercalculator.h"
 
 /**A dialog to enter a raster calculation expression*/
-class QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcDialogBase
+class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsrasterlayerproperties.h b/src/app/qgsrasterlayerproperties.h
@@ -38,7 +38,7 @@ class QgsRasterHistogramWidget;
   *@author Tim Sutton
   */
 
-class QgsRasterLayerProperties : public QgsOptionsDialogBase, private Ui::QgsRasterLayerPropertiesBase
+class APP_EXPORT QgsRasterLayerProperties : public QgsOptionsDialogBase, private Ui::QgsRasterLayerPropertiesBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgssavestyletodbdialog.h b/src/app/qgssavestyletodbdialog.h
@@ -14,7 +14,7 @@
 #include "qgisgui.h"
 #include "qgsfield.h"
 
-class QgsSaveStyleToDbDialog : public QDialog, private Ui::QgsSaveToDBDialog
+class APP_EXPORT QgsSaveStyleToDbDialog : public QDialog, private Ui::QgsSaveToDBDialog
 {
     QString mUIFileContent;
     Q_OBJECT

diff --git a/src/app/qgsshortcutsmanager.h b/src/app/qgsshortcutsmanager.h
@@ -24,7 +24,7 @@
   Shortcuts manager is a singleton class that contains a list of actions from main window
   that have been registered and their shortcut can be changed.
   */
-class QgsShortcutsManager : public QObject
+class APP_EXPORT QgsShortcutsManager : public QObject
 {
     Q_OBJECT;
   public:

diff --git a/src/app/qgssnappingdialog.h b/src/app/qgssnappingdialog.h
@@ -27,7 +27,7 @@ class QgsMapCanvas;
 
 /**A dialog to enter advanced editing properties, e.g. topological editing, snapping settings
 for the individual layers*/
-class QgsSnappingDialog: public QDialog, private Ui::QgsSnappingDialogBase
+class APP_EXPORT QgsSnappingDialog: public QDialog, private Ui::QgsSnappingDialogBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgssponsors.h b/src/app/qgssponsors.h
@@ -19,7 +19,7 @@
 
 #include "ui_qgssponsorsbase.h"
 
-class QgsSponsors : public QDialog, private Ui::QgsSponsorsBase
+class APP_EXPORT QgsSponsors : public QDialog, private Ui::QgsSponsorsBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgssvgannotationdialog.h b/src/app/qgssvgannotationdialog.h
@@ -23,7 +23,7 @@
 class QgsSvgAnnotationItem;
 class QgsAnnotationWidget;
 
-class QgsSvgAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
+class APP_EXPORT QgsSvgAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgstextannotationdialog.h b/src/app/qgstextannotationdialog.h
@@ -23,7 +23,7 @@
 class QgsAnnotationWidget;
 class QgsTextAnnotationItem;
 
-class QgsTextAnnotationDialog: public QDialog, private Ui::QgsTextAnnotationDialogBase
+class APP_EXPORT QgsTextAnnotationDialog: public QDialog, private Ui::QgsTextAnnotationDialogBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgstip.h b/src/app/qgstip.h
@@ -27,7 +27,7 @@
 * @see also QgsTipOfTheDay, QgsTipFactory
 */
 
-class QgsTip
+class APP_EXPORT QgsTip
 {
   public:
     /** Constructor */

diff --git a/src/app/qgstipfactory.h b/src/app/qgstipfactory.h
@@ -27,7 +27,7 @@
 * @see also QgsTipOfTheDay, QgsTip
 */
 
-class QgsTipFactory : public QObject
+class APP_EXPORT QgsTipFactory : public QObject
 {
     Q_OBJECT //used for tr() so we don't need to do QObject::tr()
   public:

diff --git a/src/app/qgstipgui.h b/src/app/qgstipgui.h
@@ -20,7 +20,7 @@
 #include "ui_qgstipguibase.h"
 class QgsTip;
 
-class QgsTipGui : public QDialog, private Ui::QgsTipGuiBase
+class APP_EXPORT QgsTipGui : public QDialog, private Ui::QgsTipGuiBase
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsundowidget.h b/src/app/qgsundowidget.h
@@ -33,7 +33,7 @@ class QgsMapLayer;
 /**
  * Class that handles undo display fo undo commands
  */
-class QgsUndoWidget : public QDockWidget
+class APP_EXPORT QgsUndoWidget : public QDockWidget
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -41,7 +41,7 @@ class QgsLabelingGui;
 class QgsDiagramProperties;
 class QgsFieldsProperties;
 
-class QgsVectorLayerProperties : public QgsOptionsDialogBase, private Ui::QgsVectorLayerPropertiesBase
+class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private Ui::QgsVectorLayerPropertiesBase
 {
     Q_OBJECT
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -567,9 +567,9 @@ ENDIF (NOT WITH_INTERNAL_SPATIALITE)
 
 IF (WIN32)
   IF (MSVC)
-    ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllexport)")
+    ADD_DEFINITIONS("-DCORE_EXPORT=${DLLEXPORT}")
   ELSE (MSVC)
-    ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=__declspec(dllexport)\"")
+    ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=${DLLEXPORT}\"")
   ENDIF (MSVC)
 ENDIF (WIN32)
 

diff --git a/src/core/composer/qgsatlascomposition.h b/src/core/composer/qgsatlascomposition.h
@@ -136,7 +136,7 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
     QString mFeatureFilter;
 
     // id of each iterated feature (after filtering and sorting)
-    std::vector<QgsFeatureId> mFeatureIds;
+    QVector<QgsFeatureId> mFeatureIds;
 
     QgsFeature mCurrentFeature;
     QgsRectangle mOrigExtent;

diff --git a/src/core/pal/pal.cpp b/src/core/pal/pal.cpp
@@ -85,7 +85,7 @@ namespace pal
     // do not init and exit GEOS - we do it inside QGIS
     //initGEOS( geosNotice, geosError );
 
-    layers = new std::list<Layer*>();
+    layers = new QList<Layer*>();
 
     lyrsMutex = new SimpleMutex();
 
@@ -114,7 +114,7 @@ namespace pal
 
   }
 
-  std::list<Layer*> *Pal::getLayers()
+  QList<Layer*> *Pal::getLayers()
   {
     // TODO make const ! or whatever else
     return layers;
@@ -123,7 +123,7 @@ namespace pal
   Layer *Pal::getLayer( const char *lyrName )
   {
     lyrsMutex->lock();
-    for ( std::list<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ )
+    for ( QList<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ )
       if ( strcmp(( *it )->name, lyrName ) == 0 )
       {
         lyrsMutex->unlock();
@@ -140,7 +140,7 @@ namespace pal
     lyrsMutex->lock();
     if ( layer )
     {
-      layers->remove( layer );
+      layers->removeOne( layer );
       delete layer;
     }
     lyrsMutex->unlock();
@@ -176,7 +176,7 @@ namespace pal
     std::cout << "nbLayers:" << layers->size() << std::endl;
 #endif
 
-    for ( std::list<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ )
+    for ( QList<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ )
     {
       if ( strcmp(( *it )->name, lyrName ) == 0 )   // if layer already known
       {
@@ -401,12 +401,12 @@ namespace pal
     int oldNbft = 0;
     Layer *layer;
 
-    std::list<char*> *labLayers = new std::list<char*>();
+    QList<char*> *labLayers = new QList<char*>();
 
     lyrsMutex->lock();
     for ( i = 0; i < nbLayers; i++ )
     {
-      for ( std::list<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ ) // iterate on pal->layers
+      for ( QList<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ ) // iterate on pal->layers
       {
         layer = *it;
         // Only select those who are active and labellable (with scale constraint) or those who are active and which must be treated as obstaclewhich must be treated as obstacle
@@ -641,7 +641,7 @@ namespace pal
     double *priorities = new double[nbLayers];
     Layer *layer;
     i = 0;
-    for ( std::list<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ )
+    for ( QList<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ )
     {
       layer = *it;
       layersName[i] = layer->name;
@@ -806,7 +806,7 @@ namespace pal
     double *priorities = new double[nbLayers];
     Layer *layer;
     int i = 0;
-    for ( std::list<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ )
+    for ( QList<Layer*>::iterator it = layers->begin(); it != layers->end(); it++ )
     {
       layer = *it;
       layersName[i] = layer->name;

diff --git a/src/core/pal/pal.h b/src/core/pal/pal.h
@@ -35,7 +35,7 @@
 #define _PAL_H
 
 
-#include <list>
+#include <QList>
 #include <iostream>
 #include <ctime>
 
@@ -127,7 +127,7 @@ namespace pal
       friend class FeaturePart;
       friend class Layer;
     private:
-      std::list<Layer*> * layers;
+      QList<Layer*> *layers;
 
       SimpleMutex *lyrsMutex;
 
@@ -287,7 +287,7 @@ namespace pal
        *
        * @return a list of all layers
        */
-      std::list<Layer*> *getLayers();
+      QList<Layer*> *getLayers();
 
       /**
        * \brief remove a layer

diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -5208,7 +5208,7 @@ bool QgsGeometry::convertToMultiType()
     return false; //no need to convert
   }
 
-  int newGeomSize = mGeometrySize + 1 + 2 * sizeof( int ); //endian: 1, multitype: sizeof(int), number of geometries: sizeof(int)
+  size_t newGeomSize = mGeometrySize + 1 + 2 * sizeof( int ); //endian: 1, multitype: sizeof(int), number of geometries: sizeof(int)
   unsigned char* newGeometry = new unsigned char[newGeomSize];
 
   int currentWkbPosition = 0;

diff --git a/src/core/qgslogger.cpp b/src/core/qgslogger.cpp
@@ -181,7 +181,7 @@ int QgsLogger::debugLevel()
 {
   if ( sPrefixLength == -1 )
   {
-    sPrefixLength = strlen( CMAKE_SOURCE_DIR ) + 1;
+    sPrefixLength = sizeof( CMAKE_SOURCE_DIR ) + 1;
   }
 
   if ( sDebugLevel == -999 )

diff --git a/src/core/qgsprojectproperty.cpp b/src/core/qgsprojectproperty.cpp
@@ -21,7 +21,7 @@
 #include <QDomDocument>
 #include <QStringList>
 
-void QgsPropertyValue::dump( size_t tabs ) const
+void QgsPropertyValue::dump( int tabs ) const
 {
   QString tabString;
   tabString.fill( '\t', tabs );
@@ -290,7 +290,7 @@ QVariant QgsPropertyKey::value() const
 } // QVariant QgsPropertyKey::value()
 
 
-void QgsPropertyKey::dump( size_t tabs ) const
+void QgsPropertyKey::dump( int tabs ) const
 {
   QString tabString;
 

diff --git a/src/core/qgsprojectproperty.h b/src/core/qgsprojectproperty.h
@@ -59,7 +59,7 @@ class CORE_EXPORT QgsProperty
     @param tabs is number of tabs to print; used for pretty-printing
     hierarchy
     */
-    virtual void dump( size_t tabs = 0 ) const = 0;
+    virtual void dump( int tabs = 0 ) const = 0;
 
     /** returns true if is a QgsPropertyKey */
     virtual bool isKey() const = 0;
@@ -148,15 +148,15 @@ class CORE_EXPORT QgsPropertyValue : public QgsProperty
     bool isLeaf() const
     { return true; }
 
-    void dump( size_t tabs = 0 ) const;
+    void dump( int tabs = 0 ) const;
 
     bool readXML( QDomNode & keyNode );
 
     bool writeXML( const QString & nodeName,
                    QDomElement   & element,
                    QDomDocument  & document );
 
-    size_t count() const
+    int count() const
     { return 0; }
 
 
@@ -258,14 +258,14 @@ class CORE_EXPORT QgsPropertyKey : public QgsProperty
 
 
 
-    void dump( size_t tabs = 0 ) const;
+    void dump( int tabs = 0 ) const;
 
     bool readXML( QDomNode & keyNode );
 
     bool writeXML( const QString &nodeName, QDomElement & element, QDomDocument & document );
 
     /// how many elements are contained within this one?
-    size_t count() const
+    int count() const
     { return mProperties.count(); }
 
     /// Does this property not have any subkeys or values?

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -359,9 +359,9 @@ INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR})
 
 IF (WIN32)
   IF (MSVC)
-    ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)")
+    ADD_DEFINITIONS("-DGUI_EXPORT=${DLLEXPORT}")
   ELSE (MSVC)
-    ADD_DEFINITIONS("-UGUI_EXPORT \"-DGUI_EXPORT=__declspec(dllexport)\"")
+    ADD_DEFINITIONS("-UGUI_EXPORT \"-DGUI_EXPORT=${DLLEXPORT}\"")
   ENDIF (MSVC)
 ENDIF (WIN32)
 

diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp
@@ -61,7 +61,7 @@ void QgsHttpRequestHandler::sendHttpResponse( QByteArray* ba, const QString& for
   printf( "\n" );
   printf( "Content-Length: %d\n", ba->size() );
   printf( "\n" );
-  int result = fwrite( ba->data(), ba->size(), 1, FCGI_stdout );
+  size_t result = fwrite( ba->data(), ba->size(), 1, FCGI_stdout );
 #ifdef QGISDEBUG
   QgsDebugMsg( QString( "Sent %1 bytes" ).arg( result ) );
 #else

diff --git a/src/plugins/sqlanywhere/CMakeLists.txt b/src/plugins/sqlanywhere/CMakeLists.txt
@@ -25,9 +25,9 @@ SET (sqlanywhere_RCCS  sqlanywhere.qrc)
 
 IF (WIN32)
   IF (MSVC)
-    ADD_DEFINITIONS("-DSACONN_EXPORT=__declspec(dllexport)")
+    ADD_DEFINITIONS("-DSACONN_EXPORT=${DLLEXPORT}")
   ELSE (MSVC)
-    ADD_DEFINITIONS("-USACONN_EXPORT \"-DSACONN_EXPORT=__declspec(dllexport)\"")
+    ADD_DEFINITIONS("-USACONN_EXPORT \"-DSACONN_EXPORT=${DLLEXPORT}\"")
   ENDIF (MSVC)
 ELSE (WIN32)
   ADD_DEFINITIONS(-DSACONN_EXPORT=)

diff --git a/src/providers/gpx/gpsdata.cpp b/src/providers/gpx/gpsdata.cpp
@@ -107,7 +107,7 @@ void QgsRoute::writeXML( QTextStream& stream )
 {
   stream << "<rte>\n";
   QgsGPSExtended::writeXML( stream );
-  for ( unsigned int i = 0; i < points.size(); ++i )
+  for ( int i = 0; i < points.size(); ++i )
   {
     stream << "<rtept lat=\"" << QString::number( points[i].lat, 'f', OUTPUT_PRECISION )
     << "\" lon=\"" << QString::number( points[i].lon, 'f', OUTPUT_PRECISION ) << "\">\n";
@@ -122,10 +122,10 @@ void QgsTrack::writeXML( QTextStream& stream )
 {
   stream << "<trk>\n";
   QgsGPSExtended::writeXML( stream );
-  for ( unsigned int i = 0; i < segments.size(); ++i )
+  for ( int i = 0; i < segments.size(); ++i )
   {
     stream << "<trkseg>\n";
-    for ( unsigned int j = 0; j < segments[i].points.size(); ++j )
+    for ( int j = 0; j < segments[i].points.size(); ++j )
     {
       stream << "<trkpt lat=\"" <<
       QString::number( segments[i].points[j].lat, 'f', OUTPUT_PRECISION ) <<
@@ -409,7 +409,7 @@ QgsGPSData* QgsGPSData::getData( const QString& fileName )
 
     data->setNoDataExtent();
 
-    dataObjects[fileName] = std::pair<QgsGPSData*, unsigned>( data, 0 );
+    dataObjects[fileName] = qMakePair<QgsGPSData*, unsigned>( data, 0 );
   }
   else
   {
@@ -418,8 +418,8 @@ QgsGPSData* QgsGPSData::getData( const QString& fileName )
 
   // return a pointer and increase the reference count for that file name
   DataMap::iterator iter = dataObjects.find( fileName );
-  ++( iter->second.second );
-  return ( QgsGPSData* )( iter->second.first );
+  ++( iter.value().second );
+  return ( QgsGPSData* )( iter.value().first );
 }
 
 
@@ -432,10 +432,10 @@ void QgsGPSData::releaseData( const QString& fileName )
   if ( iter != dataObjects.end() )
   {
     QgsDebugMsg( "unrefing " + fileName );
-    if ( --( iter->second.second ) == 0 )
+    if ( --( iter.value().second ) == 0 )
     {
       QgsDebugMsg( "No one's using " + fileName + ", I'll erase it" );
-      delete iter->second.first;
+      delete iter.value().first;
       dataObjects.erase( iter );
     }
   }

diff --git a/src/providers/gpx/gpsdata.h b/src/providers/gpx/gpsdata.h
@@ -95,7 +95,7 @@ class QgsRoute : public QgsGPSExtended
 {
   public:
     virtual void writeXML( QTextStream& stream );
-    std::vector<QgsRoutepoint> points;
+    QVector<QgsRoutepoint> points;
     QgsFeatureId id;
 };
 
@@ -106,7 +106,7 @@ class QgsRoute : public QgsGPSExtended
 class QgsTrackSegment
 {
   public:
-    std::vector<QgsTrackpoint> points;
+    QVector<QgsTrackpoint> points;
 };
 
 
@@ -117,7 +117,7 @@ class QgsTrack : public QgsGPSExtended
 {
   public:
     virtual void writeXML( QTextStream& stream );
-    std::vector<QgsTrackSegment> segments;
+    QVector<QgsTrackSegment> segments;
     QgsFeatureId id;
 };
 
@@ -129,11 +129,11 @@ class QgsGPSData
   public:
 
     /** This iterator type is used to iterate over waypoints. */
-    typedef std::list<QgsWaypoint>::iterator WaypointIterator;
+    typedef QList<QgsWaypoint>::iterator WaypointIterator;
     /** This iterator type is used to iterate over routes. */
-    typedef std::list<QgsRoute>::iterator RouteIterator;
+    typedef QList<QgsRoute>::iterator RouteIterator;
     /** This iterator type is used to iterate over tracks. */
-    typedef std::list<QgsTrack>::iterator TrackIterator;
+    typedef QList<QgsTrack>::iterator TrackIterator;
 
 
     /** This constructor initializes the extent to a nonsense value. Don't try
@@ -234,15 +234,15 @@ class QgsGPSData
 
   protected:
 
-    std::list<QgsWaypoint> waypoints;
-    std::list<QgsRoute> routes;
-    std::list<QgsTrack> tracks;
+    QList<QgsWaypoint> waypoints;
+    QList<QgsRoute> routes;
+    QList<QgsTrack> tracks;
     int nextWaypoint, nextRoute, nextTrack;
 
     double xMin, xMax, yMin, yMax;
 
     /** This is used internally to store GPS data objects (one per file). */
-    typedef std::map<QString, std::pair<QgsGPSData*, unsigned> > DataMap;
+    typedef QMap<QString, QPair<QgsGPSData*, unsigned> > DataMap;
 
     /** This is the static container that maps file names to GPSData objects and
         does reference counting, so several providers can use the same GPSData

diff --git a/src/providers/gpx/qgsgpxfeatureiterator.cpp b/src/providers/gpx/qgsgpxfeatureiterator.cpp
@@ -409,7 +409,7 @@ QgsGeometry* QgsGPXFeatureIterator::readRouteGeometry( const QgsRoute& rte )
   geo[0] = QgsApplication::endian();
   geo[geo[0] == QgsApplication::NDR ? 1 : 4] = QGis::WKBLineString;
   std::memcpy( geo + 5, &nPoints, 4 );
-  for ( uint i = 0; i < rte.points.size(); ++i )
+  for ( int i = 0; i < rte.points.size(); ++i )
   {
     std::memcpy( geo + 9 + 16 * i, &rte.points[i].lon, sizeof( double ) );
     std::memcpy( geo + 9 + 16 * i + 8, &rte.points[i].lat, sizeof( double ) );

diff --git a/src/providers/grass/qgis.d.rast.c b/src/providers/grass/qgis.d.rast.c
@@ -147,7 +147,7 @@ static int cell_draw( char *name,
   int big_endian;
   long one = 1;
   FILE *fo;
-  int raster_size;
+  size_t raster_size;
 #ifdef NAN
   double dnul = NAN;
   float fnul = NAN;

diff --git a/src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt b/src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
@@ -9,10 +9,10 @@ SET (SACONN_SRCS
 
 IF (WIN32)
   IF (MSVC)
-    ADD_DEFINITIONS("-DSACONN_EXPORT=__declspec(dllexport)")
+    ADD_DEFINITIONS("-DSACONN_EXPORT=${DLLEXPORT}")
     SET_SOURCE_FILES_PROPERTIES(sacapi/sacapidll.c PROPERTIES COMPILE_FLAGS "-wd4152 -wd4055")
   ELSE (MSVC)
-    ADD_DEFINITIONS("-USACONN_EXPORT \"-DSACONN_EXPORT=__declspec(dllexport)\"")
+    ADD_DEFINITIONS("-USACONN_EXPORT \"-DSACONN_EXPORT=${DLLEXPORT}\"")
   ENDIF (MSVC)
 ELSE (WIN32)
   ADD_DEFINITIONS(-DSACONN_EXPORT=)

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -1,8 +1,8 @@
 IF (WIN32)
   IF (MSVC)
-    ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllexport)")
+    ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLEXPORT}")
   ELSE (MSVC)
-    ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllexport)\"")
+    ADD_DEFINITIONS("\"-DPYTHON_EXPORT=${DLLEXPORT}\"")
   ENDIF (MSVC)
 ELSE (WIN32)
   # other compilers don't use that MSVC construct
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ class QgsRubberBand; @@
-    class QgsMeasureTool : public QgsMapTool
+    class APP_EXPORT QgsMeasureTool : public QgsMapTool
     {
         Q_OBJECT
@@ Expand Down @@