5 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/trace/opt_cpu.cc b/src/cpu/trace/opt_cpu.cc
index 10e71db7b..b3a6d761b 100644
--- a/src/cpu/trace/opt_cpu.cc
+++ b/src/cpu/trace/opt_cpu.cc
@@ -36,8 +36,8 @@
 
 #include <algorithm> // For heap functions.
 
-#include "cpu/trace/opt_cpu.hh"
 #include "cpu/trace/reader/mem_trace_reader.hh"
+#include "cpu/trace/opt_cpu.hh"
 #include "params/OptCPU.hh"
 #include "sim/sim_events.hh"
 
diff --git a/src/cpu/trace/reader/ibm_reader.hh b/src/cpu/trace/reader/ibm_reader.hh
index a72f62e03..048c5dbda 100644
--- a/src/cpu/trace/reader/ibm_reader.hh
+++ b/src/cpu/trace/reader/ibm_reader.hh
@@ -36,7 +36,8 @@
 #ifndef __IBM_READER_HH__
 #define __IBM_READER_HH__
 
-#include <stdio.h>
+#include <cstdio>
+
 #include "cpu/trace/reader/mem_trace_reader.hh"
 #include "mem/mem_req.hh"
 
diff --git a/src/cpu/trace/reader/itx_reader.hh b/src/cpu/trace/reader/itx_reader.hh
index 63a4c9ac9..8dd1c9a62 100644
--- a/src/cpu/trace/reader/itx_reader.hh
+++ b/src/cpu/trace/reader/itx_reader.hh
@@ -36,13 +36,12 @@
 #ifndef __ITX_READER_HH__
 #define __ITX_READER_HH__
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 #include "cpu/trace/reader/mem_trace_reader.hh"
 #include "mem/mem_req.hh"
 
-
 /**
  * A memory trace reader for the Intel ITX memory trace format.
  */
diff --git a/src/cpu/trace/reader/mem_trace_reader.hh b/src/cpu/trace/reader/mem_trace_reader.hh
index 628a3ecdc..ed69efd5b 100644
--- a/src/cpu/trace/reader/mem_trace_reader.hh
+++ b/src/cpu/trace/reader/mem_trace_reader.hh
@@ -35,8 +35,8 @@
 #ifndef __MEM_TRACE_READER_HH__
 #define __MEM_TRACE_READER_HH__
 
-#include "sim/sim_object.hh"
 #include "mem/mem_req.hh" // For MemReqPtr
+#include "sim/sim_object.hh"
 
 /**
  * Pure virtual base class for memory trace readers.
diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc
index 70aa1f042..85f269121 100644
--- a/src/cpu/trace/trace_cpu.cc
+++ b/src/cpu/trace/trace_cpu.cc
@@ -36,8 +36,8 @@
 
 #include <algorithm> // For min
 
-#include "cpu/trace/trace_cpu.hh"
 #include "cpu/trace/reader/mem_trace_reader.hh"
+#include "cpu/trace/trace_cpu.hh"
 #include "mem/base_mem.hh" // For PARAM constructor
 #include "mem/mem_interface.hh"
 #include "params/TraceCPU.hh"