summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/cprintf.hh5
-rw-r--r--base/cprintf_formats.hh7
-rw-r--r--base/crc.cc1
-rw-r--r--base/statistics.cc1
-rw-r--r--base/statistics.hh1
-rw-r--r--base/stats/text.cc1
6 files changed, 10 insertions, 6 deletions
diff --git a/base/cprintf.hh b/base/cprintf.hh
index dcb292434..c468c375f 100644
--- a/base/cprintf.hh
+++ b/base/cprintf.hh
@@ -31,13 +31,12 @@
#include <iostream>
#include <list>
-#include <sstream>
#include <string>
-namespace cp {
-
#include "base/cprintf_formats.hh"
+namespace cp {
+
class ArgList
{
private:
diff --git a/base/cprintf_formats.hh b/base/cprintf_formats.hh
index 11b0238ed..05a8723a4 100644
--- a/base/cprintf_formats.hh
+++ b/base/cprintf_formats.hh
@@ -29,6 +29,11 @@
#ifndef __CPRINTF_FORMATS_HH__
#define __CPRINTF_FORMATS_HH__
+#include <sstream>
+#include <ostream>
+
+namespace cp {
+
struct Format
{
bool alternate_form;
@@ -343,4 +348,6 @@ inline void
format_string(std::ostream &out, const std::stringstream &data, Format &fmt)
{ _format_string(out, data.str(), fmt); }
+} // namespace cp
+
#endif // __CPRINTF_FORMATS_HH__
diff --git a/base/crc.cc b/base/crc.cc
index 87963ef14..08f039577 100644
--- a/base/crc.cc
+++ b/base/crc.cc
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sstream>
#include <string>
#include "sim/host.hh"
diff --git a/base/statistics.cc b/base/statistics.cc
index c97564641..20de46347 100644
--- a/base/statistics.cc
+++ b/base/statistics.cc
@@ -31,7 +31,6 @@
#include <list>
#include <map>
#include <string>
-#include <sstream>
#include "base/callback.hh"
#include "base/cprintf.hh"
diff --git a/base/statistics.hh b/base/statistics.hh
index c46744cac..dd507c091 100644
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -50,7 +50,6 @@
#include <cmath>
#include <functional>
#include <iosfwd>
-#include <sstream>
#include <string>
#include <vector>
diff --git a/base/stats/text.cc b/base/stats/text.cc
index 3d77ff87d..300737c60 100644
--- a/base/stats/text.cc
+++ b/base/stats/text.cc
@@ -31,6 +31,7 @@
#endif
#include <iostream>
+#include <sstream>
#include <fstream>
#include <string>