diff --git a/src/core/symbology-ng/qgssymbollayerv2.cpp b/src/core/symbology-ng/qgssymbollayerv2.cpp
index a78bf436740a..5a16d63c4bd8 100644
--- a/src/core/symbology-ng/qgssymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgssymbollayerv2.cpp
@@ -18,6 +18,7 @@
 #include "qgsexpression.h"
 #include "qgsrendercontext.h"
 #include "qgsvectorlayer.h"
+#include "qgsdxfexport.h"
 
 #include <QSize>
 #include <QPainter>
@@ -76,6 +77,23 @@ void QgsSymbolLayerV2::removeDataDefinedProperties()
   mDataDefinedProperties.clear();
 }
 
+bool QgsSymbolLayerV2::writeDxf( QgsDxfExport& e,
+                                 double mmMapUnitScaleFactor,
+                                 const QString& layerName,
+                                 const QgsSymbolV2RenderContext* context,
+                                 const QgsFeature* f,
+                                 const QPointF& shift ) const
+{
+  Q_UNUSED( e );
+  Q_UNUSED( mmMapUnitScaleFactor );
+  Q_UNUSED( layerName );
+  Q_UNUSED( context );
+  Q_UNUSED( f );
+  Q_UNUSED( shift );
+  return false;
+}
+
+
 void QgsSymbolLayerV2::prepareExpressions( const QgsVectorLayer* vl, double scale )
 {
   if ( !vl )
diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h
index a8199c87481f..6cc2b85dd7e1 100644
--- a/src/core/symbology-ng/qgssymbollayerv2.h
+++ b/src/core/symbology-ng/qgssymbollayerv2.h
@@ -31,13 +31,14 @@
 #include <QDomElement>
 
 #include "qgssymbolv2.h"
+
 #include "qgssymbollayerv2utils.h" // QgsStringMap
-#include "qgsdxfexport.h"
 
 class QPainter;
 class QSize;
 class QPolygonF;
 
+class QgsDxfExport;
 class QgsExpression;
 class QgsRenderContext;
 
@@ -93,8 +94,12 @@ class CORE_EXPORT QgsSymbolLayerV2
     virtual void removeDataDefinedProperties();
     bool hasDataDefinedProperties() const { return mDataDefinedProperties.size() > 0; }
 
-    virtual bool writeDxf( QgsDxfExport& e, double mmMapUnitScaleFactor, const QString& layerName, const QgsSymbolV2RenderContext* context, const QgsFeature* f, const QPointF& shift = QPointF( 0.0, 0.0 ) ) const
-    { Q_UNUSED( e ); Q_UNUSED( mmMapUnitScaleFactor ); Q_UNUSED( layerName ); Q_UNUSED( context ); Q_UNUSED( f ); Q_UNUSED( shift ); return false; }
+    virtual bool writeDxf( QgsDxfExport& e,
+                           double mmMapUnitScaleFactor,
+                           const QString& layerName,
+                           const QgsSymbolV2RenderContext* context,
+                           const QgsFeature* f,
+                           const QPointF& shift = QPointF( 0.0, 0.0 ) ) const;
 
   protected:
     QgsSymbolLayerV2( QgsSymbolV2::SymbolType type, bool locked = false )
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 056a8e853886..8ba23a2006e3 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -392,7 +392,6 @@ INCLUDE_DIRECTORIES(
   ../core/composer
   ../core/raster
   ../core/symbology-ng
-  ../core/dxf
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${QWT_INCLUDE_DIR}
diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
index 32f409a814ab..1d372286a0af 100644
--- a/tests/src/core/CMakeLists.txt
+++ b/tests/src/core/CMakeLists.txt
@@ -8,7 +8,6 @@ SET (util_SRCS qgscompositionchecker.cpp)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} 
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/dxf
   ${CMAKE_SOURCE_DIR}/src/core/composer
   ${CMAKE_SOURCE_DIR}/src/core/raster
   ${CMAKE_SOURCE_DIR}/src/core/symbology-ng