Index: branches/with_autoconf/src/alias.cc
===================================================================
--- branches/with_autoconf/src/alias.cc	(revision 10)
+++ branches/with_autoconf/src/alias.cc	(revision 20)
@@ -34,7 +34,4 @@
 
 #include "alias.h"
-#include <string>
-//#include <cstdarg.h>
-//#include <cstdio.h>
 #include <iostream>
 #ifdef HAVE_CONFIG_H
Index: branches/with_autoconf/src/bit2string.cc
===================================================================
--- branches/with_autoconf/src/bit2string.cc	(revision 10)
+++ branches/with_autoconf/src/bit2string.cc	(revision 20)
@@ -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>
 #ifdef HAVE_CONFIG_H
Index: branches/with_autoconf/src/dump_used_env.cc
===================================================================
--- branches/with_autoconf/src/dump_used_env.cc	(revision 10)
+++ branches/with_autoconf/src/dump_used_env.cc	(revision 20)
@@ -34,4 +34,5 @@
  */
 
+#include <cstdlib>
 #include "dump_used_env.h"
 #ifdef HAVE_CONFIG_H
Index: branches/with_autoconf/src/entity.cc
===================================================================
--- branches/with_autoconf/src/entity.cc	(revision 10)
+++ branches/with_autoconf/src/entity.cc	(revision 20)
@@ -35,4 +35,5 @@
  */
 
+#include <cstring>
 #include <iomanip>
 #include <list>
Index: branches/with_autoconf/src/gen_code.cc
===================================================================
--- branches/with_autoconf/src/gen_code.cc	(revision 10)
+++ branches/with_autoconf/src/gen_code.cc	(revision 20)
@@ -34,7 +34,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
-#include <stdio.h>
-#include <stdlib.h>
+#if defined(__linux__)
+#include <linux/limits.h>
+#elif defined(WIN32)
+#include <windows.h>
+#endif
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
 #include <fstream>
@@ -267,5 +272,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"
@@ -328,5 +333,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: branches/with_autoconf/src/graph.cc
===================================================================
--- branches/with_autoconf/src/graph.cc	(revision 10)
+++ branches/with_autoconf/src/graph.cc	(revision 20)
@@ -105,7 +105,7 @@
  */
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
 #include <map>
-#include <string>
 
 #include "graph.h"
Index: branches/with_autoconf/src/graph_cass.cc
===================================================================
--- branches/with_autoconf/src/graph_cass.cc	(revision 10)
+++ branches/with_autoconf/src/graph_cass.cc	(revision 20)
@@ -118,5 +118,6 @@
 #include <iostream>
 #include <fstream>
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
 #include <map>
 #include <string>
Index: branches/with_autoconf/src/graph_signals.cc
===================================================================
--- branches/with_autoconf/src/graph_signals.cc	(revision 10)
+++ branches/with_autoconf/src/graph_signals.cc	(revision 20)
@@ -130,7 +130,6 @@
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <map>
-#include <string>
 
 #include "graph_signals.h"
Index: branches/with_autoconf/src/hex2string.cc
===================================================================
--- branches/with_autoconf/src/hex2string.cc	(revision 10)
+++ branches/with_autoconf/src/hex2string.cc	(revision 20)
@@ -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>
 #ifdef HAVE_CONFIG_H
Index: branches/with_autoconf/src/internal.h
===================================================================
--- branches/with_autoconf/src/internal.h	(revision 10)
+++ branches/with_autoconf/src/internal.h	(revision 20)
@@ -15,4 +15,6 @@
 #include "internal_ext.h"
 #include <map>
+#include <string>
+#include <vector>
 
 namespace sc_core {
Index: branches/with_autoconf/src/module_hierarchy.cc
===================================================================
--- branches/with_autoconf/src/module_hierarchy.cc	(revision 10)
+++ branches/with_autoconf/src/module_hierarchy.cc	(revision 20)
@@ -41,4 +41,6 @@
 #include "config.h"
 #endif
+#include <cstdlib>
+#include <cstring>
 
 using namespace std;
Index: branches/with_autoconf/src/port_dependency.cc
===================================================================
--- branches/with_autoconf/src/port_dependency.cc	(revision 10)
+++ branches/with_autoconf/src/port_dependency.cc	(revision 20)
@@ -34,4 +34,5 @@
  */
 
+#include <cstring>
 #include <list>
 #include <iostream>
Index: branches/with_autoconf/src/sc_event.h
===================================================================
--- branches/with_autoconf/src/sc_event.h	(revision 10)
+++ branches/with_autoconf/src/sc_event.h	(revision 20)
@@ -14,4 +14,5 @@
 
 #include "sc_fwd.h"
+#include <iostream>
 
 namespace sc_core {
Index: branches/with_autoconf/src/sc_interface.cc
===================================================================
--- branches/with_autoconf/src/sc_interface.cc	(revision 10)
+++ branches/with_autoconf/src/sc_interface.cc	(revision 20)
@@ -42,4 +42,5 @@
 #include "config.h"
 #endif
+#include <cstdlib>  //exit
 
 using namespace std;
Index: branches/with_autoconf/src/sc_main.cc
===================================================================
--- branches/with_autoconf/src/sc_main.cc	(revision 10)
+++ branches/with_autoconf/src/sc_main.cc	(revision 20)
@@ -36,7 +36,8 @@
 
 #include <sstream>
-#include <string>
 #include <list>
 #include <set>
+#include <cstring> // strcmp
+
 #include "internal.h"
 #include "global_functions.h"
Index: branches/with_autoconf/src/sc_module.cc
===================================================================
--- branches/with_autoconf/src/sc_module.cc	(revision 10)
+++ branches/with_autoconf/src/sc_module.cc	(revision 20)
@@ -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: branches/with_autoconf/src/sc_object.cc
===================================================================
--- branches/with_autoconf/src/sc_object.cc	(revision 10)
+++ branches/with_autoconf/src/sc_object.cc	(revision 20)
@@ -35,5 +35,6 @@
 
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstring> //strdup
 #include <string>
 #include <map>
Index: branches/with_autoconf/src/sc_pat_trace.cc
===================================================================
--- branches/with_autoconf/src/sc_pat_trace.cc	(revision 10)
+++ branches/with_autoconf/src/sc_pat_trace.cc	(revision 20)
@@ -41,6 +41,5 @@
 #include "internal.h" // notrace
 
-#include <time.h>
-#include <string>
+#include <ctime>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -56,6 +55,6 @@
 
 //#include "malloc.h" // NO LONGER SUPPORTED
-#include <stdlib.h>
-#include "stdio.h"
+#include <cstdlib>
+#include <cstdio>
 
 //-----------------------------------------
Index: branches/with_autoconf/src/sc_port.cc
===================================================================
--- branches/with_autoconf/src/sc_port.cc	(revision 10)
+++ branches/with_autoconf/src/sc_port.cc	(revision 20)
@@ -37,7 +37,5 @@
 
 #include <iomanip>
-#include <list>
 #include <map>
-#include <vector>
 
 #include "sc_port.h"
Index: branches/with_autoconf/src/sc_port_ext.h
===================================================================
--- branches/with_autoconf/src/sc_port_ext.h	(revision 10)
+++ branches/with_autoconf/src/sc_port_ext.h	(revision 20)
@@ -16,4 +16,5 @@
 // Define registers writing method
 #include <iostream>
+#include <cstdlib>
 #include "sc_fwd.h"
 #include "sc_nbdefs.h"
Index: branches/with_autoconf/src/sc_signal.h
===================================================================
--- branches/with_autoconf/src/sc_signal.h	(revision 10)
+++ branches/with_autoconf/src/sc_signal.h	(revision 20)
@@ -16,4 +16,5 @@
 // Define registers writing method
 #include <iostream>
+#include <cstdlib>
 #include "sc_fwd.h"
 #include "sc_nbdefs.h"
Index: branches/with_autoconf/src/sc_time.cc
===================================================================
--- branches/with_autoconf/src/sc_time.cc	(revision 10)
+++ branches/with_autoconf/src/sc_time.cc	(revision 20)
@@ -36,5 +36,5 @@
 
 #include "sc_time.h"
-#include <time.h>
+#include <ctime>
 #include <sys/time.h>
 #include <string>
Index: branches/with_autoconf/src/sc_trace.cc
===================================================================
--- branches/with_autoconf/src/sc_trace.cc	(revision 10)
+++ branches/with_autoconf/src/sc_trace.cc	(revision 20)
@@ -44,6 +44,7 @@
 
 #include <list>
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
+#include <cstring> //strlen
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -62,6 +63,6 @@
 
 //#include "malloc.h" // NO LONGER SUPPORTED
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 
 #endif // CONFIG_PAT_TRACE_FORMAT
Index: branches/with_autoconf/src/sc_uint.h
===================================================================
--- branches/with_autoconf/src/sc_uint.h	(revision 10)
+++ branches/with_autoconf/src/sc_uint.h	(revision 20)
@@ -18,4 +18,5 @@
 #include <sc_logic.h>
 #include <sc_bv.h>
+#include <cstdlib>
 
 // ----------------------------------------------------------------------------
@@ -126,5 +127,5 @@
   sc_uint ()                { val = 0; }
 //  sc_uint (data_type val_)  { val = 0; write (val_); }
-  sc_uint (const char *a)   { val = 0; write (atoi (a)); }
+  sc_uint (const char *a)   { val = 0; write (std::atoi (a)); }
   sc_uint (unsigned short a){ val = 0; write (a); }
   sc_uint (short a)         { val = 0; write (a); }
Index: branches/with_autoconf/src/sc_vcd_trace.cc
===================================================================
--- branches/with_autoconf/src/sc_vcd_trace.cc	(revision 10)
+++ branches/with_autoconf/src/sc_vcd_trace.cc	(revision 20)
@@ -42,5 +42,5 @@
 #include <cassert>
 
-#include <time.h>
+#include <ctime>
 #include <string>
 #ifdef HAVE_CONFIG_H
Index: branches/with_autoconf/src/sc_ver.cc
===================================================================
--- branches/with_autoconf/src/sc_ver.cc	(revision 10)
+++ branches/with_autoconf/src/sc_ver.cc	(revision 20)
@@ -36,9 +36,10 @@
 
 #include "sc_ver.h"
-#include <string>
 #include <iostream>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <cstring> //strcmp
+#include <cstdlib> //exit
 
 namespace sc_core {
Index: branches/with_autoconf/src/schedulers.cc
===================================================================
--- branches/with_autoconf/src/schedulers.cc	(revision 10)
+++ branches/with_autoconf/src/schedulers.cc	(revision 20)
@@ -36,4 +36,5 @@
 
 #include <iostream>
+#include <algorithm> //std::sort
 #include "sc_module.h" // method_process_t
 #include "gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
Index: branches/with_autoconf/src/serialization.cc
===================================================================
--- branches/with_autoconf/src/serialization.cc	(revision 10)
+++ branches/with_autoconf/src/serialization.cc	(revision 20)
@@ -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: branches/with_autoconf/src/signal_dependency.cc
===================================================================
--- branches/with_autoconf/src/signal_dependency.cc	(revision 10)
+++ branches/with_autoconf/src/signal_dependency.cc	(revision 20)
@@ -34,7 +34,7 @@
  */
 
-#include <set>
 #include <iostream>
 #include <fstream>
+
 #include "signal_dependency.h"
 #include "simplify_string.h"