BLI_ghash.h was including BLI_blenlib.h, remove from ghash header and include in each file

3 files changed, 12 insertions, 8 deletions

diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h
index e4afc6ad79b..e4ef834822f 100644
--- a/source/blender/blenlib/BLI_ghash.h
+++ b/source/blender/blenlib/BLI_ghash.h
@@ -39,13 +39,6 @@
 extern "C" {
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "BLI_mempool.h"
-#include "BLI_blenlib.h"
-
 typedef unsigned int	(*GHashHashFP)		(const void *key);
 typedef int				(*GHashCmpFP)		(const void *a, const void *b);
 typedef	void			(*GHashKeyFreeFP)	(void *key);
diff --git a/source/blender/blenlib/intern/BLI_args.c b/source/blender/blenlib/intern/BLI_args.c
index 82891b1e121..00903aa42cd 100644
--- a/source/blender/blenlib/intern/BLI_args.c
+++ b/source/blender/blenlib/intern/BLI_args.c
@@ -35,11 +35,13 @@
 
 
 #include <ctype.h> /* for tolower */
+#include <string.h>
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_args.h"
 #include "BLI_ghash.h"
 
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 03e3b7ab560..e34abaf15f9 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -32,11 +32,20 @@
  *  \ingroup bli
  */
 
+#include <string.h>
+#include <stdlib.h>
+
 
 #include "MEM_guardedalloc.h"
 
+
+
+// #include "BLI_blenlib.h"
+
+#include "BLI_mempool.h"
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
+
 #include "BLO_sys_types.h" // for intptr_t support
 /***/