diff -dur cvc3-2.1.ORIG/src/include/command_line_exception.h cvc3-2.1/src/include/command_line_exception.h
--- cvc3-2.1.ORIG/src/include/command_line_exception.h	2006-08-09 15:19:30.000000000 -0600
+++ cvc3-2.1/src/include/command_line_exception.h	2009-10-16 09:34:46.141974605 -0600
@@ -31,7 +31,7 @@
   // Constructors
   CLException() { }
   CLException(const std::string& msg): Exception(msg) { }
-  CLException(char* msg): Exception(msg) { }
+  CLException(const char* msg): Exception(msg) { }
   // Destructor
   virtual ~CLException() { }
   // Printing the message
diff -dur cvc3-2.1.ORIG/src/include/memory_manager_context.h cvc3-2.1/src/include/memory_manager_context.h
--- cvc3-2.1.ORIG/src/include/memory_manager_context.h	2009-04-10 14:38:25.000000000 -0600
+++ cvc3-2.1/src/include/memory_manager_context.h	2009-10-16 09:34:46.141974605 -0600
@@ -21,6 +21,7 @@
 #ifndef _cvc3__include__memory_manager_context_h
 #define _cvc3__include__memory_manager_context_h
 
+#include <cstdlib>
 #include <vector>
 #include "memory_manager.h"
 
diff -dur cvc3-2.1.ORIG/src/include/sound_exception.h cvc3-2.1/src/include/sound_exception.h
--- cvc3-2.1.ORIG/src/include/sound_exception.h	2006-08-09 15:19:30.000000000 -0600
+++ cvc3-2.1/src/include/sound_exception.h	2009-10-16 09:34:46.142839030 -0600
@@ -33,7 +33,7 @@
     // Constructors
     SoundException() { }
     SoundException(const std::string& msg): Exception(msg) { }
-    SoundException(char* msg): Exception(msg) { }
+    SoundException(const char* msg): Exception(msg) { }
     // Destructor
     virtual ~SoundException() { }
     virtual std::string toString() const {
diff -dur cvc3-2.1.ORIG/src/theory_arith/arith_exception.h cvc3-2.1/src/theory_arith/arith_exception.h
--- cvc3-2.1.ORIG/src/theory_arith/arith_exception.h	2006-08-09 15:19:31.000000000 -0600
+++ cvc3-2.1/src/theory_arith/arith_exception.h	2009-10-16 09:35:47.378849519 -0600
@@ -35,7 +35,7 @@
     // Constructors
     ArithException() { }
     ArithException(const std::string& msg): Exception(msg) { }
-    ArithException(char* msg): Exception(msg) { }
+    ArithException(const char* msg): Exception(msg) { }
     // Destructor
     virtual ~ArithException() { }
     virtual std::string toString() const {
diff -dur cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp
--- cvc3-2.1.ORIG/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-16 09:34:37.696911611 -0600
+++ cvc3-2.1/src/theory_bitvector/bitvector_theorem_producer.cpp	2009-10-16 09:36:54.411809170 -0600
@@ -28,6 +28,7 @@
 // This code is trusted
 #define _CVC3_TRUSTED_
 
+#include <cstdio>
 #include "bitvector_theorem_producer.h"
 #include "common_proof_rules.h"
 #include "theory_core.h"
diff -dur cvc3-2.1.ORIG/src/util/debug.cpp cvc3-2.1/src/util/debug.cpp
--- cvc3-2.1.ORIG/src/util/debug.cpp	2009-03-03 10:31:33.000000000 -0700
+++ cvc3-2.1/src/util/debug.cpp	2009-10-16 09:34:46.144161887 -0600
@@ -19,6 +19,7 @@
  */
 /*****************************************************************************/
 
+#include <cstdlib>
 #include <fstream>
 #include <stdlib.h>
 
diff -dur cvc3-2.1.ORIG/src/util/rational-gmp.cpp cvc3-2.1/src/util/rational-gmp.cpp
--- cvc3-2.1.ORIG/src/util/rational-gmp.cpp	2008-11-14 13:49:11.000000000 -0700
+++ cvc3-2.1/src/util/rational-gmp.cpp	2009-10-16 09:34:46.145125371 -0600
@@ -24,6 +24,7 @@
 #include "compat_hash_set.h"
 #include "rational.h"
 
+#include <climits>
 #include <sstream>
 #include <gmp.h>
 #include <limits.h>