diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 05190fad59c..e38098b5d25 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -5090,7 +5090,8 @@ void QgisApp::dxfExport()
       //extent
       if ( d.exportMapExtent() )
       {
-        dxfExport.setExtent( mapCanvas()->extent() );
+        QgsCoordinateTransform t( mapCanvas()->mapSettings().destinationCrs(), QgsCoordinateReferenceSystem( d.crs(), QgsCoordinateReferenceSystem::InternalCrsId ) );
+        dxfExport.setExtent( t.transformBoundingBox( mapCanvas()->extent() ) );
       }
     }
 
diff --git a/src/core/qgsdatasourceuri.h b/src/core/qgsdatasourceuri.h
index f1b165744c8..a9852eec265 100644
--- a/src/core/qgsdatasourceuri.h
+++ b/src/core/qgsdatasourceuri.h
@@ -238,7 +238,7 @@ class CORE_EXPORT QgsDataSourceUri
     bool mUseEstimatedMetadata;
     //! Disable SelectAtId capability (eg. to trigger the attribute table memory model for expensive views)
     bool mSelectAtIdDisabled;
-    //! geometry type (or QGis::WKBUnknown if not specified)
+    //! geometry type (or QgsWkbTypes::Unknown if not specified)
     QgsWkbTypes::Type mWkbType;
     //! SRID or a null string if not specified
     QString mSrid;
diff --git a/src/core/qgsprojectproperty.h b/src/core/qgsprojectproperty.h
index de1ad0a4559..0a4b6e8b4d4 100644
--- a/src/core/qgsprojectproperty.h
+++ b/src/core/qgsprojectproperty.h
@@ -51,7 +51,7 @@ class CORE_EXPORT QgsProperty
     QgsProperty()
     {}
 
-    virtual ~ QgsProperty()
+    virtual ~QgsProperty()
     {}
 
     /** Dumps out the keys and values
@@ -190,7 +190,7 @@ class CORE_EXPORT QgsPropertyKey : public QgsProperty
 {
   public:
     QgsPropertyKey( const QString &name = "" );
-    virtual ~ QgsPropertyKey();
+    virtual ~QgsPropertyKey();
 
     /// every key has a name
     // @{
diff --git a/src/core/symbology-ng/qgsrenderer.h b/src/core/symbology-ng/qgsrenderer.h
index 5100d00b493..ff852f4277e 100644
--- a/src/core/symbology-ng/qgsrenderer.h
+++ b/src/core/symbology-ng/qgsrenderer.h
@@ -213,7 +213,7 @@ class CORE_EXPORT QgsFeatureRenderer
      * @param context render context
      * @note added in QGIS 2.12
      */
-    virtual QgsSymbolList symbols( QgsRenderContext& context ) {  Q_UNUSED( context ); return QgsSymbolList(); }
+    virtual QgsSymbolList symbols( QgsRenderContext& context ) { Q_UNUSED( context ); return QgsSymbolList(); }
 
     bool usingSymbolLevels() const { return mUsingSymbolLevels; }
     void setUsingSymbolLevels( bool usingSymbolLevels ) { mUsingSymbolLevels = usingSymbolLevels; }
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
index 97b99ab3e90..2ddfe65541d 100644
--- a/src/plugins/globe/globe_plugin.cpp
+++ b/src/plugins/globe/globe_plugin.cpp
@@ -777,9 +777,10 @@ void GlobePlugin::addModelLayer( QgsVectorLayer* vLayer, QgsGlobeVectorLayerConf
   featureOpt.setLayer( vLayer );
   osgEarth::Style style;
 
-  if ( !vLayer->renderer()->symbols().isEmpty() )
+  QgsRenderContext ctx;
+  if ( !vLayer->renderer()->symbols( ctx ).isEmpty() )
   {
-    Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols() )
+    Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols( ctx ) )
     {
       if ( sym->type() == QgsSymbol::Line )
       {
diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp
index 0358d2ad9c1..f6e730c1d0d 100644
--- a/src/providers/grass/qgsgrassgislib.cpp
+++ b/src/providers/grass/qgsgrassgislib.cpp
@@ -40,6 +40,7 @@ extern "C"
 #include "qgsgeometry.h"
 #include "qgsrectangle.h"
 #include "qgsconfig.h"
+#include "qgsunittypes.h"
 
 #include <QByteArray>
 #include <QFileDialog>
@@ -1060,7 +1061,7 @@ int GRASS_LIB_EXPORT G_get_cellhd( const char *name, const char *mapset, struct
 
 double QgsGrassGisLib::G_database_units_to_meters_factor( void )
 {
-  return QGis::fromUnitToUnitFactor( mCrs.mapUnits(), Qgis::Meters );
+  return QgsUnitTypes::fromUnitToUnitFactor( mCrs.mapUnits(), QgsUnitTypes::DistanceMeters );
 }
 
 double QgsGrassGisLib::G_area_of_cell_at_row( int row )