diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp
index ec43b38484..b670be635d 100644
--- a/Source/Core/Common/NandPaths.cpp
+++ b/Source/Core/Common/NandPaths.cpp
@@ -2,19 +2,16 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/NandPaths.h"
+
 #include <algorithm>
 #include <string>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
 #include "Common/FileUtil.h"
-#include "Common/Logging/Log.h"
-#include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
-#include "Common/Swap.h"
 
 namespace Common
 {
@@ -31,10 +28,10 @@ std::string GetImportTitlePath(u64 title_id, FromWhichRoot from)
                                                static_cast<u32>(title_id));
 }
 
-std::string GetTicketFileName(u64 _titleID, FromWhichRoot from)
+std::string GetTicketFileName(u64 title_id, FromWhichRoot from)
 {
   return StringFromFormat("%s/ticket/%08x/%08x.tik", RootUserPath(from).c_str(),
-                          (u32)(_titleID >> 32), (u32)_titleID);
+                          static_cast<u32>(title_id >> 32), static_cast<u32>(title_id));
 }
 
 std::string GetTitlePath(u64 title_id, FromWhichRoot from)
@@ -43,19 +40,19 @@ std::string GetTitlePath(u64 title_id, FromWhichRoot from)
                           static_cast<u32>(title_id >> 32), static_cast<u32>(title_id));
 }
 
-std::string GetTitleDataPath(u64 _titleID, FromWhichRoot from)
+std::string GetTitleDataPath(u64 title_id, FromWhichRoot from)
 {
-  return GetTitlePath(_titleID, from) + "data/";
+  return GetTitlePath(title_id, from) + "data/";
 }
 
-std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from)
+std::string GetTitleContentPath(u64 title_id, FromWhichRoot from)
 {
-  return GetTitlePath(_titleID, from) + "content/";
+  return GetTitlePath(title_id, from) + "content/";
 }
 
-std::string GetTMDFileName(u64 _titleID, FromWhichRoot from)
+std::string GetTMDFileName(u64 title_id, FromWhichRoot from)
 {
-  return GetTitleContentPath(_titleID, from) + "title.tmd";
+  return GetTitleContentPath(title_id, from) + "title.tmd";
 }
 
 bool IsTitlePath(const std::string& path, FromWhichRoot from, u64* title_id)
diff --git a/Source/Core/Common/NandPaths.h b/Source/Core/Common/NandPaths.h
index 6ef53a9912..5a1dcffce4 100644
--- a/Source/Core/Common/NandPaths.h
+++ b/Source/Core/Common/NandPaths.h
@@ -5,8 +5,6 @@
 #pragma once
 
 #include <string>
-#include <utility>
-#include <vector>
 
 #include "Common/CommonTypes.h"
 
@@ -23,11 +21,11 @@ std::string RootUserPath(FromWhichRoot from);
 // Returns /import/%08x/%08x. Intended for use by ES.
 std::string GetImportTitlePath(u64 title_id, FromWhichRoot from = FROM_SESSION_ROOT);
 
-std::string GetTicketFileName(u64 _titleID, FromWhichRoot from);
+std::string GetTicketFileName(u64 title_id, FromWhichRoot from);
 std::string GetTitlePath(u64 title_id, FromWhichRoot from);
-std::string GetTitleDataPath(u64 _titleID, FromWhichRoot from);
-std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from);
-std::string GetTMDFileName(u64 _titleID, FromWhichRoot from);
+std::string GetTitleDataPath(u64 title_id, FromWhichRoot from);
+std::string GetTitleContentPath(u64 title_id, FromWhichRoot from);
+std::string GetTMDFileName(u64 title_id, FromWhichRoot from);
 
 // Returns whether a path is within an installed title's directory.
 bool IsTitlePath(const std::string& path, FromWhichRoot from, u64* title_id = nullptr);
diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.h b/Source/Core/Core/HW/GCMemcard/GCMemcard.h
index 54247316dc..d08bb76d7a 100644
--- a/Source/Core/Core/HW/GCMemcard/GCMemcard.h
+++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.h
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <string>
+#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "Common/NandPaths.h"