1 files changed, 11 insertions, 9 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index e0aa14faf2b5..4e4d2e76232e 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -24,15 +24,17 @@
 #include "util/event.h"
 #include <subcmd/parse-options.h>
 #include "util/parse-events.h"
-#include "util/thread.h"
 #include "util/sort.h"
 #include "util/hist.h"
+#include "util/dso.h"
 #include "util/map.h"
 #include "util/session.h"
 #include "util/tool.h"
 #include "util/data.h"
 #include "arch/common.h"
 #include "util/block-range.h"
+#include "util/map_symbol.h"
+#include "util/branch.h"
 
 #include <dlfcn.h>
 #include <errno.h>
@@ -156,7 +158,7 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,
         struct hist_entry *he = iter->he;
         struct branch_info *bi;
         struct perf_sample *sample = iter->sample;
-        struct perf_evsel *evsel = iter->evsel;
+        struct evsel *evsel = iter->evsel;
         int err;
 
         bi = he->branch_info;
@@ -171,7 +173,7 @@ out:
         return err;
 }
 
-static int process_branch_callback(struct perf_evsel *evsel,
+static int process_branch_callback(struct evsel *evsel,
                                    struct perf_sample *sample,
                                    struct addr_location *al __maybe_unused,
                                    struct perf_annotate *ann,
@@ -208,7 +210,7 @@ static bool has_annotation(struct perf_annotate *ann)
         return ui__has_annotation() || ann->use_stdio2;
 }
 
-static int perf_evsel__add_sample(struct perf_evsel *evsel,
+static int perf_evsel__add_sample(struct evsel *evsel,
                                   struct perf_sample *sample,
                                   struct addr_location *al,
                                   struct perf_annotate *ann,
@@ -257,7 +259,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
 static int process_sample_event(struct perf_tool *tool,
                                 union perf_event *event,
                                 struct perf_sample *sample,
-                                struct perf_evsel *evsel,
+                                struct evsel *evsel,
                                 struct machine *machine)
 {
         struct perf_annotate *ann = container_of(tool, struct perf_annotate, tool);
@@ -293,7 +295,7 @@ static int process_feature_event(struct perf_session *session,
 }
 
 static int hist_entry__tty_annotate(struct hist_entry *he,
-                                    struct perf_evsel *evsel,
+                                    struct evsel *evsel,
                                     struct perf_annotate *ann)
 {
         if (!ann->use_stdio2)
@@ -303,7 +305,7 @@ static int hist_entry__tty_annotate(struct hist_entry *he,
 }
 
 static void hists__find_annotations(struct hists *hists,
-                                    struct perf_evsel *evsel,
+                                    struct evsel *evsel,
                                     struct perf_annotate *ann)
 {
         struct rb_node *nd = rb_first_cached(&hists->entries), *next;
@@ -333,7 +335,7 @@ find_next:
                 if (use_browser == 2) {
                         int ret;
                         int (*annotate)(struct hist_entry *he,
-                                        struct perf_evsel *evsel,
+                                        struct evsel *evsel,
                                         struct hist_browser_timer *hbt);
 
                         annotate = dlsym(perf_gtk_handle,
@@ -387,7 +389,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
 {
         int ret;
         struct perf_session *session = ann->session;
-        struct perf_evsel *pos;
+        struct evsel *pos;
         u64 total_nr_samples;
 
         if (ann->cpu_list) {