SimObject: Add in missing includes of <string> and fix minor style problem.

src/sim/sim_object.hh

@@ -36,10 +36,11 @@
 #ifndef __SIM_OBJECT_HH__
 #define __SIM_OBJECT_HH__
 
-#include <map>
-#include <list>
-#include <vector>
 #include <iostream>
+#include <list>
+#include <map>
+#include <string>
+#include <vector>
 
 #include "params/SimObject.hh"
 #include "sim/serialize.hh"

src/sim/sim_object_params.hh

@@ -36,6 +36,8 @@
 struct PyObject;
 #endif
 
+#include <string>
+
 struct SimObjectParams
 {
     virtual ~SimObjectParams() {}