[PATCH v9 07/23] perf evsel/evlist: Avoid unnecessary #includes

[Namhyung Kim]

On Fri, May 22, 2026 at 03:04:18PM -0700, Ian Rogers wrote:
> Use forward declarations and remove unnecessary #includes in
> evsel.h. Sort the forward declarations in evsel.h and evlist.h.
> 
> Signed-off-by: Ian Rogers <irogers at google.com>

Acked-by: Namhyung Kim <namhyung at kernel.org>

Thanks,
Namhyung

> ---
>  tools/perf/util/evlist.h | 15 +++++++++------
>  tools/perf/util/evsel.h  | 20 +++++++++++---------
>  2 files changed, 20 insertions(+), 15 deletions(-)
> 
> diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
> index e507f5f20ef6..e54761c670b6 100644
> --- a/tools/perf/util/evlist.h
> +++ b/tools/perf/util/evlist.h
> @@ -2,29 +2,32 @@
>  #ifndef __PERF_EVLIST_H
>  #define __PERF_EVLIST_H 1
>  
> +#include <signal.h>
> +
>  #include <linux/compiler.h>
>  #include <linux/kernel.h>
> -#include <linux/refcount.h>
>  #include <linux/list.h>
> +#include <linux/refcount.h>
> +#include <pthread.h>
> +#include <unistd.h>
> +
>  #include <api/fd/array.h>
>  #include <internal/evlist.h>
>  #include <internal/evsel.h>
>  #include <perf/evlist.h>
> +
>  #include "affinity.h"
>  #include "events_stats.h"
>  #include "evsel.h"
>  #include "rblist.h"
> -#include <pthread.h>
> -#include <signal.h>
> -#include <unistd.h>
>  
> -struct pollfd;
> -struct thread_map;
>  struct perf_cpu_map;
>  struct perf_stat_config;
> +struct pollfd;
>  struct record_opts;
>  struct strbuf;
>  struct target;
> +struct thread_map;
>  
>  /*
>   * State machine of bkw_mmap_state:
> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
> index 927e5b4756cc..2221694bb819 100644
> --- a/tools/perf/util/evsel.h
> +++ b/tools/perf/util/evsel.h
> @@ -2,28 +2,30 @@
>  #ifndef __PERF_EVSEL_H
>  #define __PERF_EVSEL_H 1
>  
> -#include <linux/list.h>
>  #include <stdbool.h>
> -#include <sys/types.h>
> +
> +#include <linux/list.h>
>  #include <linux/perf_event.h>
>  #include <linux/types.h>
> +#include <sys/types.h>
> +
>  #include <internal/evsel.h>
>  #include <perf/evsel.h>
> +
>  #include "symbol_conf.h"
> -#include "pmus.h"
> -#include "pmu.h"
>  
> +struct bperf_follower_bpf;
> +struct bperf_leader_bpf;
> +struct bpf_counter_ops;
>  struct bpf_object;
>  struct cgroup;
> +struct hashmap;
>  struct perf_counts;
> +struct perf_pmu;
>  struct perf_stat_config;
>  struct perf_stat_evsel;
> -union perf_event;
> -struct bpf_counter_ops;
>  struct target;
> -struct hashmap;
> -struct bperf_leader_bpf;
> -struct bperf_follower_bpf;
> +union perf_event;
>  
>  typedef int (evsel__sb_cb_t)(union perf_event *event, void *data);
>  
> -- 
> 2.54.0.794.g4f17f83d09-goog
>