23 files changed, 21 insertions, 21 deletions

diff --git a/src/cpu/activity.cc b/src/cpu/activity.cc
index a2a34edf9..9c9288c4d 100644
--- a/src/cpu/activity.cc
+++ b/src/cpu/activity.cc
@@ -30,7 +30,7 @@
 
 #include <string>
 
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/activity.hh"
 
 using namespace std;
diff --git a/src/cpu/activity.hh b/src/cpu/activity.hh
index d75ff150e..8d3469c4e 100644
--- a/src/cpu/activity.hh
+++ b/src/cpu/activity.hh
@@ -31,7 +31,7 @@
 #ifndef __CPU_ACTIVITY_HH__
 #define __CPU_ACTIVITY_HH__
 
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "base/trace.hh"
 
 /**
diff --git a/src/cpu/inorder/cpu.hh b/src/cpu/inorder/cpu.hh
index 65c822331..3b2041cfa 100644
--- a/src/cpu/inorder/cpu.hh
+++ b/src/cpu/inorder/cpu.hh
@@ -42,7 +42,7 @@
 #include "arch/types.hh"
 #include "arch/registers.hh"
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
diff --git a/src/cpu/inorder/first_stage.hh b/src/cpu/inorder/first_stage.hh
index f479dd812..3a3d550a0 100644
--- a/src/cpu/inorder/first_stage.hh
+++ b/src/cpu/inorder/first_stage.hh
@@ -36,7 +36,7 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/comm.hh"
 #include "cpu/inorder/params.hh"
diff --git a/src/cpu/inorder/pipeline_stage.hh b/src/cpu/inorder/pipeline_stage.hh
index 6df104e6c..a562a6415 100644
--- a/src/cpu/inorder/pipeline_stage.hh
+++ b/src/cpu/inorder/pipeline_stage.hh
@@ -36,7 +36,7 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/inorder/inorder_dyn_inst.hh"
 #include "cpu/inorder/comm.hh"
 #include "params/InOrderCPU.hh"
diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh
index 468153dc7..a38d6a96f 100644
--- a/src/cpu/o3/commit.hh
+++ b/src/cpu/o3/commit.hh
@@ -33,7 +33,7 @@
 #define __CPU_O3_COMMIT_HH__
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/inst_seq.hh"
 
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index 2895de293..e8681f6e3 100644
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -47,7 +47,7 @@
 #include "arch/utility.hh"
 #include "base/cp_annotate.hh"
 #include "base/loader/symtab.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 2669016ff..832d98f55 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -40,7 +40,7 @@
 
 #include "arch/types.hh"
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
diff --git a/src/cpu/o3/decode.hh b/src/cpu/o3/decode.hh
index e272b661f..482b4b7fc 100644
--- a/src/cpu/o3/decode.hh
+++ b/src/cpu/o3/decode.hh
@@ -34,7 +34,7 @@
 #include <queue>
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 
 class DerivO3CPUParams;
 
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index 56f97e463..87dde1da8 100644
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -35,7 +35,7 @@
 #include "arch/utility.hh"
 #include "arch/predecoder.hh"
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
 #include "cpu/pc_event.hh"
 #include "mem/packet.hh"
diff --git a/src/cpu/o3/fu_pool.hh b/src/cpu/o3/fu_pool.hh
index 48037324c..20d742cc8 100644
--- a/src/cpu/o3/fu_pool.hh
+++ b/src/cpu/o3/fu_pool.hh
@@ -36,7 +36,7 @@
 #include <string>
 #include <vector>
 
-#include "base/sched_list.hh"
+#include "cpu/sched_list.hh"
 #include "cpu/op_class.hh"
 #include "params/FUPool.hh"
 #include "sim/sim_object.hh"
diff --git a/src/cpu/o3/iew.hh b/src/cpu/o3/iew.hh
index df9180ea6..6599964b6 100644
--- a/src/cpu/o3/iew.hh
+++ b/src/cpu/o3/iew.hh
@@ -46,7 +46,7 @@
 #include <queue>
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "cpu/o3/comm.hh"
 #include "cpu/o3/scoreboard.hh"
diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index 521f07089..c809b93ab 100644
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -46,7 +46,7 @@
 
 #include <queue>
 
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/fu_pool.hh"
 #include "cpu/o3/iew.hh"
diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index bccb1aa0e..56124d60f 100644
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -37,7 +37,7 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "base/types.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/o3/dep_graph.hh"
diff --git a/src/cpu/o3/rename.hh b/src/cpu/o3/rename.hh
index 8c21dda0a..4598a8d7b 100644
--- a/src/cpu/o3/rename.hh
+++ b/src/cpu/o3/rename.hh
@@ -34,7 +34,7 @@
 #include <list>
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
 
 class DerivO3CPUParams;
diff --git a/src/cpu/ozone/back_end.hh b/src/cpu/ozone/back_end.hh
index d8afb1526..7a2da3239 100644
--- a/src/cpu/ozone/back_end.hh
+++ b/src/cpu/ozone/back_end.hh
@@ -36,7 +36,7 @@
 #include <string>
 
 #include "sim/faults.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh
index 05ff92289..fcc5602eb 100644
--- a/src/cpu/ozone/cpu.hh
+++ b/src/cpu/ozone/cpu.hh
@@ -34,7 +34,7 @@
 #include <set>
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
diff --git a/src/cpu/ozone/front_end.hh b/src/cpu/ozone/front_end.hh
index 892e279c0..7f400e82a 100644
--- a/src/cpu/ozone/front_end.hh
+++ b/src/cpu/ozone/front_end.hh
@@ -34,7 +34,7 @@
 #include <deque>
 
 #include "arch/utility.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/o3/bpred_unit.hh"
diff --git a/src/cpu/ozone/inorder_back_end.hh b/src/cpu/ozone/inorder_back_end.hh
index 28e02bafb..9c2699610 100644
--- a/src/cpu/ozone/inorder_back_end.hh
+++ b/src/cpu/ozone/inorder_back_end.hh
@@ -34,7 +34,7 @@
 #include <list>
 
 #include "sim/faults.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
diff --git a/src/cpu/ozone/inst_queue.hh b/src/cpu/ozone/inst_queue.hh
index 2f544e307..fb302f01e 100644
--- a/src/cpu/ozone/inst_queue.hh
+++ b/src/cpu/ozone/inst_queue.hh
@@ -37,7 +37,7 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "base/types.hh"
 #include "cpu/inst_seq.hh"
 
diff --git a/src/cpu/ozone/lw_back_end.hh b/src/cpu/ozone/lw_back_end.hh
index 4a1657c9b..4c6eb5fb6 100644
--- a/src/cpu/ozone/lw_back_end.hh
+++ b/src/cpu/ozone/lw_back_end.hh
@@ -37,7 +37,7 @@
 #include <string>
 
 #include "sim/faults.hh"
-#include "base/timebuf.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/ozone/rename_table.hh"
 #include "cpu/ozone/thread_state.hh"
diff --git a/src/base/sched_list.hh b/src/cpu/sched_list.hh
index 56ee2f8ec..56ee2f8ec 100644
--- a/src/base/sched_list.hh
+++ b/src/cpu/sched_list.hh
diff --git a/src/base/timebuf.hh b/src/cpu/timebuf.hh
index b6f709d71..b6f709d71 100644
--- a/src/base/timebuf.hh
+++ b/src/cpu/timebuf.hh