diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
index e4cd86378bef..a53b3e6eeab7 100644
--- a/src/analysis/CMakeLists.txt
+++ b/src/analysis/CMakeLists.txt
@@ -18,6 +18,12 @@ SET(QGIS_ANALYSIS_SRCS
   interpolation/TriangleInterpolator.cc
   interpolation/Triangulation.cc
   interpolation/Vector3D.cc
+  raster/qgsninecellfilter.cpp
+  raster/qgsruggednessfilter.cpp
+  raster/qgsderivativefilter.cpp
+  raster/qgsslopefilter.cpp
+  raster/qgsaspectfilter.cpp
+  raster/qgstotalcurvaturefilter.cpp
   vector/qgsgeometryanalyzer.cpp
 )
 
diff --git a/src/plugins/raster_terrain_analysis/qgsaspectfilter.cpp b/src/analysis/raster/qgsaspectfilter.cpp
similarity index 88%
rename from src/plugins/raster_terrain_analysis/qgsaspectfilter.cpp
rename to src/analysis/raster/qgsaspectfilter.cpp
index d91d9cc06dcc..f5743cf725a0 100644
--- a/src/plugins/raster_terrain_analysis/qgsaspectfilter.cpp
+++ b/src/analysis/raster/qgsaspectfilter.cpp
@@ -29,22 +29,22 @@ QgsAspectFilter::~QgsAspectFilter()
 }
 
 float QgsAspectFilter::processNineCellWindow(
-    float* x11, float* x21, float* x31,
-    float* x12, float* x22, float* x32,
-    float* x13, float* x23, float* x33 )
+  float* x11, float* x21, float* x31,
+  float* x12, float* x22, float* x32,
+  float* x13, float* x23, float* x33 )
 {
   float derX = calcFirstDerX( x11, x21, x31, x12, x22, x32, x13, x23, x33 );
   float derY = calcFirstDerY( x11, x21, x31, x12, x22, x32, x13, x23, x33 );
 
   if ( derX == mOutputNodataValue ||
        derY == mOutputNodataValue ||
-       (derX == 0.0 && derY == 0.0) )
+       ( derX == 0.0 && derY == 0.0 ) )
   {
     return mOutputNodataValue;
   }
   else
   {
-    return 180.0 + atan2(derX, derY) * 180.0 / M_PI;
+    return 180.0 + atan2( derX, derY ) * 180.0 / M_PI;
   }
 }
 
diff --git a/src/plugins/raster_terrain_analysis/qgsaspectfilter.h b/src/analysis/raster/qgsaspectfilter.h
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsaspectfilter.h
rename to src/analysis/raster/qgsaspectfilter.h
diff --git a/src/plugins/raster_terrain_analysis/qgsderivativefilter.cpp b/src/analysis/raster/qgsderivativefilter.cpp
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsderivativefilter.cpp
rename to src/analysis/raster/qgsderivativefilter.cpp
diff --git a/src/plugins/raster_terrain_analysis/qgsderivativefilter.h b/src/analysis/raster/qgsderivativefilter.h
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsderivativefilter.h
rename to src/analysis/raster/qgsderivativefilter.h
diff --git a/src/plugins/raster_terrain_analysis/qgsninecellfilter.cpp b/src/analysis/raster/qgsninecellfilter.cpp
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsninecellfilter.cpp
rename to src/analysis/raster/qgsninecellfilter.cpp
diff --git a/src/plugins/raster_terrain_analysis/qgsninecellfilter.h b/src/analysis/raster/qgsninecellfilter.h
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsninecellfilter.h
rename to src/analysis/raster/qgsninecellfilter.h
diff --git a/src/plugins/raster_terrain_analysis/qgsruggednessfilter.cpp b/src/analysis/raster/qgsruggednessfilter.cpp
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsruggednessfilter.cpp
rename to src/analysis/raster/qgsruggednessfilter.cpp
diff --git a/src/plugins/raster_terrain_analysis/qgsruggednessfilter.h b/src/analysis/raster/qgsruggednessfilter.h
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsruggednessfilter.h
rename to src/analysis/raster/qgsruggednessfilter.h
diff --git a/src/plugins/raster_terrain_analysis/qgsslopefilter.cpp b/src/analysis/raster/qgsslopefilter.cpp
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsslopefilter.cpp
rename to src/analysis/raster/qgsslopefilter.cpp
diff --git a/src/plugins/raster_terrain_analysis/qgsslopefilter.h b/src/analysis/raster/qgsslopefilter.h
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgsslopefilter.h
rename to src/analysis/raster/qgsslopefilter.h
diff --git a/src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.cpp b/src/analysis/raster/qgstotalcurvaturefilter.cpp
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.cpp
rename to src/analysis/raster/qgstotalcurvaturefilter.cpp
diff --git a/src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.h b/src/analysis/raster/qgstotalcurvaturefilter.h
similarity index 100%
rename from src/plugins/raster_terrain_analysis/qgstotalcurvaturefilter.h
rename to src/analysis/raster/qgstotalcurvaturefilter.h
diff --git a/src/plugins/raster_terrain_analysis/CMakeLists.txt b/src/plugins/raster_terrain_analysis/CMakeLists.txt
index 04ee73a23bb7..3053a8e514fa 100644
--- a/src/plugins/raster_terrain_analysis/CMakeLists.txt
+++ b/src/plugins/raster_terrain_analysis/CMakeLists.txt
@@ -3,12 +3,6 @@
 
 SET (RASTER_TERRAIN_SRCS
      qgsrasterterrainanalysisplugin.cpp
-     qgsninecellfilter.cpp
-     qgsruggednessfilter.cpp
-     qgsderivativefilter.cpp
-     qgsslopefilter.cpp
-     qgsaspectfilter.cpp
-     qgstotalcurvaturefilter.cpp
      qgsrasterterrainanalysisdialog.cpp
 )
 
@@ -48,6 +42,7 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(rasterterrainplugin
+  qgis_analysis
   qgis_core
   qgis_gui
 )