diff --git a/stepmania/src/smpackage/ChangeGameSettings.cpp b/stepmania/src/smpackage/ChangeGameSettings.cpp
index d55d579921..7632dd52a5 100644
--- a/stepmania/src/smpackage/ChangeGameSettings.cpp
+++ b/stepmania/src/smpackage/ChangeGameSettings.cpp
@@ -13,6 +13,7 @@
 #include "archutils/Win32/DialogUtil.h"
 #include "LocalizedString.h"
 #include "RageUtil.h"
+#include "arch/Dialog/Dialog.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
diff --git a/stepmania/src/smpackage/EditInsallations.cpp b/stepmania/src/smpackage/EditInsallations.cpp
index cb864761fa..72e8507d10 100644
--- a/stepmania/src/smpackage/EditInsallations.cpp
+++ b/stepmania/src/smpackage/EditInsallations.cpp
@@ -11,6 +11,7 @@
 #include ".\editinsallations.h"
 #include "LocalizedString.h"
 #include "RageUtil.h"
+#include "arch/Dialog/Dialog.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
diff --git a/stepmania/src/smpackage/LanguagesDlg.cpp b/stepmania/src/smpackage/LanguagesDlg.cpp
index a84a2315f7..fb768c0e96 100644
--- a/stepmania/src/smpackage/LanguagesDlg.cpp
+++ b/stepmania/src/smpackage/LanguagesDlg.cpp
@@ -19,6 +19,7 @@
 #include "CsvFile.h"
 #include "archutils/Win32/DialogUtil.h"
 #include "LocalizedString.h"
+#include "arch/Dialog/Dialog.h"
 
 // LanguagesDlg dialog
 
@@ -357,7 +358,7 @@ void LanguagesDlg::OnBnClickedButtonImport()
 	RString sLanguageFile = GetLanguageFile( sTheme, sLanguage );
 
 	{
-		Dialog::Result ret = Dialog::RetryCancel( ssprintf(IMPORTING_THESE_STRINGS_WILL_OVERRIDE.GetValue(),sLanguageFile.c_str()), NULL, MB_OKCANCEL );
+		Dialog::Result ret = Dialog::AbortRetry( ssprintf(IMPORTING_THESE_STRINGS_WILL_OVERRIDE.GetValue(),sLanguageFile.c_str()) );
 		if( ret != Dialog::retry )
 			return;
 	}
diff --git a/stepmania/src/smpackage/MainMenuDlg.cpp b/stepmania/src/smpackage/MainMenuDlg.cpp
index 1c0c283766..bddf698fbb 100644
--- a/stepmania/src/smpackage/MainMenuDlg.cpp
+++ b/stepmania/src/smpackage/MainMenuDlg.cpp
@@ -21,6 +21,7 @@
 #include "archutils/Win32/DialogUtil.h"
 #include "LocalizedString.h"
 #include "RageFileManager.h"
+#include "arch/Dialog/Dialog.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
diff --git a/stepmania/src/smpackage/SMPackageInstallDlg.cpp b/stepmania/src/smpackage/SMPackageInstallDlg.cpp
index aa2fe5284f..7c3b77f5ca 100644
--- a/stepmania/src/smpackage/SMPackageInstallDlg.cpp
+++ b/stepmania/src/smpackage/SMPackageInstallDlg.cpp
@@ -18,6 +18,7 @@
 #include "archutils/Win32/DialogUtil.h"
 #include "LocalizedString.h"
 #include "RageLog.h"
+#include "arch/Dialog/Dialog.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -276,7 +277,7 @@ void CSMPackageInstallDlg::OnOK()
 	int iSelectedInstallDirIndex = m_comboDir.GetCurSel();
 	if( iSelectedInstallDirIndex == -1 )
 	{
-		Dialog::OK( NO_INSTALLATIONS.GetValue(), NULL, MB_OK|MB_ICONEXCLAMATION );
+		Dialog::OK( NO_INSTALLATIONS.GetValue() );
 		return;
 	}
 
diff --git a/stepmania/src/smpackage/SMPackageUtil.cpp b/stepmania/src/smpackage/SMPackageUtil.cpp
index 1466770485..2b59ccc441 100644
--- a/stepmania/src/smpackage/SMPackageUtil.cpp
+++ b/stepmania/src/smpackage/SMPackageUtil.cpp
@@ -8,6 +8,7 @@
 #include "RageFileManager.h"	
 #include "resource.h"	
 #include "LocalizedString.h"
+#include "arch/Dialog/Dialog.h"
 
 static const RString SMPACKAGE_KEY = "HKEY_LOCAL_MACHINE\\Software\\StepMania\\smpackage";
 static const RString INSTALLATIONS_KEY = "HKEY_LOCAL_MACHINE\\Software\\StepMania\\smpackage\\Installations";
diff --git a/stepmania/src/smpackage/SmpackageExportDlg.cpp b/stepmania/src/smpackage/SmpackageExportDlg.cpp
index bb99eee249..cd6a702a77 100644
--- a/stepmania/src/smpackage/SmpackageExportDlg.cpp
+++ b/stepmania/src/smpackage/SmpackageExportDlg.cpp
@@ -18,6 +18,7 @@
 #include "archutils/Win32/DialogUtil.h"
 #include "LocalizedString.h"
 #include "RageFileDriverDirect.h"
+#include "arch/Dialog/Dialog.h"
 
 #include <vector>
 #include <algorithm>
diff --git a/stepmania/src/smpackage/smpackage.cpp b/stepmania/src/smpackage/smpackage.cpp
index 703683cde8..a410294071 100644
--- a/stepmania/src/smpackage/smpackage.cpp
+++ b/stepmania/src/smpackage/smpackage.cpp
@@ -14,6 +14,7 @@
 #include "SpecialFiles.h"
 #include "IniFile.h"
 #include "LocalizedString.h"
+#include "arch/Dialog/Dialog.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW