Index: /sources/src/alias.cc
===================================================================
--- /sources/src/alias.cc	(revision 11)
+++ /sources/src/alias.cc	(revision 12)
@@ -34,7 +34,4 @@
 
 #include"alias.h"
-#include<string>
-//#include<cstdarg.h>
-//#include<cstdio.h>
 #include<iostream>
 
Index: /sources/src/bit2string.cc
===================================================================
--- /sources/src/bit2string.cc	(revision 11)
+++ /sources/src/bit2string.cc	(revision 12)
@@ -6,4 +6,5 @@
 |                                                             |
 | Author  :                 Kingbo Paul-Jerome                |
+|                           Buchmann Richard                  |
 |                                                             |
 | Date    :                   09_07_2004                      |
@@ -36,8 +37,7 @@
 #include "bit2string.h"
 #include "sc_unit.h"
-#include <string>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
 	
Index: /sources/src/gen_code.cc
===================================================================
--- /sources/src/gen_code.cc	(revision 11)
+++ /sources/src/gen_code.cc	(revision 12)
@@ -35,6 +35,6 @@
  */
 
-#include<stdio.h>
-#include<stdlib.h>
+#include<cstdio>
+#include<cstdlib>
 #include<iostream>
 #include<fstream>
@@ -264,5 +264,5 @@
   o << "// generated by " << sc_version () << endl
 		<< "#include<casc.h>\n\n"
-		<< "#include<stdio.h>\n\n"
+		<< "#include<cstdio>\n\n"
 //		<< "#include<iostream>\n\n"
 		<< "namespace sc_core {\n"
@@ -325,5 +325,5 @@
   o << "// generated by " << sc_version () << endl
 		<< "#include<casc.h>\n\n"
-		<< "#include<stdio.h>\n\n"
+		<< "#include<cstdio>\n\n"
 //		<< "#include<iostream>\n\n"
 		<< "namespace sc_core {\n"
Index: /sources/src/graph.cc
===================================================================
--- /sources/src/graph.cc	(revision 11)
+++ /sources/src/graph.cc	(revision 12)
@@ -105,7 +105,6 @@
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <map>
-#include <string>
 
 #include "graph.h"
Index: /sources/src/graph_cass.cc
===================================================================
--- /sources/src/graph_cass.cc	(revision 11)
+++ /sources/src/graph_cass.cc	(revision 12)
@@ -118,5 +118,5 @@
 #include <iostream>
 #include <fstream>
-#include <stdio.h>
+#include <cstdio>
 #include <map>
 #include <string>
Index: /sources/src/graph_signals.cc
===================================================================
--- /sources/src/graph_signals.cc	(revision 11)
+++ /sources/src/graph_signals.cc	(revision 12)
@@ -130,7 +130,6 @@
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <map>
-#include <string>
 
 #include "graph_signals.h"
Index: /sources/src/guess_endianness.cc
===================================================================
--- /sources/src/guess_endianness.cc	(revision 11)
+++ /sources/src/guess_endianness.cc	(revision 12)
@@ -14,5 +14,5 @@
 }
 
-#include <stdio.h>
+#include <cstdio>
 
 int
Index: /sources/src/hex2string.cc
===================================================================
--- /sources/src/hex2string.cc	(revision 11)
+++ /sources/src/hex2string.cc	(revision 12)
@@ -36,8 +36,8 @@
 #include "hex2string.h"
 
-#include <string>
+//#include <string>
 #include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
 	
Index: /sources/src/internal.h
===================================================================
--- /sources/src/internal.h	(revision 11)
+++ /sources/src/internal.h	(revision 12)
@@ -16,4 +16,5 @@
 #include <map>
 #include <string>
+#include <vector>
 
 namespace sc_core {
Index: /sources/src/sc_main.cc
===================================================================
--- /sources/src/sc_main.cc	(revision 11)
+++ /sources/src/sc_main.cc	(revision 12)
@@ -36,7 +36,7 @@
 
 #include<sstream>
-#include<string>
 #include<list>
 #include<set>
+
 #include"internal.h"
 #include"global_functions.h"
Index: /sources/src/sc_module.cc
===================================================================
--- /sources/src/sc_module.cc	(revision 11)
+++ /sources/src/sc_module.cc	(revision 12)
@@ -35,4 +35,7 @@
  */
 
+#include <stdarg.h>
+#include <vector>
+#include <set>
 
 #include "sc_module.h"
@@ -41,8 +44,4 @@
 #include "module_hierarchy.h"
 #include "serialization.h" // set_save_handler
-#include <stdarg.h>
-#include <vector>
-#include <string>
-#include <set>
 #include "sc_port.h"
 #include "sc_signal.h"
Index: /sources/src/sc_object.cc
===================================================================
--- /sources/src/sc_object.cc	(revision 11)
+++ /sources/src/sc_object.cc	(revision 12)
@@ -35,5 +35,5 @@
 
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 #include <map>
Index: /sources/src/sc_pat_trace.cc
===================================================================
--- /sources/src/sc_pat_trace.cc	(revision 11)
+++ /sources/src/sc_pat_trace.cc	(revision 12)
@@ -41,6 +41,5 @@
 #include"internal.h" // notrace
 
-#include<time.h>
-#include<string>
+#include<ctime>
 
 #ifdef PAT_TRACE_FORMAT
@@ -53,6 +52,6 @@
 
 //#include "malloc.h" // NO LONGER SUPPORTED
-#include <stdlib.h>
-#include "stdio.h"
+#include <cstdlib>
+#include <cstdio>
 
 //-----------------------------------------
Index: /sources/src/sc_port.cc
===================================================================
--- /sources/src/sc_port.cc	(revision 11)
+++ /sources/src/sc_port.cc	(revision 12)
@@ -37,7 +37,5 @@
 
 #include<iomanip>
-#include<list>
 #include<map>
-#include<vector>
 
 #include"sc_port.h"
Index: /sources/src/sc_time.cc
===================================================================
--- /sources/src/sc_time.cc	(revision 11)
+++ /sources/src/sc_time.cc	(revision 12)
@@ -36,5 +36,5 @@
 
 #include"sc_time.h"
-#include <time.h>
+#include <ctime>
 #include <sys/time.h>
 #include <string>
Index: /sources/src/sc_trace.cc
===================================================================
--- /sources/src/sc_trace.cc	(revision 11)
+++ /sources/src/sc_trace.cc	(revision 12)
@@ -44,5 +44,5 @@
 
 #include <list>
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
 
@@ -59,6 +59,6 @@
 
 //#include "malloc.h" // NO LONGER SUPPORTED
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 
 #endif // PAT_TRACE_FORMAT
Index: /sources/src/sc_vcd_trace.cc
===================================================================
--- /sources/src/sc_vcd_trace.cc	(revision 11)
+++ /sources/src/sc_vcd_trace.cc	(revision 12)
@@ -42,5 +42,5 @@
 #include"assert.h"
 
-#include<time.h>
+#include<ctime>
 #include<string>
 
Index: /sources/src/sc_ver.cc
===================================================================
--- /sources/src/sc_ver.cc	(revision 11)
+++ /sources/src/sc_ver.cc	(revision 12)
@@ -36,5 +36,4 @@
 
 #include "sc_ver.h"
-#include <string>
 #include <iostream>
 
Index: /sources/src/serialization.cc
===================================================================
--- /sources/src/serialization.cc	(revision 11)
+++ /sources/src/serialization.cc	(revision 12)
@@ -35,7 +35,8 @@
 
 
-#include<vector>
 #include<map>
-#include<fstream> // save_module_hierarchy
+#include<fstream>
+//#include<vector> // save_module_hierarchy
+
 #include"internal_ext.h" // tab_t
 #include"serialization.h"
Index: /sources/src/signal_dependency.cc
===================================================================
--- /sources/src/signal_dependency.cc	(revision 11)
+++ /sources/src/signal_dependency.cc	(revision 12)
@@ -34,7 +34,7 @@
  */
 
-#include <set>
 #include <iostream>
 #include <fstream>
+
 #include "signal_dependency.h"
 #include "simplify_string.h"