diff --git a/src/Misc.cpp b/src/Misc.cpp
index 44770d1f2..a6ac71144 100644
--- a/src/Misc.cpp
+++ b/src/Misc.cpp
@@ -4,13 +4,9 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <math.h>
-#include "misc.h"
 #include "Config.h"
-//#include "interface.h"
-//#include "graphics.h"
-//#include "powder.h"
-//#include <icondoc.h>
-//#include <update.h>
+#include "Misc.h"
+#include "icondoc.h"
 #if defined WIN32
 #include <shlobj.h>
 #include <shlwapi.h>
@@ -47,7 +43,7 @@ char *exe_name(void)
 	}
 	res = 1;
 #else
-	char fn[64], *name=malloc(64);
+	char fn[64], *name=(char *)malloc(64);
 	size_t max=64, res;
 	sprintf(fn, "/proc/self/exe");
 	memset(name, 0, max);
@@ -544,7 +540,7 @@ int register_extension()
 "Comment=Physics sandbox game\n"
 "MimeType=application/vnd.powdertoy.save;\n"
 "NoDisplay=true\n";
-	char *desktopfiledata = malloc(strlen(desktopfiledata_tmp)+strlen(currentfilename)+100);
+	char *desktopfiledata = (char *)malloc(strlen(desktopfiledata_tmp)+strlen(currentfilename)+100);
 	strcpy(desktopfiledata, desktopfiledata_tmp);
 	strappend(desktopfiledata, "Exec=");
 	strappend(desktopfiledata, currentfilename);
diff --git a/src/elements/watr.cpp b/src/elements/watr.cpp
index b44fa22ca..9451a8298 100644
--- a/src/elements/watr.cpp
+++ b/src/elements/watr.cpp
@@ -1,4 +1,4 @@
-#include "simulation/element.h"
+#include "simulation/Element.h"
 
 int update_WATR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/simulation/Air.cpp b/src/simulation/Air.cpp
index 2d8d1b5b1..b3826ab2d 100644
--- a/src/simulation/Air.cpp
+++ b/src/simulation/Air.cpp
@@ -3,7 +3,7 @@
 #include "Air.h"
 //#include <powder.h>
 //#include <defines.h>
-#include "gravity.h"
+#include "Gravity.h"
 
 /*float kernel[9];
 
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index a1a785a1f..96b9d448a 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -1,13 +1,11 @@
 #include <cstdlib>
 #include <math.h>
-#define _cplusplus
 #include "Config.h"
 #include "Simulation.h"
 #include "Elements.h"
 #include "ElementFunctions.h"
 #include "Air.h"
 #include "Gravity.h"
-//#include "powder.h"
 
 void Simulation::clear_area(int area_x, int area_y, int area_w, int area_h)
 {
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index b3c51af66..969b0307e 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -12,7 +12,7 @@
 #include "Renderer.h"
 #include "Graphics.h"
 #include "Elements.h"
-#include "misc.h"
+#include "Misc.h"
 
 #define CHANNELS ((int)(MAX_TEMP-73)/100+2)