diff --git a/src/CommonDefines.h b/src/CommonDefines.h
index 1393bccc..e57af2f5 100644
--- a/src/CommonDefines.h
+++ b/src/CommonDefines.h
@@ -3,15 +3,15 @@
 #define WINDOW_WIDTH 320
 #define WINDOW_HEIGHT 240
 
-#define TILES_TO_PIXELS(x) ((x) * 0x10)
-#define PIXELS_TO_TILES(x) ((x) / 0x10)
-#define PIXELS_TO_UNITS(x) ((x) * 0x200)
-#define UNITS_TO_PIXELS(x) ((x) / 0x200)
-#define TILES_TO_UNITS(x) ((x) * (0x200 * 0x10))
-#define UNITS_TO_TILES(x) ((x) / (0x200 * 0x10))
+#define TILES_TO_PIXELS(x) ((int)((x) * 0x10))
+#define PIXELS_TO_TILES(x) ((int)((x) / 0x10))
+#define PIXELS_TO_UNITS(x) ((int)((x) * 0x200))
+#define UNITS_TO_PIXELS(x) ((int)((x) / 0x200))
+#define TILES_TO_UNITS(x) ((int)((x) * (0x200 * 0x10)))
+#define UNITS_TO_TILES(x) ((int)((x) / (0x200 * 0x10)))
 
-#define SECONDS_TO_FRAMES(x) ((x) * 50)
-#define FRAMES_TO_SECONDS(x) ((x) / 50)
+#define SECONDS_TO_FRAMES(x) ((int)((x) * 50))
+#define FRAMES_TO_SECONDS(x) ((int)((x) / 50))
 
 enum Collisions
 {