Cleanup include directives

radioactiveman · radioactiveman · commit 65ac688de163 · 2025-12-07T22:39:10.000+01:00
Suggested by clang-tidy.
diff --git a/src/audacious/main.cc b/src/audacious/main.cc
@@ -43,7 +43,9 @@
 #endif
 
 #include "main.h"
+#ifdef _WIN32
 #include "util.h"
+#endif
 
 static struct
 {
diff --git a/src/audtool/wrappers.h b/src/audtool/wrappers.h
@@ -20,6 +20,9 @@
 #ifndef AUDTOOL_WRAPPERS_H
 #define AUDTOOL_WRAPPERS_H
 
+/* auto-generated by gdbus-codegen */
+#include "../dbus/aud-dbus.h"
+
 typedef gboolean (* OnOffFunc) (ObjAudacious * proxy, gboolean show,
  GCancellable * cancellable, GError * * error);
 
diff --git a/src/libaudcore/art.cc b/src/libaudcore/art.cc
@@ -21,7 +21,6 @@
 #include "probe.h"
 
 #include <assert.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/src/libaudcore/audio.cc b/src/libaudcore/audio.cc
@@ -23,7 +23,7 @@
 
 #define WANT_AUD_BSWAP
 #include "audio.h"
-#include "objects.h"
+#include "templates.h"
 
 #define SW_VOLUME_RANGE 40 /* decibels */
 
diff --git a/src/libaudcore/equalizer.cc b/src/libaudcore/equalizer.cc
@@ -18,11 +18,6 @@
  * the use of this software.
  */
 
-/*
- * Anders Johansson prefers float *ptr; formatting. Please keep it that way.
- *    - tallica
- */
-
 #include "equalizer.h"
 #include "internal.h"
 
diff --git a/src/libaudcore/output.cc b/src/libaudcore/output.cc
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "equalizer.h"
 #include "hook.h"
 #include "i18n.h"
 #include "interface.h"
diff --git a/src/libaudcore/playback.cc b/src/libaudcore/playback.cc
@@ -48,7 +48,6 @@
 #include "playlist-internal.h"
 #include "plugin.h"
 #include "plugins-internal.h"
-#include "plugins.h"
 #include "runtime.h"
 #include "threads.h"
 
diff --git a/src/libaudcore/plugin-init.cc b/src/libaudcore/plugin-init.cc
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 
 #include "hook.h"
-#include "interface.h"
 #include "internal.h"
 #include "output.h"
 #include "plugin.h"
diff --git a/src/libaudcore/plugin-registry.cc b/src/libaudcore/plugin-registry.cc
@@ -26,7 +26,6 @@
 
 #include "audstrings.h"
 #include "i18n.h"
-#include "interface.h"
 #include "parse.h"
 #include "plugin.h"
 #include "runtime.h"
diff --git a/src/libaudcore/scanner.cc b/src/libaudcore/scanner.cc
@@ -21,9 +21,7 @@
 
 #include <glib.h> /* for GThreadPool */
 
-#include "audstrings.h"
 #include "cue-cache.h"
-#include "i18n.h"
 #include "internal.h"
 #include "plugins.h"
 #include "probe.h"
diff --git a/src/libaudcore/stringbuf.cc b/src/libaudcore/stringbuf.cc
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <mutex>
 #include <new>
 
 #include "objects.h"
-#include "threads.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/libaudcore/util.cc b/src/libaudcore/util.cc
@@ -22,6 +22,7 @@
 
 #include <errno.h>
 #include <math.h>
+#include <mutex>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
@@ -30,7 +31,6 @@
 
 #include "audstrings.h"
 #include "runtime.h"
-#include "threads.h"
 
 const char * get_home_utf8()
 {
diff --git a/src/libaudtag/tag_module.cc b/src/libaudtag/tag_module.cc
@@ -23,7 +23,6 @@
 #include <libaudcore/vfs.h>
 
 #include "audtag.h"
-#include "util.h"
 #include "tag_module.h"
 #include "builtin.h"
 
diff --git a/src/libguess/dfa.c b/src/libguess/dfa.c
@@ -1,6 +1,7 @@
-#include "libguess.h"
 #include "dfa.h"
 
+#include <stddef.h>
+
 boolean
 dfa_alone(guess_dfa *dfa, guess_dfa *order[])
 {
diff --git a/src/libguess/guess_impl.c b/src/libguess/guess_impl.c
@@ -40,7 +40,7 @@
 #include "libguess.h"
 #include "dfa.h"
 
-#include <stdio.h>
+#include <stddef.h>
 
 /* take precedence if scores are same. you can customize the order as: */
 /* ORDER_** &highest, &second, ... &lowest */
diff --git a/src/libguess/libguess.h b/src/libguess/libguess.h
@@ -38,9 +38,6 @@
 #ifndef _LIBGUESS_H
 #define _LIBGUESS_H	1
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@`
`43`	`43`	`#endif`
`44`	`44`
`45`	`45`	`#include "main.h"`
	`46`	`+#ifdef _WIN32`
`46`	`47`	`#include "util.h"`
	`48`	`+#endif`
`47`	`49`
`48`	`50`	`static struct`
`49`	`51`	`{`