diff --git a/src/common.h b/src/common.h
index ab7cd62..31cdd84 100644
--- a/src/common.h
+++ b/src/common.h
@@ -25,9 +25,6 @@
 typedef uint8_t uint8;
 typedef uint16_t uint16;
 typedef uint32_t uint32;
-typedef int8_t int8;
-typedef int16_t int16;
-typedef int32_t int32;
 
 #define ERROR sys_error
 #define WARNING(fmt, ...) sys_warning("%s:%d: " fmt "\n", __func__, __LINE__, ##__VA_ARGS__)
diff --git a/src/win/mako.cpp b/src/win/mako.cpp
index 1deb987..fa02c9d 100644
--- a/src/win/mako.cpp
+++ b/src/win/mako.cpp
@@ -30,9 +30,9 @@ const int SAMPLE_RATE = 44100;
 //
 // When the game uses "Z 100+x,y" command, the xth element of the array should
 // be y.  The array must be terminated with -1.
-const int8 RANCE41_tracks[] = {2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,1,-1};
-const int8 RANCE42_tracks[] = {2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,1,-1};
-const int8 DPSALL_tracks[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,5,1,2,3,-1};
+const int8_t RANCE41_tracks[] = {2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,1,-1};
+const int8_t RANCE42_tracks[] = {2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,1,-1};
+const int8_t DPSALL_tracks[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,5,1,2,3,-1};
 
 enum MakoThreadMessage {
 	MAKO_OPEN = WM_APP,
@@ -358,7 +358,7 @@ void MAKO::select_sound(BGMDevice dev)
 		break;
 
 	case BGM_CD:
-		const int8* tracks;
+		const int8_t* tracks;
 
 		switch (game_id.game) {
 		case GameId::RANCE41: