Cleanup: remove BLI_blenlib from ghash header

This causes source files to depend on ghash header
for BLI_string/rect/listbase.

Also quiet warnings.

4 files changed, 9 insertions, 3 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
index 3d099416d1e..8f67c64f1b3 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
@@ -39,6 +39,8 @@
 
 extern "C" {
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 
 #include "BKE_layer.h"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index 7083e6134dd..80d3df2811c 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -36,6 +36,7 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
+#include "BLI_listbase.h"
 
 #ifdef DEBUG_TIME
 #  include "PIL_time.h"
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc
index 940cadba872..ee75b9b348b 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -33,12 +33,14 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_math.h"
 #include "BKE_anim.h"
 #include "BKE_idcode.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
+#include "BLI_listbase.h"
 } /* extern "C" */
 
 #include "DNA_object_types.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index c9cce520147..1d3c2d596ee 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -43,6 +43,7 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_threads.h"
+#include "BLI_string.h"
 
 #include "BKE_global.h"
 #include "BKE_layer.h"
@@ -510,9 +511,9 @@ void update_copy_on_write_scene(const Depsgraph *depsgraph,
 		scene_cow->obedit = NULL;
 	}
 	/* Synchronize active render engine. */
-	BLI_strncpy_utf8(scene_cow->view_render.engine_id,
-	                 scene_orig->view_render.engine_id,
-	                 sizeof(scene_cow->view_render.engine_id));
+	BLI_strncpy(scene_cow->view_render.engine_id,
+	            scene_orig->view_render.engine_id,
+	            sizeof(scene_cow->view_render.engine_id));
 	/* TODO(sergey): What else do we need here? */
 }