misc: Fix some includes

Fix some missing and extra includes around the codebase.

Change-Id: Ibf314b43a966943a8096958f68382e1e245f29e3
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38738
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/arch/generic/interrupts.hh b/src/arch/generic/interrupts.hh
index c8e1d0c3535d53589fe7d898a3fc6c580a6cf482..9acb5b52773e79d548343f1e33bac418143dc12a 100644 (file)
--- a/src/arch/generic/interrupts.hh
+++ b/src/arch/generic/interrupts.hh
@@ -28,6 +28,7 @@
 #ifndef __ARCH_GENERIC_INTERRUPTS_HH__
 #define __ARCH_GENERIC_INTERRUPTS_HH__
 
+#include "base/logging.hh"
 #include "params/BaseInterrupts.hh"
 #include "sim/sim_object.hh"
 

diff --git a/src/base/trace.cc b/src/base/trace.cc
index ed6fbd21a51b8beafa9bb501dcad945920588488..eee6a4ddec41fa59388d78a4e6f9b1b86f2f045a 100644 (file)
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -35,10 +35,8 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>
-#include <string>
 
 #include "base/atomicio.hh"
-#include "base/debug.hh"
 #include "base/logging.hh"
 #include "base/output.hh"
 #include "base/str.hh"

diff --git a/src/base/trace.hh b/src/base/trace.hh
index 34997ed70afbd16122faac30cdbba7a2ea4ff2c1..f7c0066866cb6a73830449cac64f56b0ebcb9b8b 100644 (file)
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -32,6 +32,7 @@
 #ifndef __BASE_TRACE_HH__
 #define __BASE_TRACE_HH__
 
+#include <ostream>
 #include <string>
 #include <sstream>
 

diff --git a/src/cpu/minor/buffers.hh b/src/cpu/minor/buffers.hh
index cc013a99118a78afb9f159ceccd6540813b3e7b6..90ab6949756f5e33c310b654086c8780947bdfb7 100644 (file)
--- a/src/cpu/minor/buffers.hh
+++ b/src/cpu/minor/buffers.hh
@@ -47,8 +47,10 @@
 #include <iostream>
 #include <queue>
 #include <sstream>
+#include <string>
 
 #include "base/logging.hh"
+#include "base/types.hh"
 #include "cpu/activity.hh"
 #include "cpu/minor/trace.hh"
 #include "cpu/timebuf.hh"

diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc
index 2c90c8e23a0e7656395c13659c47467053640773..136099a1c420f558d35bca2bcb97227e8df0aa5c 100644 (file)
--- a/src/cpu/minor/decode.cc
+++ b/src/cpu/minor/decode.cc
@@ -37,6 +37,8 @@
 
 #include "cpu/minor/decode.hh"
 
+#include "base/logging.hh"
+#include "base/trace.hh"
 #include "cpu/minor/pipeline.hh"
 #include "debug/Decode.hh"
 

diff --git a/src/cpu/minor/decode.hh b/src/cpu/minor/decode.hh
index 89ed00b9bfc55cbf45fc2d82751ae2b4e2f14bb9..636d53ffdf7407cd24bd1f96494a79230ef4ccc5 100644 (file)
--- a/src/cpu/minor/decode.hh
+++ b/src/cpu/minor/decode.hh
@@ -45,6 +45,8 @@
 #ifndef __CPU_MINOR_DECODE_HH__
 #define __CPU_MINOR_DECODE_HH__
 
+#include <vector>
+
 #include "cpu/minor/buffers.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/dyn_inst.hh"

diff --git a/src/cpu/minor/dyn_inst.hh b/src/cpu/minor/dyn_inst.hh
index b90e27794994f06527d3668d04a90ab24659bc81..0328544d11e4c6cba44bebe1185ee1068f7b1473 100644 (file)
--- a/src/cpu/minor/dyn_inst.hh
+++ b/src/cpu/minor/dyn_inst.hh
@@ -49,11 +49,13 @@
 #include <iostream>
 
 #include "base/refcnt.hh"
-#include "cpu/minor/buffers.hh"
+#include "base/types.hh"
 #include "cpu/inst_seq.hh"
+#include "cpu/minor/buffers.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/timing_expr.hh"
 #include "sim/faults.hh"
+#include "sim/insttracer.hh"
 
 namespace Minor
 {

diff --git a/src/cpu/minor/execute.hh b/src/cpu/minor/execute.hh
index ba33b81911149cc3a555460bdb7081167709a699..4d36a5d88850fb4d28c3f99ece03bc11810bf13f 100644 (file)
--- a/src/cpu/minor/execute.hh
+++ b/src/cpu/minor/execute.hh
@@ -45,6 +45,9 @@
 #ifndef __CPU_MINOR_EXECUTE_HH__
 #define __CPU_MINOR_EXECUTE_HH__
 
+#include <vector>
+
+#include "base/types.hh"
 #include "cpu/minor/buffers.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/func_unit.hh"

diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index 1a207779aab1733f27472855a92db07f8522242f..e20aacf6c5d32ca48b0396a16fb313c2eefd6dcd 100644 (file)
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -42,6 +42,8 @@
 #include <sstream>
 
 #include "base/cast.hh"
+#include "base/logging.hh"
+#include "base/trace.hh"
 #include "cpu/minor/pipeline.hh"
 #include "debug/Drain.hh"
 #include "debug/Fetch.hh"

diff --git a/src/cpu/minor/fetch1.hh b/src/cpu/minor/fetch1.hh
index 9889d426868c58b3e73445c026fd80b1ea6daa32..cb68611a545ac5cbbdf47d1a508b27d8615cb735 100644 (file)
--- a/src/cpu/minor/fetch1.hh
+++ b/src/cpu/minor/fetch1.hh
@@ -45,10 +45,12 @@
 #ifndef __CPU_MINOR_FETCH1_HH__
 #define __CPU_MINOR_FETCH1_HH__
 
+#include <vector>
+
+#include "cpu/base.hh"
 #include "cpu/minor/buffers.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/pipe_data.hh"
-#include "cpu/base.hh"
 #include "mem/packet.hh"
 
 namespace Minor

diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc
index 263a3190315ade148cdca38b06d0fbed9a95848f..08c280ab985d907f51e47d1faa3b2d770dac1daf 100644 (file)
--- a/src/cpu/minor/fetch2.cc
+++ b/src/cpu/minor/fetch2.cc
@@ -41,6 +41,8 @@
 
 #include "arch/decoder.hh"
 #include "arch/utility.hh"
+#include "base/logging.hh"
+#include "base/trace.hh"
 #include "cpu/minor/pipeline.hh"
 #include "cpu/pred/bpred_unit.hh"
 #include "debug/Branch.hh"

diff --git a/src/cpu/minor/fetch2.hh b/src/cpu/minor/fetch2.hh
index fbeb96d73a71521beb8dd73c36a0a14897e38022..2a7814aed4a0f54e79ecf4dea2d0296afc131e17 100644 (file)
--- a/src/cpu/minor/fetch2.hh
+++ b/src/cpu/minor/fetch2.hh
@@ -45,6 +45,8 @@
 #ifndef __CPU_MINOR_FETCH2_HH__
 #define __CPU_MINOR_FETCH2_HH__
 
+#include <vector>
+
 #include "cpu/minor/buffers.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/pipe_data.hh"

diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc
index a7ccc08fbefbdd9da723ae661dae6bb3757637a5..58f3a1e7219e7ed1cf7df0b66b4d6184ab52ad0d 100644 (file)
--- a/src/cpu/minor/func_unit.cc
+++ b/src/cpu/minor/func_unit.cc
@@ -41,6 +41,7 @@
 #include <sstream>
 #include <typeinfo>
 
+#include "base/trace.hh"
 #include "debug/MinorTiming.hh"
 #include "enums/OpClass.hh"
 

diff --git a/src/cpu/minor/func_unit.hh b/src/cpu/minor/func_unit.hh
index 09290e3eef7b990a15993b280c91db9fbf1859cf..ce51a99d08b3d783e26fef7027f26204f3a12281 100644 (file)
--- a/src/cpu/minor/func_unit.hh
+++ b/src/cpu/minor/func_unit.hh
@@ -44,15 +44,22 @@
 #ifndef __CPU_MINOR_FUNC_UNIT_HH__
 #define __CPU_MINOR_FUNC_UNIT_HH__
 
+#include <cstdint>
+#include <ostream>
+#include <string>
+#include <vector>
+
+#include "base/types.hh"
+#include "cpu/func_unit.hh"
 #include "cpu/minor/buffers.hh"
 #include "cpu/minor/dyn_inst.hh"
-#include "cpu/func_unit.hh"
 #include "cpu/timing_expr.hh"
 #include "params/MinorFU.hh"
 #include "params/MinorFUPool.hh"
 #include "params/MinorOpClass.hh"
 #include "params/MinorOpClassSet.hh"
 #include "sim/clocked_object.hh"
+#include "sim/sim_object.hh"
 
 /** Boxing for MinorOpClass to get around a build problem with C++11 but
  *  also allow for future additions to op class checking */

diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc
index 2283038d835d44783eedf15a697e789d00198ba3..7e156ea3d166e733348354bd9824cedd6055bfae 100644 (file)
--- a/src/cpu/minor/lsq.cc
+++ b/src/cpu/minor/lsq.cc
@@ -42,7 +42,7 @@
 
 #include "arch/locked_mem.hh"
 #include "base/logging.hh"
-#include "cpu/minor/cpu.hh"
+#include "base/trace.hh"
 #include "cpu/minor/exec_context.hh"
 #include "cpu/minor/execute.hh"
 #include "cpu/minor/pipeline.hh"

diff --git a/src/cpu/minor/lsq.hh b/src/cpu/minor/lsq.hh
index 1109868dcc4537570c8826322f5b620dc76c5e46..11748835fdeb3a8266c6d7ef2d1ea2372c785bee 100644 (file)
--- a/src/cpu/minor/lsq.hh
+++ b/src/cpu/minor/lsq.hh
@@ -45,10 +45,14 @@
 #ifndef __CPU_MINOR_NEW_LSQ_HH__
 #define __CPU_MINOR_NEW_LSQ_HH__
 
+#include <string>
+#include <vector>
+
 #include "cpu/minor/buffers.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/pipe_data.hh"
 #include "cpu/minor/trace.hh"
+#include "mem/packet.hh"
 
 namespace Minor
 {

diff --git a/src/cpu/minor/scoreboard.hh b/src/cpu/minor/scoreboard.hh
index b7547844f2978adf74c3f1fcd7f41e13924f6f31..aab0b2bc1c49709d77776e74218f68a690720bca 100644 (file)
--- a/src/cpu/minor/scoreboard.hh
+++ b/src/cpu/minor/scoreboard.hh
@@ -44,6 +44,9 @@
 #ifndef __CPU_MINOR_SCOREBOARD_HH__
 #define __CPU_MINOR_SCOREBOARD_HH__
 
+#include <vector>
+
+#include "base/types.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/dyn_inst.hh"
 #include "cpu/minor/trace.hh"

diff --git a/src/cpu/o3/free_list.hh b/src/cpu/o3/free_list.hh
index a4dfc2407d6aa5bae6d08f51a66775f8b3ccd370..cb15b5be559de43c16b8315ea293dc3a1c02a47e 100644 (file)
--- a/src/cpu/o3/free_list.hh
+++ b/src/cpu/o3/free_list.hh
@@ -44,7 +44,6 @@
 
 #include <iostream>
 #include <queue>
-#include <vector>
 
 #include "base/logging.hh"
 #include "base/trace.hh"

diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index 377ec590846df540684d262cfeee3c7cd2062c14..2eaa701e354a7296690aee600326977aa780de39 100644 (file)
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -42,10 +42,16 @@
 #ifndef __CPU_O3_LSQ_HH__
 #define __CPU_O3_LSQ_HH__
 
+#include <cassert>
+#include <cstdint>
+#include <list>
 #include <map>
 #include <queue>
+#include <vector>
 
 #include "arch/generic/tlb.hh"
+#include "base/flags.hh"
+#include "base/types.hh"
 #include "cpu/inst_seq.hh"
 #include "cpu/o3/lsq_unit.hh"
 #include "cpu/utils.hh"

diff --git a/src/cpu/o3/scoreboard.cc b/src/cpu/o3/scoreboard.cc
index 75853d1894a49eb0e5ff74a9ca2e42a2d58fd1f9..27120352092723ed2a0624b01c60d04476729872 100644 (file)
--- a/src/cpu/o3/scoreboard.cc
+++ b/src/cpu/o3/scoreboard.cc
@@ -29,9 +29,6 @@
 
 #include "cpu/o3/scoreboard.hh"
 
-#include "config/the_isa.hh"
-#include "debug/Scoreboard.hh"
-
 Scoreboard::Scoreboard(const std::string &_my_name,
                        unsigned _numPhysicalRegs)
     : _name(_my_name),

diff --git a/src/cpu/o3/scoreboard.hh b/src/cpu/o3/scoreboard.hh
index 1f3582f2a366e39389e7ed8e7c42debe4c7425ee..0a37b406172546f5f32a1b29044f14005022f441 100644 (file)
--- a/src/cpu/o3/scoreboard.hh
+++ b/src/cpu/o3/scoreboard.hh
@@ -30,15 +30,13 @@
 #ifndef __CPU_O3_SCOREBOARD_HH__
 #define __CPU_O3_SCOREBOARD_HH__
 
-#include <iostream>
-#include <utility>
+#include <cassert>
 #include <vector>
 
+#include "base/compiler.hh"
 #include "base/trace.hh"
-#include "config/the_isa.hh"
-#include "cpu/o3/comm.hh"
+#include "cpu/reg_class.hh"
 #include "debug/Scoreboard.hh"
-
 /**
  * Implements a simple scoreboard to track which registers are
  * ready. This class operates on the unified physical register space,

diff --git a/src/cpu/testers/traffic_gen/base_gen.cc b/src/cpu/testers/traffic_gen/base_gen.cc
index d8ce00132ced8cbdad85d2b52c7575909267d32c..c3891146b4425cbe962373c1e7382d5e79f9ef67 100644 (file)
--- a/src/cpu/testers/traffic_gen/base_gen.cc
+++ b/src/cpu/testers/traffic_gen/base_gen.cc
@@ -40,11 +40,7 @@
 #include <algorithm>
 
 #include "base/logging.hh"
-#include "base/random.hh"
-#include "base/trace.hh"
 #include "cpu/testers/traffic_gen/base.hh"
-#include "debug/TrafficGen.hh"
-#include "sim/system.hh"
 
 BaseGen::BaseGen(SimObject &obj, RequestorID requestor_id, Tick _duration)
     : _name(obj.name()), requestorId(requestor_id),

diff --git a/src/cpu/testers/traffic_gen/base_gen.hh b/src/cpu/testers/traffic_gen/base_gen.hh
index 8d5003336c35145d61b4162fa8878e8acabe55a3..664678eb3e3ab005b03954c205ed4de0eb1682f5 100644 (file)
--- a/src/cpu/testers/traffic_gen/base_gen.hh
+++ b/src/cpu/testers/traffic_gen/base_gen.hh
@@ -43,6 +43,7 @@
 #ifndef __CPU_TRAFFIC_GEN_BASE_GEN_HH__
 #define __CPU_TRAFFIC_GEN_BASE_GEN_HH__
 
+#include <cstdint>
 #include <string>
 
 #include "base/types.hh"

diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc
index be2155d6dbc84ef267978127aad69a8086d3f8ef..43d0d3ae9b99737eb7791873df96f550131d8c6d 100644 (file)
--- a/src/dev/arm/energy_ctrl.cc
+++ b/src/dev/arm/energy_ctrl.cc
@@ -43,6 +43,7 @@
 #include "mem/packet_access.hh"
 #include "params/EnergyCtrl.hh"
 #include "sim/dvfs_handler.hh"
+#include "sim/serialize.hh"
 
 EnergyCtrl::EnergyCtrl(const Params &p)
     : BasicPioDevice(p, PIO_NUM_FIELDS * 4),        // each field is 32 bit

diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc
index 6c01049a1145bfd8c347634f012c61c811895735..a8b5cc50bfaed25f897b3a94f32b55bdc5d8eb46 100644 (file)
--- a/src/dev/arm/generic_timer.cc
+++ b/src/dev/arm/generic_timer.cc
@@ -41,6 +41,8 @@
 
 #include "arch/arm/system.hh"
 #include "arch/arm/utility.hh"
+#include "base/logging.hh"
+#include "base/trace.hh"
 #include "cpu/base.hh"
 #include "debug/Timer.hh"
 #include "dev/arm/base_gic.hh"

diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh
index b007ef1559a6328deb7921755dc22604cf22b124..16d2ce31b2386a8b08114946ab8303455bb4df3b 100644 (file)
--- a/src/dev/arm/generic_timer.hh
+++ b/src/dev/arm/generic_timer.hh
@@ -38,11 +38,20 @@
 #ifndef __DEV_ARM_GENERIC_TIMER_HH__
 #define __DEV_ARM_GENERIC_TIMER_HH__
 
+#include <cstdint>
+#include <vector>
+
 #include "arch/arm/isa_device.hh"
 #include "arch/arm/system.hh"
+#include "base/addr_range.hh"
+#include "base/bitunion.hh"
+#include "base/types.hh"
 #include "dev/arm/base_gic.hh"
 #include "dev/arm/generic_timer_miscregs_types.hh"
 #include "sim/core.hh"
+#include "sim/drain.hh"
+#include "sim/eventq.hh"
+#include "sim/serialize.hh"
 #include "sim/sim_object.hh"
 
 /// @file

diff --git a/src/dev/arm/gic_v3_its.cc b/src/dev/arm/gic_v3_its.cc
index caf058dd39f91fbb535555b00364bc028accaa05..ee30eeee7ccbd407158888b192edd130d480c8bd 100644 (file)
--- a/src/dev/arm/gic_v3_its.cc
+++ b/src/dev/arm/gic_v3_its.cc
@@ -37,6 +37,11 @@
 
 #include "dev/arm/gic_v3_its.hh"
 
+#include <cassert>
+#include <functional>
+
+#include "base/logging.hh"
+#include "base/trace.hh"
 #include "debug/AddrRanges.hh"
 #include "debug/Drain.hh"
 #include "debug/GIC.hh"

diff --git a/src/dev/arm/gic_v3_its.hh b/src/dev/arm/gic_v3_its.hh
index 0262f46311caab6f4a5f9474fa56797b9de88b37..e1688cdc7a131103de28aeceb70396a6a74dcb71 100644 (file)
--- a/src/dev/arm/gic_v3_its.hh
+++ b/src/dev/arm/gic_v3_its.hh
@@ -38,9 +38,15 @@
 #ifndef __DEV_ARM_GICV3_ITS_H__
 #define __DEV_ARM_GICV3_ITS_H__
 
+#include <cstdint>
+#include <memory>
 #include <queue>
+#include <vector>
 
+#include "base/addr_range.hh"
+#include "base/bitunion.hh"
 #include "base/coroutine.hh"
+#include "base/types.hh"
 #include "dev/dma_device.hh"
 #include "params/Gicv3Its.hh"
 

diff --git a/src/dev/arm/smmu_v3_proc.cc b/src/dev/arm/smmu_v3_proc.cc
index 0a11c1562c2597729e364e308efbcfe3e089bf2f..cb8aca5e21280e65b9536062413eb88eaf2f0292 100644 (file)
--- a/src/dev/arm/smmu_v3_proc.cc
+++ b/src/dev/arm/smmu_v3_proc.cc
@@ -37,6 +37,9 @@
 
 #include "dev/arm/smmu_v3_proc.hh"
 
+#include <cassert>
+#include <functional>
+
 #include "dev/arm/smmu_v3.hh"
 #include "sim/system.hh"
 

diff --git a/src/dev/arm/timer_a9global.cc b/src/dev/arm/timer_a9global.cc
index e2c7a36e20f857f0326c824086f3bbfb69d9a584..e1b1910687303719a988b595dcabd0301f76321c 100644 (file)
--- a/src/dev/arm/timer_a9global.cc
+++ b/src/dev/arm/timer_a9global.cc
@@ -38,7 +38,10 @@
 
 #include "dev/arm/timer_a9global.hh"
 
+#include <cassert>
+
 #include "base/intmath.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"

diff --git a/src/dev/arm/timer_a9global.hh b/src/dev/arm/timer_a9global.hh
index 7a8cf85c8343ce7c908f122c6df844f18f4d7f96..72c0ea07647f680268c8893ee2b09931e26057d8 100644 (file)
--- a/src/dev/arm/timer_a9global.hh
+++ b/src/dev/arm/timer_a9global.hh
@@ -39,9 +39,15 @@
 #ifndef __DEV_ARM_GLOBAL_TIMER_HH__
 #define __DEV_ARM_GLOBAL_TIMER_HH__
 
+#include <cstdint>
+
+#include "base/types.hh"
 #include "base/bitunion.hh"
+#include "base/types.hh"
 #include "dev/io_device.hh"
 #include "params/A9GlobalTimer.hh"
+#include "sim/eventq.hh"
+#include "sim/serialize.hh"
 
 /** @file
  * This implements the Cortex A9-MPCore global timer from TRM rev r4p1.

diff --git a/src/dev/arm/timer_cpulocal.cc b/src/dev/arm/timer_cpulocal.cc
index 9b4f7f3da003c7c3662aadd3ee3de0f1b2a5967c..760adf5959ae2b59ac1b4ce0b0762f95dc20c288 100644 (file)
--- a/src/dev/arm/timer_cpulocal.cc
+++ b/src/dev/arm/timer_cpulocal.cc
@@ -37,8 +37,11 @@
 
 #include "dev/arm/timer_cpulocal.hh"
 
+#include <cassert>
+
 #include "arch/arm/system.hh"
 #include "base/intmath.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"

diff --git a/src/dev/arm/timer_cpulocal.hh b/src/dev/arm/timer_cpulocal.hh
index 6966d3e8396e1cfa9b573e8e92ca138e95d24406..a4fa45749f2759b2afdee2ca40cf4c4675bace09 100644 (file)
--- a/src/dev/arm/timer_cpulocal.hh
+++ b/src/dev/arm/timer_cpulocal.hh
@@ -38,9 +38,15 @@
 #ifndef __DEV_ARM_LOCALTIMER_HH__
 #define __DEV_ARM_LOCALTIMER_HH__
 
+#include <cstdint>
+#include <memory>
+#include <vector>
+
 #include "base/bitunion.hh"
+#include "base/types.hh"
 #include "dev/io_device.hh"
 #include "params/CpuLocalTimer.hh"
+#include "sim/serialize.hh"
 
 /** @file
  * This implements the cpu local timer from the Cortex-A9 MPCore

diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc
index 95fb30fe55b675b1a0c0ff45945ffe1fb183967f..6403a7716fab7669aa5dd5b39c19aa7a143b0a30 100644 (file)
--- a/src/dev/arm/timer_sp804.cc
+++ b/src/dev/arm/timer_sp804.cc
@@ -37,7 +37,10 @@
 
 #include "dev/arm/timer_sp804.hh"
 
+#include <cassert>
+
 #include "base/intmath.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Timer.hh"

diff --git a/src/dev/arm/timer_sp804.hh b/src/dev/arm/timer_sp804.hh
index 34df8aac7d1591bf57c42f523cccea33c72f4a46..7cf3f2908ea73ad73638e304ad4c08ca766e4e3e 100644 (file)
--- a/src/dev/arm/timer_sp804.hh
+++ b/src/dev/arm/timer_sp804.hh
@@ -38,8 +38,14 @@
 #ifndef __DEV_ARM_SP804_HH__
 #define __DEV_ARM_SP804_HH__
 
+#include <cstdint>
+
+#include "base/bitunion.hh"
+#include "base/types.hh"
 #include "dev/arm/amba_device.hh"
 #include "params/Sp804.hh"
+#include "sim/eventq.hh"
+#include "sim/serialize.hh"
 
 /** @file
  * This implements the dual Sp804 timer block

diff --git a/src/dev/hsa/hsa_packet_processor.cc b/src/dev/hsa/hsa_packet_processor.cc
index bba3c5940cb815c8369c1cfc3c18d48834374e7e..756757a8f22ff613777fe1908a00c1effb46d4d0 100644 (file)
--- a/src/dev/hsa/hsa_packet_processor.cc
+++ b/src/dev/hsa/hsa_packet_processor.cc
@@ -35,10 +35,13 @@
 
 #include "dev/hsa/hsa_packet_processor.hh"
 
+#include <cassert>
 #include <cstring>
 
 #include "base/chunk_generator.hh"
 #include "base/compiler.hh"
+#include "base/logging.hh"
+#include "base/trace.hh"
 #include "debug/HSAPacketProcessor.hh"
 #include "dev/dma_device.hh"
 #include "dev/hsa/hsa_device.hh"

diff --git a/src/dev/hsa/hsa_packet_processor.hh b/src/dev/hsa/hsa_packet_processor.hh
index 0f82e925320709a6b4c101dbd03119f4646886bc..ed0fdff08dd6020a2bf19a789d548733446b7f02 100644 (file)
--- a/src/dev/hsa/hsa_packet_processor.hh
+++ b/src/dev/hsa/hsa_packet_processor.hh
@@ -36,14 +36,16 @@
 #ifndef __DEV_HSA_HSA_PACKET_PROCESSOR__
 #define __DEV_HSA_HSA_PACKET_PROCESSOR__
 
+#include <algorithm>
 #include <cstdint>
+#include <vector>
 
-#include <queue>
-
+#include "base/types.hh"
 #include "dev/dma_device.hh"
 #include "dev/hsa/hsa.h"
 #include "dev/hsa/hsa_queue.hh"
 #include "params/HSAPacketProcessor.hh"
+#include "sim/eventq.hh"
 
 #define AQL_PACKET_SIZE 64
 #define PAGE_SIZE 4096

diff --git a/src/dev/i2c/bus.cc b/src/dev/i2c/bus.cc
index 345d71ceb792384e9239814c4e559e23c7863167..7e362ac6a145b17af84c5bb826aea92b861d1f01 100644 (file)
--- a/src/dev/i2c/bus.cc
+++ b/src/dev/i2c/bus.cc
@@ -41,6 +41,7 @@
 #include "debug/Checkpoint.hh"
 #include "dev/i2c/device.hh"
 #include "mem/packet_access.hh"
+#include "sim/serialize.hh"
 
 // clang complains about std::set being overloaded with Packet::set if
 // we open up the entire namespace std

diff --git a/src/dev/net/dist_etherlink.hh b/src/dev/net/dist_etherlink.hh
index bb99c33bee18272deb64c821c41590bf631d5540..c86f8adc5e4d96a3932d0b232d19d629c7129014 100644 (file)
--- a/src/dev/net/dist_etherlink.hh
+++ b/src/dev/net/dist_etherlink.hh
@@ -48,10 +48,14 @@
 #ifndef __DEV_DIST_ETHERLINK_HH__
 #define __DEV_DIST_ETHERLINK_HH__
 
+#include <cassert>
 #include <iostream>
 
+#include "base/types.hh"
 #include "dev/net/etherlink.hh"
 #include "params/DistEtherLink.hh"
+#include "sim/serialize.hh"
+#include "sim/sim_object.hh"
 
 class DistIface;
 class EthPacketData;

diff --git a/src/dev/net/etherlink.cc b/src/dev/net/etherlink.cc
index 9bf805f980af52c0448d75c6f2961762b11d34bb..eff38e6d8a680e2aec37f3e117d46d531c7a884a 100644 (file)
--- a/src/dev/net/etherlink.cc
+++ b/src/dev/net/etherlink.cc
@@ -44,11 +44,13 @@
 
 #include "dev/net/etherlink.hh"
 
+#include <cassert>
 #include <cmath>
 #include <deque>
 #include <string>
 #include <vector>
 
+#include "base/logging.hh"
 #include "base/random.hh"
 #include "base/trace.hh"
 #include "debug/Ethernet.hh"

diff --git a/src/dev/net/etherlink.hh b/src/dev/net/etherlink.hh
index 036d7defc42868ebd5554e238787ffdf4456e859..940d2bd610c20220999bbc4938bf221ca2781f8a 100644 (file)
--- a/src/dev/net/etherlink.hh
+++ b/src/dev/net/etherlink.hh
@@ -46,6 +46,7 @@
 #define __DEV_NET_ETHERLINK_HH__
 
 #include <queue>
+#include <utility>
 
 #include "base/types.hh"
 #include "dev/net/etherint.hh"

diff --git a/src/dev/net/etherswitch.hh b/src/dev/net/etherswitch.hh
index 7f7f36e96825b771bdfd2d6c5443e6efe1151ca9..9b37090064507fbe6b0a45c34531ca17f5383c20 100644 (file)
--- a/src/dev/net/etherswitch.hh
+++ b/src/dev/net/etherswitch.hh
@@ -35,6 +35,8 @@
 
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
 
 #include "base/inet.hh"
 #include "dev/net/etherint.hh"
@@ -43,6 +45,7 @@
 #include "dev/net/pktfifo.hh"
 #include "params/EtherSwitch.hh"
 #include "sim/eventq.hh"
+#include "sim/serialize.hh"
 #include "sim/sim_object.hh"
 
 class EtherSwitch : public SimObject

diff --git a/src/dev/net/i8254xGBe.hh b/src/dev/net/i8254xGBe.hh
index 070edde828ac6db5d590e05da43b5d8a7c248689..422318b9c46a4d88d5ac9d503f2eaf9ff562347a 100644 (file)
--- a/src/dev/net/i8254xGBe.hh
+++ b/src/dev/net/i8254xGBe.hh
@@ -33,10 +33,13 @@
 #ifndef __DEV_NET_I8254XGBE_HH__
 #define __DEV_NET_I8254XGBE_HH__
 
+#include <cstdint>
 #include <deque>
 #include <string>
 
 #include "base/inet.hh"
+#include "base/trace.hh"
+#include "base/types.hh"
 #include "debug/EthernetDesc.hh"
 #include "debug/EthernetIntr.hh"
 #include "dev/net/etherdevice.hh"
@@ -47,6 +50,7 @@
 #include "dev/pci/device.hh"
 #include "params/IGbE.hh"
 #include "sim/eventq.hh"
+#include "sim/serialize.hh"
 
 class IGbEInt;
 

diff --git a/src/dev/ps2/device.cc b/src/dev/ps2/device.cc
index c32288e3ef1b9044487d7773101e1c2cb6df6f2d..47eb026afb8fb183f0e6389f66f1b2da7c5674a7 100644 (file)
--- a/src/dev/ps2/device.cc
+++ b/src/dev/ps2/device.cc
@@ -45,6 +45,7 @@
 #include "debug/PS2.hh"
 #include "dev/ps2/types.hh"
 #include "params/PS2Device.hh"
+#include "sim/serialize.hh"
 
 PS2Device::PS2Device(const PS2DeviceParams &p)
     : SimObject(p)

diff --git a/src/dev/ps2/mouse.cc b/src/dev/ps2/mouse.cc
index bc3d3f15ca4903d44282445adab03b99202a758d..d8e32f452487abcc570c13681c1ab77e989160b8 100644 (file)
--- a/src/dev/ps2/mouse.cc
+++ b/src/dev/ps2/mouse.cc
@@ -45,6 +45,7 @@
 #include "debug/PS2.hh"
 #include "dev/ps2/types.hh"
 #include "params/PS2Mouse.hh"
+#include "sim/serialize.hh"
 
 PS2Mouse::PS2Mouse(const PS2MouseParams &p)
     : PS2Device(p),

diff --git a/src/dev/serial/uart8250.cc b/src/dev/serial/uart8250.cc
index a6e9bd1509d96542078d851f78c8dce4c0429804..83238d60c1bade78dfc295db86bbb7595dc6634f 100644 (file)
--- a/src/dev/serial/uart8250.cc
+++ b/src/dev/serial/uart8250.cc
@@ -41,6 +41,7 @@
 #include "dev/platform.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "sim/serialize.hh"
 
 using namespace std;
 

diff --git a/src/dev/storage/disk_image.cc b/src/dev/storage/disk_image.cc
index 58d2ac032f44ea9a06d21669bd57f3bfc8281157..199ecc23bd5bafa49c0bfbbfa60f6fe5785811de 100644 (file)
--- a/src/dev/storage/disk_image.cc
+++ b/src/dev/storage/disk_image.cc
@@ -47,6 +47,7 @@
 #include "debug/DiskImageRead.hh"
 #include "debug/DiskImageWrite.hh"
 #include "sim/byteswap.hh"
+#include "sim/serialize.hh"
 #include "sim/sim_exit.hh"
 
 using namespace std;

diff --git a/src/dev/virtio/base.cc b/src/dev/virtio/base.cc
index f5332e900bdf27e8ab75daec46a6e0a1d3ece7ba..0624c7e51213470fd777a458ca75611be9787a00 100644 (file)
--- a/src/dev/virtio/base.cc
+++ b/src/dev/virtio/base.cc
@@ -41,6 +41,7 @@
 #include "debug/VIO.hh"
 #include "params/VirtIODeviceBase.hh"
 #include "params/VirtIODummyDevice.hh"
+#include "sim/serialize.hh"
 
 VirtDescriptor::VirtDescriptor(PortProxy &_memProxy, ByteOrder bo,
                                VirtQueue &_queue, Index descIndex)

diff --git a/src/dev/virtio/base.hh b/src/dev/virtio/base.hh
index 776c2a3518dd2bd27c86fb70190c7d3eb645834d..d9ade7f660610c29775fdf16f475c656329c63d3 100644 (file)
--- a/src/dev/virtio/base.hh
+++ b/src/dev/virtio/base.hh
@@ -38,11 +38,15 @@
 #ifndef __DEV_VIRTIO_BASE_HH__
 #define __DEV_VIRTIO_BASE_HH__
 
+#include <cstdint>
 #include <functional>
+#include <vector>
 
 #include "base/bitunion.hh"
+#include "base/types.hh"
 #include "dev/virtio/virtio_ring.h"
 #include "mem/port_proxy.hh"
+#include "sim/serialize.hh"
 #include "sim/sim_object.hh"
 
 struct VirtIODeviceBaseParams;

diff --git a/src/mem/mem_checker.cc b/src/mem/mem_checker.cc
index f4f24d4420b281f0ba82570016ae9679be8ec83f..5e839fb7545344d031f57feca6e94c7630048979 100644 (file)
--- a/src/mem/mem_checker.cc
+++ b/src/mem/mem_checker.cc
@@ -37,7 +37,7 @@
 
 #include "mem/mem_checker.hh"
 
-#include <cassert>
+#include "base/logging.hh"
 
 void
 MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick _start,
@@ -54,9 +54,9 @@ MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick _start,
     ++numIncomplete;
 
     if (complete != TICK_FUTURE) {
-       // Reopen a closed write cluster
-        assert(_start < complete);  // should open a new write cluster, instead;
-        // also somewhat fishy wrt causality / ordering of calls vs time
+        // Reopen a closed write cluster
+        assert(_start < complete); // Should open a new write cluster instead
+        // Also somewhat fishy wrt causality / ordering of calls vs time
         // progression TODO: Check me!
         complete = TICK_FUTURE;
     }
@@ -67,13 +67,14 @@ MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick _start,
 }
 
 void
-MemChecker::WriteCluster::completeWrite(MemChecker::Serial serial, Tick _complete)
+MemChecker::WriteCluster::completeWrite(MemChecker::Serial serial,
+    Tick _complete)
 {
     auto it = writes.find(serial);
 
     if (it == writes.end()) {
-        warn("Could not locate write transaction: serial = %d, complete = %d\n",
-             serial, _complete);
+        warn("Could not locate write transaction: serial = %d, "
+             "complete = %d\n", serial, _complete);
         return;
     }
 
@@ -90,9 +91,9 @@ MemChecker::WriteCluster::completeWrite(MemChecker::Serial serial, Tick _complet
         // All writes have completed, this cluster is now complete and will be
         // assigned the max of completion tick values among all writes.
         //
-        // Note that we cannot simply keep updating complete, because that would
-        // count the cluster as closed already.  Instead, we keep TICK_FUTURE
-        // until all writes have completed.
+        // Note that we cannot simply keep updating complete, because that
+        // would count the cluster as closed already.  Instead, we keep
+        // TICK_FUTURE until all writes have completed.
         complete = completeMax;
     }
 }
@@ -124,7 +125,8 @@ MemChecker::ByteTracker::startRead(MemChecker::Serial serial, Tick start)
 }
 
 bool
-MemChecker::ByteTracker::inExpectedData(Tick start, Tick complete, uint8_t data)
+MemChecker::ByteTracker::inExpectedData(Tick start, Tick complete,
+    uint8_t data)
 {
     _lastExpectedData.clear();
 
@@ -259,7 +261,8 @@ MemChecker::ByteTracker::startWrite(MemChecker::Serial serial, Tick start,
 }
 
 void
-MemChecker::ByteTracker::completeWrite(MemChecker::Serial serial, Tick complete)
+MemChecker::ByteTracker::completeWrite(MemChecker::Serial serial,
+    Tick complete)
 {
     getIncompleteWriteCluster()->completeWrite(serial, complete);
     pruneTransactions();
@@ -282,7 +285,7 @@ MemChecker::ByteTracker::pruneTransactions()
 
     // Pruning of readObservations
     readObservations.erase(readObservations.begin(),
-                           lastCompletedTransaction(&readObservations, before));
+        lastCompletedTransaction(&readObservations, before));
 
     // Pruning of writeClusters
     if (!writeClusters.empty()) {

diff --git a/src/mem/mem_checker.hh b/src/mem/mem_checker.hh
index 41aa691e7325ba1ca7d1c027bf3624eea2e3a373..c924b1db4623057a4a29f913af1e10afa8ce0ec6 100644 (file)
--- a/src/mem/mem_checker.hh
+++ b/src/mem/mem_checker.hh
@@ -38,13 +38,15 @@
 #ifndef __MEM_MEM_CHECKER_HH__
 #define __MEM_MEM_CHECKER_HH__
 
+#include <cassert>
+#include <cstdint>
 #include <list>
 #include <map>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "base/logging.hh"
+#include "base/cprintf.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "debug/MemChecker.hh"

diff --git a/src/mem/mem_interface.cc b/src/mem/mem_interface.cc
index c86683e6f802619e3f147f66ecccccc38fc3ab62..407eb1d90bc4ffcb86d1f96a5b308e11c115bb99 100644 (file)
--- a/src/mem/mem_interface.cc
+++ b/src/mem/mem_interface.cc
@@ -41,6 +41,7 @@
 #include "mem/mem_interface.hh"
 
 #include "base/bitfield.hh"
+#include "base/cprintf.hh"
 #include "base/trace.hh"
 #include "debug/DRAM.hh"
 #include "debug/DRAMPower.hh"

diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index a03f20053fd2786752bfc2352c94542a510680e8..9877fadfb1b8a5914874e13c0dc179b882d4daff 100644 (file)
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -54,6 +54,7 @@
 #include "debug/AddrRanges.hh"
 #include "debug/Checkpoint.hh"
 #include "mem/abstract_mem.hh"
+#include "sim/serialize.hh"
 
 /**
  * On Linux, MAP_NORESERVE allow us to simulate a very large memory

diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index 156b96d23b44dd3cba4fb978130e01806e666002..432b6d698676cb01ca10bca7c9f6b09faf583705 100644 (file)
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -31,6 +31,7 @@
 #include <algorithm>
 
 #include "base/cast.hh"
+#include "base/cprintf.hh"
 #include "base/random.hh"
 #include "debug/RubyNetwork.hh"
 #include "mem/ruby/network/MessageBuffer.hh"

diff --git a/src/sim/clock_domain.cc b/src/sim/clock_domain.cc
index 61d56547222a2e74a80dc257935f95085ffd08cb..f27a8f3f155dea1a7a709239a6c1c5f3c9321f62 100644 (file)
--- a/src/sim/clock_domain.cc
+++ b/src/sim/clock_domain.cc
@@ -41,12 +41,14 @@
 #include <algorithm>
 #include <functional>
 
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/ClockDomain.hh"
 #include "params/ClockDomain.hh"
 #include "params/DerivedClockDomain.hh"
 #include "params/SrcClockDomain.hh"
 #include "sim/clocked_object.hh"
+#include "sim/serialize.hh"
 #include "sim/voltage_domain.hh"
 
 ClockDomain::ClockDomainStats::ClockDomainStats(ClockDomain &cd)

diff --git a/src/sim/dvfs_handler.cc b/src/sim/dvfs_handler.cc
index 38ca35cefcbc782f01c795006be6121325c67d7a..53b4271a893687a17852e814540c774cb949fecd 100644 (file)
--- a/src/sim/dvfs_handler.cc
+++ b/src/sim/dvfs_handler.cc
@@ -40,12 +40,10 @@
 #include <set>
 #include <utility>
 
-#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/DVFS.hh"
 #include "params/DVFSHandler.hh"
-#include "sim/clock_domain.hh"
-#include "sim/eventq.hh"
+#include "sim/serialize.hh"
 #include "sim/stat_control.hh"
 #include "sim/voltage_domain.hh"
 

diff --git a/src/sim/dvfs_handler.hh b/src/sim/dvfs_handler.hh
index da04fc5c974f5146451889b93edef2e2538e7dd8..fccaf6303fd80cc2a1d9a36cfc32e5fe9628f55c 100644 (file)
--- a/src/sim/dvfs_handler.hh
+++ b/src/sim/dvfs_handler.hh
@@ -46,8 +46,12 @@
 #ifndef __SIM_DVFS_HANDLER_HH__
 #define __SIM_DVFS_HANDLER_HH__
 
+#include <cassert>
+#include <map>
 #include <vector>
 
+#include "base/logging.hh"
+#include "base/types.hh"
 #include "debug/DVFS.hh"
 #include "params/DVFSHandler.hh"
 #include "sim/clock_domain.hh"

diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index 5fb0877746f3d489ed0dddb40a25102b913a0982..a9ab29b0efd009e2cb15465e2b69a784d94f038e 100644 (file)
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -40,6 +40,7 @@
 #include <climits>
 #include <functional>
 #include <iosfwd>
+#include <list>
 #include <memory>
 #include <string>
 

diff --git a/src/sim/power/thermal_domain.cc b/src/sim/power/thermal_domain.cc
index dabf2fe996e993f1dbea4a71358b295b36a1b46f..e9f4d3ca2ad315ebe51c1cdf8e315384c7d5a198 100644 (file)
--- a/src/sim/power/thermal_domain.cc
+++ b/src/sim/power/thermal_domain.cc
@@ -46,6 +46,7 @@
 #include "sim/linear_solver.hh"
 #include "sim/power/thermal_model.hh"
 #include "sim/probe/probe.hh"
+#include "sim/serialize.hh"
 #include "sim/sub_system.hh"
 
 ThermalDomain::ThermalDomain(const Params &p)

diff --git a/src/sim/power/thermal_model.cc b/src/sim/power/thermal_model.cc
index 65649e5132e448fb09bf90f73f7386edb22a043e..408642ccfa432f173f57207cc9793c2767e3d1fd 100644 (file)
--- a/src/sim/power/thermal_model.cc
+++ b/src/sim/power/thermal_model.cc
@@ -44,6 +44,7 @@
 #include "sim/clocked_object.hh"
 #include "sim/linear_solver.hh"
 #include "sim/power/thermal_domain.hh"
+#include "sim/serialize.hh"
 #include "sim/sim_object.hh"
 
 /**

diff --git a/src/sim/power_state.cc b/src/sim/power_state.cc
index a11ed430bcaf9919b2eb68e5eb8f2539d0bbfb43..ffa19721ad69689776ec2a341eced892d68d97fa 100644 (file)
--- a/src/sim/power_state.cc
+++ b/src/sim/power_state.cc
@@ -37,10 +37,13 @@
 
 #include "sim/power_state.hh"
 
+#include <cassert>
+
 #include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/PowerDomain.hh"
 #include "sim/power_domain.hh"
+#include "sim/serialize.hh"
 
 PowerState::PowerState(const PowerStateParams &p) :
     SimObject(p), _currState(p.default_state),

diff --git a/src/sim/power_state.hh b/src/sim/power_state.hh
index fe869ff716af4f41999dac459a9a48a8ac9de5d3..fb9a5818d40311f9cd1977e0633d33a3d6fd0607 100644 (file)
--- a/src/sim/power_state.hh
+++ b/src/sim/power_state.hh
@@ -44,6 +44,7 @@
 #define __SIM_POWER_STATE_HH__
 
 #include <set>
+#include <vector>
 
 #include "base/callback.hh"
 #include "base/statistics.hh"

diff --git a/src/sim/redirect_path.cc b/src/sim/redirect_path.cc
index f270057c243a0b12e838fa57f5c8bb00b0115214..57286f7a8473feba9b4c2a118f47c112df091ec0 100644 (file)
--- a/src/sim/redirect_path.cc
+++ b/src/sim/redirect_path.cc
@@ -30,6 +30,8 @@
 
 #include <unistd.h>
 
+#include "base/str.hh"
+
 static std::string
 normalizePath(std::string path)
 {

diff --git a/src/sim/root.hh b/src/sim/root.hh
index 817e2f334d62314cd8e16e20a5033b2597069d4a..2db4223679218a96176c828966fa528d588622b9 100644 (file)
--- a/src/sim/root.hh
+++ b/src/sim/root.hh
@@ -53,6 +53,7 @@
 
 #include "base/statistics.hh"
 #include "base/time.hh"
+#include "base/types.hh"
 #include "params/Root.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_object.hh"

diff --git a/src/sim/serialize_handlers.hh b/src/sim/serialize_handlers.hh
index 8efd895ba4c8fc5fb7271ef29d14be87c6f630bc..5e5c3ff4a226bc5973b250fd27096b91521eee42 100644 (file)
--- a/src/sim/serialize_handlers.hh
+++ b/src/sim/serialize_handlers.hh
@@ -47,8 +47,8 @@
 
 
 #include <iostream>
-#include <iterator>
 #include <type_traits>
+#include <utility>
 
 #include "base/str.hh"
 

diff --git a/src/sim/sim_exit.hh b/src/sim/sim_exit.hh
index a79d3e2cd045f3e88c0d7c3ad00c8c485c8a9b65..d1791f58ba90a1b22127bfd0505b0a6bf77fbfa4 100644 (file)
--- a/src/sim/sim_exit.hh
+++ b/src/sim/sim_exit.hh
@@ -29,6 +29,7 @@
 #ifndef __SIM_EXIT_HH__
 #define __SIM_EXIT_HH__
 
+#include <functional>
 #include <string>
 
 #include "base/types.hh"

diff --git a/src/sim/ticked_object.cc b/src/sim/ticked_object.cc
index 3564b4d03b5257cb8c6984263b18ed1636bb63ff..79cbd41a90a9e87fc45a6b39ceff276a266f67d1 100644 (file)
--- a/src/sim/ticked_object.cc
+++ b/src/sim/ticked_object.cc
@@ -39,6 +39,7 @@
 
 #include "params/TickedObject.hh"
 #include "sim/clocked_object.hh"
+#include "sim/serialize.hh"
 
 Ticked::Ticked(ClockedObject &object_,
     Stats::Scalar *imported_num_cycles,

diff --git a/src/sim/voltage_domain.cc b/src/sim/voltage_domain.cc
index f6f8396279454eb020d39380523100476d30437a..d770af852107f0eec27b7f4545936c66546b9ca8 100644 (file)
--- a/src/sim/voltage_domain.cc
+++ b/src/sim/voltage_domain.cc
@@ -39,11 +39,11 @@
 
 #include <algorithm>
 
-#include "base/statistics.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/VoltageDomain.hh"
 #include "params/VoltageDomain.hh"
-#include "sim/sim_object.hh"
+#include "sim/serialize.hh"
 
 VoltageDomain::VoltageDomain(const Params &p)
     : SimObject(p), voltageOpPoints(p.voltage), _perfLevel(0), stats(*this)