diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index b12e50dc2d..e917978950 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -299,6 +299,7 @@ set(pcsx2GuiSources
 	gui/Dialogs/AboutBoxDialog.cpp
 	gui/Dialogs/AppConfigDialog.cpp
 	gui/Dialogs/AssertionDialog.cpp
+	gui/Panels/BaseApplicableConfigPanel.cpp
 	gui/Dialogs/BaseConfigurationDialog.cpp
 	gui/Dialogs/BaseConfigurationDialog.inl
 	gui/Dialogs/BiosSelectorDialog.cpp
@@ -318,6 +319,8 @@ set(pcsx2GuiSources
 	gui/MainFrame.cpp
 	gui/MainMenuClicks.cpp
 	gui/MemoryCardFile.cpp
+	gui/Panels/MemoryCardListPanel.cpp
+	gui/Panels/MemoryCardListView.h
 	gui/MessageBoxes.cpp
 	gui/MSWstuff.cpp
 	gui/Panels/AudioPanel.cpp
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index 9f934856f7..021d29372c 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -392,6 +392,7 @@
 		<Unit filename="../gui/MemoryCardFile.cpp" />
 		<Unit filename="../gui/MessageBoxes.cpp" />
 		<Unit filename="../gui/Panels/AudioPanel.cpp" />
+		<Unit filename="../gui/Panels/BaseApplicableConfigPanel.cpp" />
 		<Unit filename="../gui/Panels/BaseConfigPanel.h" />
 		<Unit filename="../gui/Panels/BiosSelectorPanel.cpp" />
 		<Unit filename="../gui/Panels/ConfigurationPanels.h" />
@@ -401,6 +402,8 @@
 		<Unit filename="../gui/Panels/GameFixesPanel.cpp" />
 		<Unit filename="../gui/Panels/LogOptionsPanels.cpp" />
 		<Unit filename="../gui/Panels/LogOptionsPanels.h" />
+		<Unit filename="../gui/Panels/MemoryCardListPanel.cpp" />
+		<Unit filename="../gui/Panels/MemoryCardListView.h" />
 		<Unit filename="../gui/Panels/MemoryCardsPanel.cpp" />
 		<Unit filename="../gui/Panels/MiscPanelStuff.cpp" />
 		<Unit filename="../gui/Panels/PathsPanel.cpp" />
diff --git a/pcsx2/Vif_Transfer.cpp b/pcsx2/Vif_Transfer.cpp
index 7a7fe16181..87725654e7 100644
--- a/pcsx2/Vif_Transfer.cpp
+++ b/pcsx2/Vif_Transfer.cpp
@@ -44,7 +44,7 @@ _vifT bool analyzeIbit(u32* &data, int iBit) {
 
 // Interprets packet
 _vifT void vifTransferLoop(u32* &data) {
-	u32& tSize = vifX.tag.size;
+	//u32& tSize = vifX.tag.size;
 	u32& pSize = vifX.vifpacketsize;
 	int  iBit  = vifX.cmd >> 7;
 
diff --git a/pcsx2/gui/Panels/DirPickerPanel.cpp b/pcsx2/gui/Panels/DirPickerPanel.cpp
index cc9b57c92e..cb7c783174 100644
--- a/pcsx2/gui/Panels/DirPickerPanel.cpp
+++ b/pcsx2/gui/Panels/DirPickerPanel.cpp
@@ -209,7 +209,11 @@ void Panels::DirPickerPanel::Apply()
 
 wxDirName Panels::DirPickerPanel::GetPath() const
 {
-	return wxDirName( m_pickerCtrl ? m_pickerCtrl->GetPath() : wxEmptyString );
+	// The (x) ? y : z construct doesn't like y and z to be different types in gcc.
+	if (m_pickerCtrl)
+		return wxDirName(m_pickerCtrl->GetPath());
+	else
+		return wxDirName(wxEmptyString);
 }
 
 void Panels::DirPickerPanel::SetPath( const wxString& newPath )