Merge branch 'accurate' into accurateAddStddefWhenNeeded

# Conflicts:
#	src/Sound.cpp

src/Back.cpp

@@ -7,11 +7,7 @@
 
 #include "CommonDefines.h"
 #include "Draw.h"
-#include "Frame.h"
-#include "Game.h"
 #include "Main.h"
-#include "Map.h"
-#include "Stage.h"
 
 BACK gBack;
 int gWaterY;

src/Draw.cpp

@@ -2,7 +2,6 @@
 
 #include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <ddraw.h>

src/Input.cpp

@@ -2,7 +2,6 @@
 
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 
 #if defined(_MSC_VER) && _MSC_VER >= 1500	// Newer versions of Visual Studio don't support anything earlier than DirectInput8
 #define DIRECTINPUT_VERSION 0x800

src/NpChar.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "CommonDefines.h"
 #include "WindowsWrapper.h"
 
 #include "Draw.h"

src/Organya.cpp

@@ -7,7 +7,6 @@
 #include "Organya.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -256,7 +255,7 @@ void ChangeOrganPan(unsigned char key, unsigned char pan, signed char track)	//
 	if (lpDS == NULL)
 		return;
 
-	if (old_key[track] != PANDUMMY)
+	if (old_key[track] != KEYDUMMY)
 		lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetPan((pan_tbl[pan] - 0x100) * 10);
 }
 
@@ -265,7 +264,7 @@ void ChangeOrganVolume(int no, long volume, signed char track)	// 300がMAXで30
 	if (lpDS == NULL)
 		return;
 
-	if (old_key[track] != VOLDUMMY)
+	if (old_key[track] != KEYDUMMY)
 		lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetVolume((volume - 0xFF) * 8);
 }
 

src/Sound.cpp

@@ -12,7 +12,7 @@ equivalents.
 
 #include "Sound.h"
 
-#include <math.h>
+#include <stddef.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>

src/Sound.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <stddef.h>
-
 #ifndef DIRECTSOUND_VERSION
 #define DIRECTSOUND_VERSION 0x500
 #endif