iwyu: fix header includes

digraphs · Apr 3, 2024 · 6568a09 · 6568a09
1 parent da22e54
commit 6568a09
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 29 deletions.
diff --git a/src/bitarray.c b/src/bitarray.c
@@ -10,9 +10,6 @@
 
 #include "bitarray.h"
 
-// C headers
-#include <stdlib.h>  // for free, safe_calloc, malloc
-
 // GAP headers
 #include "gap-includes.h"  // for Obj, ELM_LIST, ISB_LIST, Fail
 

diff --git a/src/bitarray.h b/src/bitarray.h
@@ -16,6 +16,7 @@
 #include <stdbool.h>  // for bool
 #include <stddef.h>   // for size_t
 #include <stdint.h>   // for uint16_t
+#include <string.h>   // for memset
 
 // GAP headers
 #include "gap-includes.h"  // for COUNT_TRUES_BLOCKS, Obj, . . .

diff --git a/src/cliques.c b/src/cliques.c
@@ -10,9 +10,7 @@
 
 // C headers
 #include <stdbool.h>  // for true, false, bool
-#include <stddef.h>   // for NULL
 #include <stdint.h>   // for uint16_t, uint64_t
-#include <stdlib.h>   // for malloc, NULL
 
 // GAP headers
 #include "gap-includes.h"

diff --git a/src/digraphs.c b/src/digraphs.c
@@ -13,18 +13,19 @@
 *******************************************************************************/
 
 #include "digraphs.h"
-#include "digraphs-config.h"
 
 #include <stdbool.h>  // for false, true, bool
 #include <stdint.h>   // for uint64_t
 #include <stdlib.h>   // for NULL, free
-
-#include "bliss-includes.h"  // for bliss stuff
-#include "cliques.h"
-#include "digraphs-debug.h"  // for DIGRAPHS_ASSERT
-#include "homos.h"           // for FuncHomomorphismDigraphsFinder
-#include "planar.h"          // for FUNC_IS_PLANAR, . . .
-#include "safemalloc.h"
+#include <string.h>   // for memcpy
+
+#include "bliss-includes.h"   // for bliss stuff
+#include "cliques.h"          // for FuncDigraphsCliquesFinder
+#include "digraphs-config.h"  // for DIGRAPHS_WITH_INCLUDED_BLISS
+#include "digraphs-debug.h"   // for DIGRAPHS_ASSERT
+#include "homos.h"            // for FuncHomomorphismDigraphsFinder
+#include "planar.h"           // for FUNC_IS_PLANAR, . . .
+#include "safemalloc.h"       // for safe_malloc
 
 #undef PACKAGE
 #undef PACKAGE_BUGREPORT

diff --git a/src/homos-graphs.c b/src/homos-graphs.c
@@ -17,11 +17,10 @@
 #include "gap-includes.h"  // for Obj, Int
 
 // Digraphs headers
-#include "bliss-includes.h"   // for bliss stuff
 #include "digraphs-config.h"  // for DIGRAPHS_WITH_INCLUDED_BLISS
 #include "digraphs-debug.h"   // for DIGRAPHS_ASSERT
+#include "safemalloc.h"       // for safe_malloc
 #include "schreier-sims.h"    // for PERM_DEGREE
-#include "safemalloc.h"
 
 extern Obj GeneratorsOfGroup;
 

diff --git a/src/homos-graphs.h b/src/homos-graphs.h
@@ -16,10 +16,11 @@
 #include <stdint.h>   // for uint16_t
 
 // Digraphs headers
-#include "bitarray.h"        // for BitArray
-#include "bliss-includes.h"  // for bliss stuff
-#include "digraphs-debug.h"  // for DIGRAPHS_ASSERT
-#include "perms.h"           // for PermColl
+#include "bitarray.h"         // for BitArray
+#include "bliss-includes.h"   // for bliss stuff
+#include "digraphs-config.h"  // for DIGRAPHS_WITH_INCLUDED_BLISS
+#include "digraphs-debug.h"   // for DIGRAPHS_ASSERT
+#include "perms.h"            // for PermColl
 
 ////////////////////////////////////////////////////////////////////////
 // Directed graphs (digraphs)

diff --git a/src/homos.c b/src/homos.c
@@ -33,7 +33,9 @@
 #include <stddef.h>   // for NULL
 #include <stdint.h>   // for uint16_t, uint64_t
 #include <stdlib.h>   // for malloc, NULL
-#include <time.h>     // for time
+#ifdef DIGRAPHS_ENABLE_STATS
+#include <time.h>  // for time
+#endif
 
 // GAP headers
 #include "gap-includes.h"
@@ -46,8 +48,8 @@
 #include "digraphs-debug.h"   // for DIGRAPHS_ASSERT
 #include "homos-graphs.h"     // for Digraph, Graph, . . .
 #include "perms.h"            // for MAXVERTS, UNDEFINED, PermColl, Perm
-#include "schreier-sims.h"    // for PermColl, . . .
 #include "safemalloc.h"
+#include "schreier-sims.h"  // for PermColl, . . .
 
 ////////////////////////////////////////////////////////////////////////////////
 // 1. Macros

diff --git a/src/perms.c b/src/perms.c
@@ -14,12 +14,10 @@
 
 #include "perms.h"
 
-// C headers
-#include <stdlib.h>  // for malloc, . . .
-
 // Digraphs package headers
 #include "digraphs-debug.h"  // for DIGRAPHS_ASSERT
-#include "safemalloc.h"
+#include "gap-includes.h"    // for ErrorQuit, ADDR_PERM2, ..
+#include "safemalloc.h"      // for safe_malloc
 
 Perm new_perm(uint16_t const degree) {
   DIGRAPHS_ASSERT(degree <= MAXVERTS);

diff --git a/src/planar.c b/src/planar.c
@@ -16,8 +16,10 @@
 #include <stdbool.h>  // for true and false
 
 // Digraphs package headers
-#include "digraphs-debug.h"  // for DIGRAPHS_ASSERT
-#include "digraphs.h"        // for DigraphNrVertices, DigraphNrEdges, . . .
+#include "digraphs-config.h"  // for DIGRAPHS_WITH_INCLUDED_PLANARITY
+#include "digraphs-debug.h"   // for DIGRAPHS_ASSERT
+#include "digraphs.h"         // for DigraphNrVertices, DigraphNrEdges, . . .
+#include "gap-includes.h"     // for Fail, False, True
 
 // edge-addition-planarity-suite headers
 #if defined(__clang__)

diff --git a/src/schreier-sims.c b/src/schreier-sims.c
@@ -15,12 +15,12 @@
 #include "schreier-sims.h"
 
 // C headers
-#include "stdlib.h"  // for NULL
+#include "stddef.h"  // for size_t
 #include "string.h"  // for memset
 
 // Digraphs package headers
 #include "digraphs-debug.h"  // for DIGRAPHS_ASSERT
-#include "safemalloc.h"
+#include "safemalloc.h"      // for safe_malloc
 
 uint16_t PERM_DEGREE = 0;