1 files changed, 14 insertions, 10 deletions

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index f6f5dd15bea7..827e4800d862 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -6,6 +6,7 @@
  * DSOs and symbol information, sort them and produce a diff.
  */
 #include "builtin.h"
+#include "perf.h"
 
 #include "util/debug.h"
 #include "util/event.h"
@@ -15,6 +16,7 @@
 #include "util/session.h"
 #include "util/tool.h"
 #include "util/sort.h"
+#include "util/srcline.h"
 #include "util/symbol.h"
 #include "util/data.h"
 #include "util/config.h"
@@ -22,6 +24,8 @@
 #include "util/annotate.h"
 #include "util/map.h"
 #include <linux/zalloc.h>
+#include <subcmd/pager.h>
+#include <subcmd/parse-options.h>
 
 #include <errno.h>
 #include <inttypes.h>
@@ -376,7 +380,7 @@ struct hist_entry_ops block_hist_ops = {
 static int diff__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_diff *pdiff = container_of(tool, struct perf_diff, tool);
@@ -448,10 +452,10 @@ static struct perf_diff pdiff = {
         },
 };
 
-static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
-                                      struct perf_evlist *evlist)
+static struct evsel *evsel_match(struct evsel *evsel,
+                                      struct evlist *evlist)
 {
-        struct perf_evsel *e;
+        struct evsel *e;
 
         evlist__for_each_entry(evlist, e) {
                 if (perf_evsel__match2(evsel, e))
@@ -461,9 +465,9 @@ static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
         return NULL;
 }
 
-static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
+static void perf_evlist__collapse_resort(struct evlist *evlist)
 {
-        struct perf_evsel *evsel;
+        struct evsel *evsel;
 
         evlist__for_each_entry(evlist, evsel) {
                 struct hists *hists = evsel__hists(evsel);
@@ -1009,8 +1013,8 @@ static void data__fprintf(void)
 
 static void data_process(void)
 {
-        struct perf_evlist *evlist_base = data__files[0].session->evlist;
-        struct perf_evsel *evsel_base;
+        struct evlist *evlist_base = data__files[0].session->evlist;
+        struct evsel *evsel_base;
         bool first = true;
 
         evlist__for_each_entry(evlist_base, evsel_base) {
@@ -1019,8 +1023,8 @@ static void data_process(void)
                 int i;
 
                 data__for_each_file_new(i, d) {
-                        struct perf_evlist *evlist = d->session->evlist;
-                        struct perf_evsel *evsel;
+                        struct evlist *evlist = d->session->evlist;
+                        struct evsel *evsel;
                         struct hists *hists;
 
                         evsel = evsel_match(evsel_base, evlist);