diff --git a/src/hardware/gameblaster.cpp b/src/hardware/gameblaster.cpp
index bd13f447..d749e984 100644
--- a/src/hardware/gameblaster.cpp
+++ b/src/hardware/gameblaster.cpp
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <math.h>
 #include "dosbox.h"
 #include "inout.h"
 #include "mixer.h"
@@ -24,6 +23,9 @@
 #include "hardware.h"
 #include "setup.h"
 #include "pic.h"
+#include <cstring>
+#include <math.h>
+
 
 #define LEFT	0x00
 #define RIGHT	0x01
diff --git a/src/hardware/tandy_sound.cpp b/src/hardware/tandy_sound.cpp
index 23d10421..0dcb4b5c 100644
--- a/src/hardware/tandy_sound.cpp
+++ b/src/hardware/tandy_sound.cpp
@@ -20,7 +20,6 @@
 	Based of sn76496.c of the M.A.M.E. project
 */
 
-#include <math.h>
 #include "dosbox.h"
 #include "inout.h"
 #include "mixer.h"
@@ -28,6 +27,8 @@
 #include "setup.h"
 #include "pic.h"
 #include "dma.h"
+#include <cstring>
+#include <math.h>
 
 #define DAC_CLOCK 3570000
 #define MAX_OUTPUT 0x7fff
diff --git a/src/shell/shell_cmds.cpp b/src/shell/shell_cmds.cpp
index 0574bfae..3c1a3f48 100644
--- a/src/shell/shell_cmds.cpp
+++ b/src/shell/shell_cmds.cpp
@@ -16,17 +16,19 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell_cmds.cpp,v 1.78 2007-08-17 17:58:46 qbix79 Exp $ */
+/* $Id: shell_cmds.cpp,v 1.79 2007-10-16 07:29:22 qbix79 Exp $ */
 
-#include <string.h>
-#include <ctype.h>
-#include <vector>
-#include <string>
+#include "dosbox.h"
 #include "shell.h"
 #include "callback.h"
 #include "regs.h"
 #include "../dos/drives.h"
 #include "support.h"
+#include <cstring>
+#include <cctype>
+#include <cstdlib>
+#include <vector>
+#include <string>
 
 static SHELL_Cmd cmd_list[]={
 {	"CHDIR",	1,			&DOS_Shell::CMD_CHDIR,		"SHELL_CMD_CHDIR_HELP"},