diff --git a/pcsx2/CDVD/CDVDisoReader.cpp b/pcsx2/CDVD/CDVDisoReader.cpp
index d8c562cb21..7399b07928 100644
--- a/pcsx2/CDVD/CDVDisoReader.cpp
+++ b/pcsx2/CDVD/CDVDisoReader.cpp
@@ -27,10 +27,6 @@
 
 #include "CDVDisoReader.h"
 
-#ifndef MAX_PATH
-#define MAX_PATH 255
-#endif
-
 bool loadFromISO=false;
 
 char isoFileName[256];
diff --git a/pcsx2/CDVD/CDVDisoReader.h b/pcsx2/CDVD/CDVDisoReader.h
index a9cc1ca580..e3776a0018 100644
--- a/pcsx2/CDVD/CDVDisoReader.h
+++ b/pcsx2/CDVD/CDVDisoReader.h
@@ -34,6 +34,11 @@
 #include "IsoFileFormats.h"
 
 #define CDVD_LOG __Log
+
+#ifndef MAX_PATH
+#define MAX_PATH 255
+#endif
+
 extern FILE *cdvdLog;
 
 void __Log(char *fmt, ...);
@@ -43,7 +48,7 @@ void __Log(char *fmt, ...);
 
 extern char isoFileName[256];
 
-extern isoFile *blockDumpFile;
+//extern isoFile *blockDumpFile;
 extern isoFile *iso;
 
 s32  ISOinit();
diff --git a/pcsx2/CDVD/Makefile.am b/pcsx2/CDVD/Makefile.am
index af49f26622..16f646a2e0 100644
--- a/pcsx2/CDVD/Makefile.am
+++ b/pcsx2/CDVD/Makefile.am
@@ -14,6 +14,7 @@ noinst_LIBRARIES = libps2_cdvd.a
 libps2_cdvd_a_SOURCES = \
 CDVD.cpp IsoFStools.cpp  IsoFSdrv.cpp  CdRom.cpp \
 CDVD.h CDVD_internal.h IsoFStools.h IsoFSdrv.h IsoFScdvd.h CdRom.h  \
-CDVDisoReader.cpp CDVDisoReader.h CDVDaccess.cpp CDVDaccess.h
+CDVDisoReader.cpp CDVDisoReader.h CDVDaccess.cpp CDVDaccess.h \
+IsoFileFormats.cpp IsoFileFormats.h
 
 #SUBDIRS =