diff --git a/raster/r.sim/r.sim.sediment/Makefile b/raster/r.sim/r.sim.sediment/Makefile
index 4bc07478ec9..13ca19d09dc 100644
--- a/raster/r.sim/r.sim.sediment/Makefile
+++ b/raster/r.sim/r.sim.sediment/Makefile
@@ -4,8 +4,8 @@ PGM=r.sim.sediment
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIBES     = $(SIMLIB) $(GMATHLIB) $(GISLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB)
-DEPENDENCIES = $(SIMDEP) $(GMATHDEP) $(GISDEP)
+LIBES     = $(SIMLIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB)
+DEPENDENCIES = $(SIMDEP) $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(OPENMP_INCPATH) $(VECT_INC)
 EXTRA_CFLAGS = -I ../simlib $(VECT_CFLAGS) $(OPENMP_CFLAGS)
 
diff --git a/raster/r.sim/r.sim.sediment/main.c b/raster/r.sim/r.sim.sediment/main.c
index 894f238af14..dd082fe0f81 100644
--- a/raster/r.sim/r.sim.sediment/main.c
+++ b/raster/r.sim/r.sim.sediment/main.c
@@ -70,6 +70,7 @@
 #endif
 #include <grass/gis.h>
 #include <grass/vector.h>
+#include <grass/raster.h>
 #include <grass/linkm.h>
 #include <grass/bitmap.h>
 #include <grass/glocale.h>
@@ -380,7 +381,7 @@ int main(int argc, char *argv[])
 #else
     threads = 1;
 #endif
-    if (threads > 1 && Rast_mask_is_present() != NULL) {
+    if (threads > 1 && Rast_mask_is_present()) {
         G_warning(_("Parallel processing disabled due to active mask."));
         threads = 1;
     }
diff --git a/raster/r.sim/r.sim.water/Makefile b/raster/r.sim/r.sim.water/Makefile
index 36121ebf82e..47037823fae 100644
--- a/raster/r.sim/r.sim.water/Makefile
+++ b/raster/r.sim/r.sim.water/Makefile
@@ -4,8 +4,8 @@ PGM=r.sim.water
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIBES     = $(SIMLIB) $(GMATHLIB) $(GISLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB)
-DEPENDENCIES = $(SIMDEP) $(GMATHDEP) $(GISDEP)
+LIBES     = $(SIMLIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB)
+DEPENDENCIES = $(SIMDEP) $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC) $(OPENMP_INCPATH)
 EXTRA_CFLAGS = -I ../simlib $(VECT_CFLAGS) $(OPENMP_CFLAGS)
 
diff --git a/raster/r.sim/r.sim.water/main.c b/raster/r.sim/r.sim.water/main.c
index 4678aa6ad64..61f128f5504 100644
--- a/raster/r.sim/r.sim.water/main.c
+++ b/raster/r.sim/r.sim.water/main.c
@@ -77,6 +77,7 @@
 #endif
 #include <grass/gis.h>
 #include <grass/vector.h>
+#include <grass/raster.h>
 #include <grass/linkm.h>
 #include <grass/bitmap.h>
 #include <grass/glocale.h>
diff --git a/vector/v.surf.rst/Makefile b/vector/v.surf.rst/Makefile
index 3b5d8eca836..414ebbd85a0 100644
--- a/vector/v.surf.rst/Makefile
+++ b/vector/v.surf.rst/Makefile
@@ -4,9 +4,9 @@ PGM=v.surf.rst
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIBES = $(INTERPFLLIB) $(QTREELIB) $(INTERPDATALIB) $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
+LIBES = $(INTERPFLLIB) $(QTREELIB) $(INTERPDATALIB) $(GMATHLIB) $(RASTERLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
 EXTRA_LIBS = $(OPENMP_LIBPATH) $(OPENMP_LIB)
-DEPENDENCIES = $(INTERPFLDEP) $(QTREEDEP) $(INTERPDATADEP) $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
+DEPENDENCIES = $(INTERPFLDEP) $(QTREEDEP) $(INTERPDATADEP) $(GMATHDEP) $(RASTERDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(OPENMP_INCPATH)
 EXTRA_CFLAGS = $(VECT_CFLAGS) $(OPENMP_CFLAGS)
 
diff --git a/vector/v.surf.rst/main.c b/vector/v.surf.rst/main.c
index 9495401ba50..7b42e269d0f 100644
--- a/vector/v.surf.rst/main.c
+++ b/vector/v.surf.rst/main.c
@@ -33,6 +33,7 @@
 
 #include <grass/gis.h>
 #include <grass/vector.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>
 #include <grass/linkm.h>