diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index 9532a06f45..26c32bb0e0 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../PluginSpecs"
+				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;LOGGING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../PluginSpecs"
+				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -192,7 +192,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="../../PluginSpecs"
+				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -340,7 +340,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../PluginSpecs"
+				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -412,7 +412,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../PluginSpecs"
+				AdditionalIncludeDirectories="../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				FloatingPointModel="0"
diff --git a/Source/Core/Common/Src/Common.cpp b/Source/Core/Common/Src/Common.cpp
index 95136fe577..fc39f4893f 100644
--- a/Source/Core/Common/Src/Common.cpp
+++ b/Source/Core/Common/Src/Common.cpp
@@ -31,7 +31,6 @@ void RegisterPanicAlertHandler(PanicAlertHandler handler)
 	panic_handler = handler;
 }
 
-
 void PanicAlert(const char* format, ...)
 {
 	va_list args;
@@ -49,7 +48,42 @@ void PanicAlert(const char* format, ...)
 		char buffer[2048];
 		CharArrayFromFormatV(buffer, 2048, format, args);
 		LOG(MASTER_LOG, "PANIC: %s", buffer);
-		wxMessageBox(buffer, "PANIC!", wxICON_EXCLAMATION);
+#if defined(HAVE_WX) && HAVE_WX
+		wxMessageBox(wxString::FromAscii(buffer), wxT("PANIC!"), wxICON_EXCLAMATION);
+#else
+		vprintf(format, args);
+        printf("\n");
+#endif
+
+	}
+
+	va_end(args);
+}
+
+void SuccessAlert(const char* format, ...)
+{
+	va_list args;
+	va_start(args, format);
+
+	if (panic_handler)
+	{
+		char buffer[2048];
+		CharArrayFromFormatV(buffer, 2048, format, args);
+		LOG(MASTER_LOG, "SUCCESS: %s", buffer);
+		panic_handler(buffer, false);
+	}
+	else
+	{
+		char buffer[2048];
+		CharArrayFromFormatV(buffer, 2048, format, args);
+		LOG(MASTER_LOG, "SUCCESS: %s", buffer);
+#if defined(HAVE_WX) && HAVE_WX
+		wxMessageBox(wxString::FromAscii(buffer), wxT("SUCCESS!"), wxICON_EXCLAMATION);
+#else
+		vprintf(format, args);
+        printf("\n");
+#endif
+
 	}
 
 	va_end(args);
@@ -64,7 +98,12 @@ bool PanicYesNo(const char* format, ...)
 	char buffer[2048];
 	CharArrayFromFormatV(buffer, 2048, format, args);
 	LOG(MASTER_LOG, "PANIC: %s", buffer);
-	retval = wxYES == wxMessageBox(buffer, "PANIC! Continue?", wxICON_QUESTION | wxYES_NO);
+#if defined(HAVE_WX) && HAVE_WX
+	retval = wxYES == wxMessageBox(wxString::FromAscii(buffer), wxT("PANIC! Continue?"), wxICON_QUESTION | wxYES_NO);
+#else
+		vprintf(format, args);
+        printf("\n");
+#endif
 	va_end(args);
 	return(retval);
 }
@@ -78,7 +117,12 @@ bool AskYesNo(const char* format, ...)
 	char buffer[2048];
 	CharArrayFromFormatV(buffer, 2048, format, args);
 	LOG(MASTER_LOG, "ASK: %s", buffer);
-	retval = wxYES == wxMessageBox(buffer, "Dolphin", wxICON_QUESTION | wxYES_NO);
+#if defined(HAVE_WX) && HAVE_WX
+	retval = wxYES == wxMessageBox(wxString::FromAscii(buffer), wxT("Dolphin"), wxICON_QUESTION | wxYES_NO);
+#else
+		vprintf(format, args);
+        printf("\n");
+#endif
 	va_end(args);
 	return(retval);
 }
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 10a923caa7..d6161e2f4c 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -190,7 +190,8 @@ inline u64 swap64(u64 data) {return(((u64)swap32(data) << 32) | swap32(data >> 3
 
 // Utility functions
 
-void PanicAlert(const char* text, ...);
+void PanicAlert(const char* format, ...);
+void SuccessAlert(const char* format, ...);
 bool PanicYesNo(const char* text, ...);
 bool AskYesNo(const char* text, ...);
 
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp
index 75914170b9..19a643e278 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp
@@ -496,7 +496,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 				break;
 			case OUTOFBLOCKS:
 				blocksOpen.Printf(wxT(E_OUTOFBLOCKS), memoryCard[slot]->GetFreeBlocks());
-				wxMessageBox(blocksOpen, wxT("Error"), wxOK|wxICON_ERROR);
+				PanicAlert(blocksOpen.c_str());
 				break;
 			case OUTOFDIRENTRIES:
 				PanicAlert(E_OUTOFDIRENTRIES);
@@ -532,7 +532,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 				break;
 			case OUTOFBLOCKS:
 				blocksOpen.Printf(wxT(E_OUTOFBLOCKS), memoryCard[slot]->GetFreeBlocks());
-				PanicAlert(blocksOpen);
+				PanicAlert(blocksOpen.c_str());
 				break;
 			case OUTOFDIRENTRIES:
 				PanicAlert(E_OUTOFDIRENTRIES);
@@ -556,7 +556,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 			// Fix checksums and save the changes
 			if (memoryCard[slot]->FixChecksums())
 			{
-				wxMessageBox(wxT("The checksum was successfully fixed"), wxT("Success"), wxOK);
+				SuccessAlert("The checksum was successfully fixed");
 				if (!memoryCard[slot]->Save()) PanicAlert(E_SAVEFAILED);
 			}
 			else PanicAlert(E_NOMEMCARD);
@@ -613,7 +613,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 					break;
 				case OUTOFBLOCKS:
 					blocksOpen.Printf(wxT(E_OUTOFBLOCKS), memoryCard[slot]->GetFreeBlocks());
-					PanicAlert(blocksOpen);
+					PanicAlert(blocksOpen.c_str());
 					break;
 				case OUTOFDIRENTRIES:
 					PanicAlert(E_OUTOFDIRENTRIES);
@@ -631,7 +631,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 					PanicAlert(E_SAVEFAILED);
 					break;
 				case GCS:
-					wxMessageBox(wxT("File converted to .gci"), wxT("Success"), wxOK);
+					SuccessAlert("File converted to .gci");
 					break;
 				case SUCCESS:			
 					memoryCard[slot]->FixChecksums();