diff --git a/src/cdrom/macosx/CDPlayer.h b/src/cdrom/macosx/CDPlayer.h
index 7bbd53071..96fbe23c8 100644
--- a/src/cdrom/macosx/CDPlayer.h
+++ b/src/cdrom/macosx/CDPlayer.h
@@ -23,16 +23,14 @@
 #ifndef __CDPlayer__H__
 #define __CDPlayer__H__ 1
 
+#include <string.h>
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <Carbon/Carbon.h>
 
 #include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/AudioToolbox.h>
 
-#include <SDL.h>
-
-#include <string.h>
-#include <unistd.h> // for usleep
+#include "SDL.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/cdrom/mint/.cvsignore b/src/cdrom/mint/.cvsignore
new file mode 100644
index 000000000..899d53557
--- /dev/null
+++ b/src/cdrom/mint/.cvsignore
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la