code cleanup: includes

6 files changed, 19 insertions, 19 deletions

diff --git a/source/blender/blenlib/intern/BLI_dynstr.c b/source/blender/blenlib/intern/BLI_dynstr.c
index d1c30504153..4c712a2f237 100644
--- a/source/blender/blenlib/intern/BLI_dynstr.c
+++ b/source/blender/blenlib/intern/BLI_dynstr.c
@@ -30,12 +30,11 @@
  *  \ingroup bli
  */
 
-
-#include <stdarg.h>
+#include <stdlib.h>  /* malloc */
 #include <string.h>
 
 #include "MEM_guardedalloc.h"
-#include "BLI_blenlib.h"
+#include "BLI_string.h"
 #include "BLI_dynstr.h"
 
 #ifdef _WIN32
diff --git a/source/blender/blenlib/intern/DLRB_tree.c b/source/blender/blenlib/intern/DLRB_tree.c
index 688372b3a28..cb47f07574d 100644
--- a/source/blender/blenlib/intern/DLRB_tree.c
+++ b/source/blender/blenlib/intern/DLRB_tree.c
@@ -30,7 +30,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
 #include "BLI_dlrbTree.h"
 
 /* *********************************************** */
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index ad6a9ff2ac3..ae6404153c8 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -30,8 +30,8 @@
  */
 
 
+#include <stdlib.h>  /* malloc */
 #include <string.h>
-#include <stdio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -42,9 +42,9 @@
 #include "zlib.h"
 
 #ifdef WIN32
-#ifdef __MINGW32__
-#include <ctype.h>
-#endif
+#  ifdef __MINGW32__
+#    include <ctype.h>
+#  endif
 #  include <io.h>
 #  include "BLI_winstuff.h"
 #  include "BLI_callbacks.h"
@@ -60,8 +60,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+#include "BLI_path_util.h"
+#include "BLI_fileops.h"
 
 #include "MEM_sys_types.h" // for intptr_t support
 
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index 24a8edae325..10d574e56b4 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -47,10 +47,11 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_vfontdata.h"
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
 #include "BLI_math.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_vfont_types.h"
 #include "DNA_packedFile_types.h"
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index a93bbd97b51..cedec7d07b6 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -25,17 +25,15 @@
  *  \ingroup bli
  */
 
-
-#include <float.h> 
+#include <float.h>
 #include <math.h>
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_graph.h"
-#include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_utildefines.h"
-
 
 
 static void testRadialSymmetry(BGraph *graph, BNode *root_node, RadialArc *ring, int total, float axis[3], float limit, int group);
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c
index a74f82ae965..1d3312fafb1 100644
--- a/source/blender/blenlib/intern/threads.c
+++ b/source/blender/blenlib/intern/threads.c
@@ -29,14 +29,13 @@
  *  \ingroup bli
  */
 
-
+#include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 
 #include "MEM_guardedalloc.h"
 
-
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
 #include "BLI_gsqueue.h"
 #include "BLI_threads.h"