diff -rupN bo2k_console-0.0.2preb/src/cmdhandler.h bo2k_console-0.0.2pre/src/cmdhandler.h
--- bo2k_console-0.0.2preb/src/cmdhandler.h	2009-01-21 17:59:01.000000000 -0400
+++ bo2k_console-0.0.2pre/src/cmdhandler.h	2009-01-21 18:03:26.000000000 -0400
@@ -1,6 +1,7 @@
 /** @file
  * Header file for the commands handler. */
 
+#include <cstring>
 #include <string>
 #include <map>
 
diff -rupN bo2k_console-0.0.2preb/src/commands.cpp bo2k_console-0.0.2pre/src/commands.cpp
--- bo2k_console-0.0.2preb/src/commands.cpp	2009-01-21 17:59:01.000000000 -0400
+++ bo2k_console-0.0.2pre/src/commands.cpp	2009-01-21 17:59:42.000000000 -0400
@@ -4,6 +4,7 @@
 #include "commands.h"
 #include "main.h"
 #include "parser.h"
+#include <cstdlib>
 #ifdef DEBUG
 #include <stdio.h>
 #endif
diff -rupN bo2k_console-0.0.2preb/src/inputloop.cpp bo2k_console-0.0.2pre/src/inputloop.cpp
--- bo2k_console-0.0.2preb/src/inputloop.cpp	2009-01-21 17:59:01.000000000 -0400
+++ bo2k_console-0.0.2pre/src/inputloop.cpp	2009-01-21 18:02:38.000000000 -0400
@@ -1,5 +1,6 @@
-#include <iostream.h>
-#include <string>
+#include <iostream>
+#include <cstring>
+#include <cstdlib>
 
 // For stat()
 #include <sys/types.h>
@@ -8,8 +9,6 @@
 #include <unistd.h>
 #endif
 #include <errno.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "cmdhandler.h"
 #include "getline.h"
@@ -37,7 +36,7 @@ int exec_file(const char* filename) {
 				return 3;
 		}
 
-		cout << buf << " : " <<  result.c_str() << endl;
+		std::cout << buf << " : " <<  result.c_str() << std::endl;
 	}
 	fclose(script);
 	return error ? 2 : 0;
@@ -96,16 +95,16 @@ int inputloop() {
 
 		switch (g_cmdHandler.evalLine(cmd, &result)) {
 		case 2:
-			cout << "Hope you enjoyed the Bo2k Console Client\n";
-			term = true;
-			break;
+		      std::cout << "Hope you enjoyed the Bo2k Console Client\n";
+		      term = true;
+		      break;
 		case -1:
-			cerr << "Command '" << cmd << "' not known." <<
-				"Type 'help' for a listing of known commands.\n";
-			break;
+		      std::cerr << "Command '" << cmd << "' not known." <<
+			"Type 'help' for a listing of known commands.\n";
+		      break;
 		default:
-			cout << result.c_str() << endl;
-			break;
+		      std::cout << result.c_str() << std::endl;
+		      break;
 		}
 	}
 	return 0;