diff --git a/Source/Core/DiscIO/Src/Blob.cpp b/Source/Core/DiscIO/Src/Blob.cpp
index ba02e98b3c..82a3c027fb 100644
--- a/Source/Core/DiscIO/Src/Blob.cpp
+++ b/Source/Core/DiscIO/Src/Blob.cpp
@@ -2,14 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "FileUtil.h"
-#include "CDUtils.h"
 #include "Blob.h"
-#include "CompressedBlob.h"
-#include "FileBlob.h"
+#include "CDUtils.h"
 #include "CISOBlob.h"
+#include "CompressedBlob.h"
 #include "DriveBlob.h"
+#include "FileBlob.h"
+#include "FileUtil.h"
 #include "WbfsBlob.h"
 
 namespace DiscIO
diff --git a/Source/Core/DiscIO/Src/Blob.h b/Source/Core/DiscIO/Src/Blob.h
index c332257c8f..66c21a4ca5 100644
--- a/Source/Core/DiscIO/Src/Blob.h
+++ b/Source/Core/DiscIO/Src/Blob.h
@@ -15,7 +15,7 @@
 // detect whether the file is a compressed blob, or just a big hunk of data, or a drive, and
 // automatically do the right thing.
 
-#include "Common.h"
+#include "CommonTypes.h"
 
 namespace DiscIO
 {
diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp
index b469dedc9c..9ee59fa28e 100644
--- a/Source/Core/DiscIO/Src/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp
@@ -9,7 +9,6 @@
 #include <unistd.h>
 #endif
 
-#include "Common.h"
 #include "CompressedBlob.h"
 #include "DiscScrubber.h"
 #include "FileUtil.h"
diff --git a/Source/Core/DiscIO/Src/DiscScrubber.cpp b/Source/Core/DiscIO/Src/DiscScrubber.cpp
index fc4c01be31..3724ad2e9f 100644
--- a/Source/Core/DiscIO/Src/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/Src/DiscScrubber.cpp
@@ -13,7 +13,7 @@ namespace DiscIO
 namespace DiscScrubber
 {
 
-#define	CLUSTER_SIZE 0x8000
+#define CLUSTER_SIZE 0x8000
 
 u8* m_FreeTable = NULL;
 u64 m_FileSize;
diff --git a/Source/Core/DiscIO/Src/DiscScrubber.h b/Source/Core/DiscIO/Src/DiscScrubber.h
index 01ea1d8393..de4b9a683a 100644
--- a/Source/Core/DiscIO/Src/DiscScrubber.h
+++ b/Source/Core/DiscIO/Src/DiscScrubber.h
@@ -14,7 +14,7 @@
 #ifndef DISC_SCRUBBER_H
 #define DISC_SCRUBBER_H
 
-#include "Common.h"
+#include "CommonTypes.h"
 #include "Blob.h"
 
 
diff --git a/Source/Core/DiscIO/Src/DriveBlob.cpp b/Source/Core/DiscIO/Src/DriveBlob.cpp
index dc2c58f066..e7b0c70bfd 100644
--- a/Source/Core/DiscIO/Src/DriveBlob.cpp
+++ b/Source/Core/DiscIO/Src/DriveBlob.cpp
@@ -36,8 +36,8 @@ DriveReader::DriveReader(const char *drive)
 		// removal while reading from it.
 		pmrLockCDROM.PreventMediaRemoval = TRUE;
 		DeviceIoControl(hDisc, IOCTL_CDROM_MEDIA_REMOVAL,
-                   &pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
-                   0, &dwNotUsed, NULL);
+					&pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
+					0, &dwNotUsed, NULL);
 	#endif
 #else
 	SectorReader::SetSectorSize(2048);
@@ -67,7 +67,7 @@ DriveReader::~DriveReader()
 	}
 #else
 	file_.Close();
-#endif	
+#endif
 }
 
 DriveReader *DriveReader::Create(const char *drive)
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
index d295986f9e..06e6767638 100644
--- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp
+++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-
 #include "FileHandlerARC.h"
 #include "StringUtil.h"
 #include "Blob.h"
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.h b/Source/Core/DiscIO/Src/FileHandlerARC.h
index 9b5797e902..d423c74ae0 100644
--- a/Source/Core/DiscIO/Src/FileHandlerARC.h
+++ b/Source/Core/DiscIO/Src/FileHandlerARC.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "Common.h"
+#include "CommonTypes.h"
 #include "Filesystem.h"
 
 namespace DiscIO
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
index f095201aff..120e8c8018 100644
--- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
@@ -2,11 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "MathUtil.h"
 #include "CommonPaths.h"
-#include "VolumeDirectory.h"
 #include "FileBlob.h"
+#include "MathUtil.h"
+#include "VolumeDirectory.h"
 
 namespace DiscIO
 {
@@ -484,8 +483,7 @@ static u32 ComputeNameSize(const File::FSTEntry& parentEntry)
 {
 	u32 nameSize = 0;
 	const std::vector<File::FSTEntry>& children = parentEntry.children;
-	for (std::vector<File::FSTEntry>::const_iterator it = children.begin();
-		it != children.end(); ++it)
+	for (auto it = children.cbegin(); it != children.cend(); ++it)
 	{
 		const File::FSTEntry& entry = *it;
 		if (entry.isDirectory)
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.h b/Source/Core/DiscIO/Src/VolumeDirectory.h
index e37eb9275c..31f7d9b255 100644
--- a/Source/Core/DiscIO/Src/VolumeDirectory.h
+++ b/Source/Core/DiscIO/Src/VolumeDirectory.h
@@ -5,11 +5,11 @@
 #ifndef _VOLUME_DIRECTORY
 #define _VOLUME_DIRECTORY
 
-#include "Volume.h"
-#include "Common.h"
-#include "FileUtil.h"
-#include <string>
 #include <map>
+#include <string>
+
+#include "FileUtil.h"
+#include "Volume.h"
 
 //
 // --- this volume type is used for reading files directly from the hard drive ---
diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp
index f7f2b7ea40..a172229684 100644
--- a/Source/Core/DiscIO/Src/VolumeGC.cpp
+++ b/Source/Core/DiscIO/Src/VolumeGC.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "stdafx.h"
-
 #include "VolumeGC.h"
 #include "StringUtil.h"
 #include "FileMonitor.h"
diff --git a/Source/Core/DiscIO/Src/WiiWad.h b/Source/Core/DiscIO/Src/WiiWad.h
index 6f75585ecf..6483c10f52 100644
--- a/Source/Core/DiscIO/Src/WiiWad.h
+++ b/Source/Core/DiscIO/Src/WiiWad.h
@@ -9,7 +9,7 @@
 #include <vector>
 #include <map>
 
-#include "Common.h"
+#include "CommonTypes.h"
 #include "Blob.h"
 #include "Volume.h"