From 1de5037c666af7472b211999b1d149d7cf3a60a6 Mon Sep 17 00:00:00 2001
From: Vaclav Petras <wenzeslaus@gmail.com>
Date: Fri, 27 Sep 2024 16:53:06 -0400
Subject: [PATCH 1/6] raster: Add library function to ask for mask presence

To avoid asking about presence of the MASK raster, add a library function which checks for presence of the raster hiding its name in the library.

This prepares way for #2392.

This also changes the message from using MASK to simply mask. I'm open to suggestion on wording of 'mask is present' versus 'mask is active' etc.
---
 lib/raster/mask_info.c             | 10 ++++++++++
 raster/r.mfilter/main.c            |  9 +++++----
 raster/r.neighbors/main.c          |  4 ++--
 raster/r.patch/main.c              |  4 ++--
 raster/r.resamp.filter/main.c      |  4 ++--
 raster/r.resamp.interp/main.c      |  4 ++--
 raster/r.series/main.c             |  4 ++--
 raster/r.sim/r.sim.sediment/main.c |  2 +-
 raster/r.sim/r.sim.water/main.c    |  4 ++--
 raster/r.slope.aspect/main.c       |  4 ++--
 raster/r.sun/main.c                |  4 ++--
 raster/r.univar/r.univar_main.c    |  4 ++--
 vector/v.surf.rst/main.c           |  4 ++--
 13 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/lib/raster/mask_info.c b/lib/raster/mask_info.c
index 792510879dc..5dd7ec4070d 100644
--- a/lib/raster/mask_info.c
+++ b/lib/raster/mask_info.c
@@ -70,3 +70,13 @@ int Rast__mask_info(char *name, char *mapset)
 
     return 1;
 }
+
+/**
+ * @brief Check presence of 2D raster mask
+ *
+ * @return true if mask is present, false otherwise
+ */
+bool Rast_mask_is_present()
+{
+    return G_find_raster("MASK", G_mapset()) != NULL;
+}
diff --git a/raster/r.mfilter/main.c b/raster/r.mfilter/main.c
index 17ecd2182be..2532b333457 100644
--- a/raster/r.mfilter/main.c
+++ b/raster/r.mfilter/main.c
@@ -132,10 +132,11 @@ int main(int argc, char **argv)
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
-        nprocs = 1;
-    }
+    if (nprocs > 1 && Rast_mask_is_present()) != NULL)
+        {
+            G_warning(_("Parallel processing disabled due to active mask."));
+            nprocs = 1;
+        }
     out_name = opt2->answer;
     filt_name = opt3->answer;
 
diff --git a/raster/r.neighbors/main.c b/raster/r.neighbors/main.c
index 93cbaa9e3da..6bc3110fc05 100644
--- a/raster/r.neighbors/main.c
+++ b/raster/r.neighbors/main.c
@@ -310,8 +310,8 @@ int main(int argc, char *argv[])
                     "threads setting."));
     ncb.threads = 1;
 #endif
-    if (ncb.threads > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (ncb.threads > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         ncb.threads = 1;
     }
     if (strcmp(parm.weighting_function->answer, "none") && flag.circle->answer)
diff --git a/raster/r.patch/main.c b/raster/r.patch/main.c
index 3835e287440..751f28ec897 100644
--- a/raster/r.patch/main.c
+++ b/raster/r.patch/main.c
@@ -113,8 +113,8 @@ int main(int argc, char *argv[])
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
 
diff --git a/raster/r.resamp.filter/main.c b/raster/r.resamp.filter/main.c
index b1f6ed3e530..f838635fa47 100644
--- a/raster/r.resamp.filter/main.c
+++ b/raster/r.resamp.filter/main.c
@@ -494,8 +494,8 @@ int main(int argc, char *argv[])
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active make."));
         nprocs = 1;
     }
     if (parm.radius->answer) {
diff --git a/raster/r.resamp.interp/main.c b/raster/r.resamp.interp/main.c
index 734f3306bf8..dc0cc6479c1 100644
--- a/raster/r.resamp.interp/main.c
+++ b/raster/r.resamp.interp/main.c
@@ -132,8 +132,8 @@ int main(int argc, char *argv[])
                     "threads setting."));
     threads = 1;
 #endif
-    if (threads > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (threads > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         threads = 1;
     }
     bufrows = atoi(memory->answer) * (((1 << 20) / sizeof(DCELL)) / dst_w.cols);
diff --git a/raster/r.series/main.c b/raster/r.series/main.c
index bfecbf117c0..021bfd81fa0 100644
--- a/raster/r.series/main.c
+++ b/raster/r.series/main.c
@@ -227,8 +227,8 @@ int main(int argc, char *argv[])
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
     lo = -INFINITY;
diff --git a/raster/r.sim/r.sim.sediment/main.c b/raster/r.sim/r.sim.sediment/main.c
index fcdd9e98f89..664aff8406d 100644
--- a/raster/r.sim/r.sim.sediment/main.c
+++ b/raster/r.sim/r.sim.sediment/main.c
@@ -380,7 +380,7 @@ int main(int argc, char *argv[])
 #else
     threads = 1;
 #endif
-    if (threads > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
+    if (threads > 1 && Rast_mask_is_present()) != NULL) {
         G_warning(_("Parallel processing disabled due to active MASK."));
         threads = 1;
     }
diff --git a/raster/r.sim/r.sim.water/main.c b/raster/r.sim/r.sim.water/main.c
index 3998e5524ac..13fc605a219 100644
--- a/raster/r.sim/r.sim.water/main.c
+++ b/raster/r.sim/r.sim.water/main.c
@@ -407,8 +407,8 @@ int main(int argc, char *argv[])
 #else
     threads = 1;
 #endif
-    if (threads > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (threads > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         threads = 1;
     }
     G_message(_("Number of threads: %d"), threads);
diff --git a/raster/r.slope.aspect/main.c b/raster/r.slope.aspect/main.c
index 86b4d5f5607..02ed406cff4 100644
--- a/raster/r.slope.aspect/main.c
+++ b/raster/r.slope.aspect/main.c
@@ -305,8 +305,8 @@ int main(int argc, char *argv[])
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
     radians_to_degrees = 180.0 / M_PI;
diff --git a/raster/r.sun/main.c b/raster/r.sun/main.c
index 9e45e184dac..29aede508e9 100644
--- a/raster/r.sun/main.c
+++ b/raster/r.sun/main.c
@@ -591,8 +591,8 @@ int main(int argc, char *argv[])
 #else
     threads = 1;
 #endif
-    if (threads > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (threads > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         threads = 1;
     }
     G_message(_("Number of threads <%d>"), threads);
diff --git a/raster/r.univar/r.univar_main.c b/raster/r.univar/r.univar_main.c
index 805acfff27b..fd24e104e12 100644
--- a/raster/r.univar/r.univar_main.c
+++ b/raster/r.univar/r.univar_main.c
@@ -192,8 +192,8 @@ int main(int argc, char *argv[])
     sscanf(param.nprocs->answer, "%d", &nprocs);
     if (nprocs < 1)
         G_fatal_error(_("<%d> is not valid number of nprocs."), nprocs);
-    if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
 #if defined(_OPENMP)
diff --git a/vector/v.surf.rst/main.c b/vector/v.surf.rst/main.c
index c4581737eed..6d801c3e9eb 100644
--- a/vector/v.surf.rst/main.c
+++ b/vector/v.surf.rst/main.c
@@ -419,8 +419,8 @@ int main(int argc, char *argv[])
         G_warning(_("GRASS GIS is not compiled with OpenMP support, parallel "
                     "computation is disabled."));
 #endif
-    if (threads > 1 && G_find_raster("MASK", G_mapset()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+    if (threads > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
         threads = 1;
     }
     if (devi) {

From 77ca505cff1066eea50371cfdce8eefe0c7d92e1 Mon Sep 17 00:00:00 2001
From: Vaclav Petras <wenzeslaus@gmail.com>
Date: Fri, 27 Sep 2024 16:57:19 -0400
Subject: [PATCH 2/6] Add missing MASK->mask

---
 raster/r.sim/r.sim.sediment/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raster/r.sim/r.sim.sediment/main.c b/raster/r.sim/r.sim.sediment/main.c
index 664aff8406d..0dc6f044078 100644
--- a/raster/r.sim/r.sim.sediment/main.c
+++ b/raster/r.sim/r.sim.sediment/main.c
@@ -381,7 +381,7 @@ int main(int argc, char *argv[])
     threads = 1;
 #endif
     if (threads > 1 && Rast_mask_is_present()) != NULL) {
-        G_warning(_("Parallel processing disabled due to active MASK."));
+        G_warning(_("Parallel processing disabled due to active mask."));
         threads = 1;
     }
     G_message(_("Number of threads: %d"), threads);

From b0f6812075beb88d890cf172ab3f2daf4eff2826 Mon Sep 17 00:00:00 2001
From: Vaclav Petras <wenzeslaus@gmail.com>
Date: Fri, 27 Sep 2024 23:45:26 -0400
Subject: [PATCH 3/6] Add missing fun def and add explicit void

---
 include/grass/defs/raster.h | 1 +
 lib/raster/mask_info.c      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/grass/defs/raster.h b/include/grass/defs/raster.h
index 7244da2a354..c2d26ccdccc 100644
--- a/include/grass/defs/raster.h
+++ b/include/grass/defs/raster.h
@@ -393,6 +393,7 @@ int Rast_option_to_interp_type(const struct Option *);
 /* mask_info.c */
 char *Rast_mask_info(void);
 int Rast__mask_info(char *, char *);
+bool Rast_mask_is_present(void);
 
 /* maskfd.c */
 int Rast_maskfd(void);
diff --git a/lib/raster/mask_info.c b/lib/raster/mask_info.c
index 5dd7ec4070d..1a11da972f8 100644
--- a/lib/raster/mask_info.c
+++ b/lib/raster/mask_info.c
@@ -76,7 +76,7 @@ int Rast__mask_info(char *name, char *mapset)
  *
  * @return true if mask is present, false otherwise
  */
-bool Rast_mask_is_present()
+bool Rast_mask_is_present(void)
 {
     return G_find_raster("MASK", G_mapset()) != NULL;
 }

From 0fed40bd90d26cf9e4da15b35848bccd69d71975 Mon Sep 17 00:00:00 2001
From: Vaclav Petras <wenzeslaus@gmail.com>
Date: Fri, 27 Sep 2024 23:48:21 -0400
Subject: [PATCH 4/6] Fix indent

---
 raster/r.mfilter/main.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/raster/r.mfilter/main.c b/raster/r.mfilter/main.c
index 2532b333457..5969e82ad0f 100644
--- a/raster/r.mfilter/main.c
+++ b/raster/r.mfilter/main.c
@@ -132,11 +132,10 @@ int main(int argc, char **argv)
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && Rast_mask_is_present()) != NULL)
-        {
-            G_warning(_("Parallel processing disabled due to active mask."));
-            nprocs = 1;
-        }
+    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+        G_warning(_("Parallel processing disabled due to active mask."));
+        nprocs = 1;
+    }
     out_name = opt2->answer;
     filt_name = opt3->answer;
 

From 9c36b115f02526295de4803c0db538d22fe2104d Mon Sep 17 00:00:00 2001
From: Vaclav Petras <wenzeslaus@gmail.com>
Date: Sat, 28 Sep 2024 00:11:57 -0400
Subject: [PATCH 5/6] Fix bad copy-pasting in the condtion

---
 raster/r.mfilter/main.c            | 2 +-
 raster/r.neighbors/main.c          | 2 +-
 raster/r.patch/main.c              | 2 +-
 raster/r.resamp.filter/main.c      | 2 +-
 raster/r.resamp.interp/main.c      | 2 +-
 raster/r.series/main.c             | 2 +-
 raster/r.sim/r.sim.sediment/main.c | 2 +-
 raster/r.sim/r.sim.water/main.c    | 2 +-
 raster/r.slope.aspect/main.c       | 2 +-
 raster/r.sun/main.c                | 2 +-
 raster/r.univar/r.univar_main.c    | 2 +-
 vector/v.surf.rst/main.c           | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/raster/r.mfilter/main.c b/raster/r.mfilter/main.c
index 5969e82ad0f..ad0a9dd35ae 100644
--- a/raster/r.mfilter/main.c
+++ b/raster/r.mfilter/main.c
@@ -132,7 +132,7 @@ int main(int argc, char **argv)
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+    if (nprocs > 1 && Rast_mask_is_present()) {
         G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
diff --git a/raster/r.neighbors/main.c b/raster/r.neighbors/main.c
index 6bc3110fc05..8885460a564 100644
--- a/raster/r.neighbors/main.c
+++ b/raster/r.neighbors/main.c
@@ -310,7 +310,7 @@ int main(int argc, char *argv[])
                     "threads setting."));
     ncb.threads = 1;
 #endif
-    if (ncb.threads > 1 && Rast_mask_is_present()) != NULL) {
+    if (ncb.threads > 1 && Rast_mask_is_present()) {
         G_warning(_("Parallel processing disabled due to active mask."));
         ncb.threads = 1;
     }
diff --git a/raster/r.patch/main.c b/raster/r.patch/main.c
index 751f28ec897..c54482db13a 100644
--- a/raster/r.patch/main.c
+++ b/raster/r.patch/main.c
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+    if (nprocs > 1 && Rast_mask_is_present()) {
         G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
diff --git a/raster/r.resamp.filter/main.c b/raster/r.resamp.filter/main.c
index f838635fa47..e74f3598629 100644
--- a/raster/r.resamp.filter/main.c
+++ b/raster/r.resamp.filter/main.c
@@ -494,7 +494,7 @@ int main(int argc, char *argv[])
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+    if (nprocs > 1 && Rast_mask_is_present()) {
         G_warning(_("Parallel processing disabled due to active make."));
         nprocs = 1;
     }
diff --git a/raster/r.resamp.interp/main.c b/raster/r.resamp.interp/main.c
index dc0cc6479c1..2319400b0fc 100644
--- a/raster/r.resamp.interp/main.c
+++ b/raster/r.resamp.interp/main.c
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
                     "threads setting."));
     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.series/main.c b/raster/r.series/main.c
index 021bfd81fa0..ade93d8f185 100644
--- a/raster/r.series/main.c
+++ b/raster/r.series/main.c
@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+    if (nprocs > 1 && Rast_mask_is_present()) {
         G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
diff --git a/raster/r.sim/r.sim.sediment/main.c b/raster/r.sim/r.sim.sediment/main.c
index 0dc6f044078..894f238af14 100644
--- a/raster/r.sim/r.sim.sediment/main.c
+++ b/raster/r.sim/r.sim.sediment/main.c
@@ -380,7 +380,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() != NULL) {
         G_warning(_("Parallel processing disabled due to active mask."));
         threads = 1;
     }
diff --git a/raster/r.sim/r.sim.water/main.c b/raster/r.sim/r.sim.water/main.c
index 13fc605a219..4678aa6ad64 100644
--- a/raster/r.sim/r.sim.water/main.c
+++ b/raster/r.sim/r.sim.water/main.c
@@ -407,7 +407,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.slope.aspect/main.c b/raster/r.slope.aspect/main.c
index 02ed406cff4..d302e02b22c 100644
--- a/raster/r.slope.aspect/main.c
+++ b/raster/r.slope.aspect/main.c
@@ -305,7 +305,7 @@ int main(int argc, char *argv[])
                     "threads setting."));
     nprocs = 1;
 #endif
-    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+    if (nprocs > 1 && Rast_mask_is_present()) {
         G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
diff --git a/raster/r.sun/main.c b/raster/r.sun/main.c
index 29aede508e9..e325cb637f0 100644
--- a/raster/r.sun/main.c
+++ b/raster/r.sun/main.c
@@ -591,7 +591,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.univar/r.univar_main.c b/raster/r.univar/r.univar_main.c
index fd24e104e12..e56301a1364 100644
--- a/raster/r.univar/r.univar_main.c
+++ b/raster/r.univar/r.univar_main.c
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
     sscanf(param.nprocs->answer, "%d", &nprocs);
     if (nprocs < 1)
         G_fatal_error(_("<%d> is not valid number of nprocs."), nprocs);
-    if (nprocs > 1 && Rast_mask_is_present()) != NULL) {
+    if (nprocs > 1 && Rast_mask_is_present()) {
         G_warning(_("Parallel processing disabled due to active mask."));
         nprocs = 1;
     }
diff --git a/vector/v.surf.rst/main.c b/vector/v.surf.rst/main.c
index 6d801c3e9eb..9495401ba50 100644
--- a/vector/v.surf.rst/main.c
+++ b/vector/v.surf.rst/main.c
@@ -419,7 +419,7 @@ int main(int argc, char *argv[])
         G_warning(_("GRASS GIS is not compiled with OpenMP support, parallel "
                     "computation is disabled."));
 #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;
     }

From dce984fab92c0b5f35970562b75008ae15ec6aac Mon Sep 17 00:00:00 2001
From: Vaclav Petras <wenzeslaus@gmail.com>
Date: Sat, 28 Sep 2024 00:28:19 -0400
Subject: [PATCH 6/6] Add missing includes and libs

---
 raster/r.sim/r.sim.sediment/Makefile | 4 ++--
 raster/r.sim/r.sim.sediment/main.c   | 3 ++-
 raster/r.sim/r.sim.water/Makefile    | 4 ++--
 raster/r.sim/r.sim.water/main.c      | 1 +
 vector/v.surf.rst/Makefile           | 4 ++--
 vector/v.surf.rst/main.c             | 1 +
 6 files changed, 10 insertions(+), 7 deletions(-)

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>