diff --git a/jni/Android.mk b/jni/Android.mk
index 91418920..49429584 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -318,7 +318,7 @@ SCSI_CD_SOURCES := $(MEDNAFEN_DIR)/cdrom/scsicd.cpp
 endif
 
 ifeq ($(NEED_CD), 1)
-CDROM_SOURCES := $(MEDNAFEN_DIR)/cdrom/CDAccess.cpp $(MEDNAFEN_DIR)/cdrom/CDAccess_Image.cpp $(MEDNAFEN_DIR)/cdrom/CDUtility.cpp $(MEDNAFEN_DIR)/cdrom/lec.cpp $(MEDNAFEN_DIR)/cdrom/SimpleFIFO.cpp $(MEDNAFEN_DIR)/cdrom/audioreader.cpp $(MEDNAFEN_DIR)/cdrom/galois.cpp $(MEDNAFEN_DIR)/cdrom/recover-raw.cpp $(MEDNAFEN_DIR)/cdrom/l-ec.cpp $(MEDNAFEN_DIR)/cdrom/cdromif.cpp $(MEDNAFEN_DIR)/cdrom/cd_crc32.cpp
+CDROM_SOURCES := $(MEDNAFEN_DIR)/cdrom/CDAccess.cpp $(MEDNAFEN_DIR)/cdrom/CDAccess_Image.cpp $(MEDNAFEN_DIR)/cdrom/CDUtility.cpp $(MEDNAFEN_DIR)/cdrom/lec.cpp $(MEDNAFEN_DIR)/cdrom/SimpleFIFO.cpp $(MEDNAFEN_DIR)/cdrom/audioreader.cpp $(MEDNAFEN_DIR)/cdrom/galois.cpp $(MEDNAFEN_DIR)/cdrom/recover-raw.cpp $(MEDNAFEN_DIR)/cdrom/l-ec.cpp $(MEDNAFEN_DIR)/cdrom/cdromif.cpp
 FLAGS += -DNEED_CD
 endif
 
diff --git a/mednafen/cdrom/CDAccess.cpp b/mednafen/cdrom/CDAccess.cpp
index 81588301..089f2006 100644
--- a/mednafen/cdrom/CDAccess.cpp
+++ b/mednafen/cdrom/CDAccess.cpp
@@ -15,12 +15,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../mednafen.h"
 
-#include <sys/types.h>
 #include <sys/stat.h>
+#ifdef _WIN32
+#include <direct.h>
+#else
 #include <unistd.h>
+#endif
 
+#include "../mednafen.h"
 
 #include "CDAccess.h"
 #include "CDAccess_Image.h"
diff --git a/mednafen/cdrom/CDAccess_Image.cpp b/mednafen/cdrom/CDAccess_Image.cpp
index ad5031ac..7b923303 100644
--- a/mednafen/cdrom/CDAccess_Image.cpp
+++ b/mednafen/cdrom/CDAccess_Image.cpp
@@ -30,11 +30,10 @@
 	Trying to read sectors at an LBA of less than 0 is not supported.  TODO: support it(at least up to -150).
 */
 
-#include "../mednafen.h"
-
-#include <sys/types.h>
 #include <sys/stat.h>
 
+#include "../mednafen.h"
+
 #include <string.h>
 #include <errno.h>
 #include <time.h>
diff --git a/mednafen/cdrom/CDUtility.cpp b/mednafen/cdrom/CDUtility.cpp
index 19888cd0..5937b403 100644
--- a/mednafen/cdrom/CDUtility.cpp
+++ b/mednafen/cdrom/CDUtility.cpp
@@ -17,9 +17,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "dvdisaster.h"
 #include "../mednafen.h"
 #include "CDUtility.h"
-#include "dvdisaster.h"
 #include "lec.h"
 
 #include <assert.h>
diff --git a/mednafen/cdrom/audioreader.cpp b/mednafen/cdrom/audioreader.cpp
index 1db4cb82..c3e40d8f 100644
--- a/mednafen/cdrom/audioreader.cpp
+++ b/mednafen/cdrom/audioreader.cpp
@@ -21,12 +21,10 @@
 // Don't allow exceptions to propagate into the vorbis/musepack/etc. libraries, as it could easily leave the state of the library's decoder "object" in an
 // inconsistent state, which would cause all sorts of unfun when we try to destroy it while handling the exception farther up.
 
+#include <sys/stat.h>
 #include "../mednafen.h"
 #include "audioreader.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "../tremor/ivorbisfile.h"
 
 #ifdef HAVE_LIBSNDFILE