diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
index 05978b085a..8a034e819e 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
@@ -21,7 +21,7 @@
 #include <vector>
 #include <set>
 
-#include <d3d9.h>
+#include <d3dx9.h>
 
 #include "Common.h"
 
@@ -51,7 +51,7 @@ void Close();
 void Shutdown();
 
 // Direct access to the device.
-extern IDirect3DDevice9 *dev;
+extern LPDIRECT3DDEVICE9 dev;
 extern bool bFrameInProgress;
 
 void Reset();
@@ -115,7 +115,7 @@ struct AALevel
 		ms_setting = m; 
 		qual_setting = q;
 	}
-    char name[32];
+	char name[32];
 	D3DMULTISAMPLE_TYPE ms_setting;
 	int qual_setting;
 };
@@ -140,4 +140,4 @@ int GetNumAdapters();
 
 }  // namespace
 
-#endif
+#endif
\ No newline at end of file
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
index 7e67a16955..0f94025832 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
@@ -46,7 +46,7 @@ struct TabDirect3D : public W32Util::Tab
 		for (int i = 0; i < D3D::GetNumAdapters(); i++)
 		{
 			const D3D::Adapter &adapter = D3D::GetAdapter(i);
-			stprintf_s( tempstr, _T("%hs"), adapter.ident.Description );
+			swprintf_s( tempstr, _T("%hs"), adapter.ident.Description );
 			ComboBox_AddString(GetDlgItem(hDlg, IDC_ADAPTER), tempstr);
 		}
 
@@ -55,7 +55,7 @@ struct TabDirect3D : public W32Util::Tab
 
 		for (int i = 0; i < (int)adapter.aa_levels.size(); i++)
 		{
-			stprintf_s( tempstr, _T("%hs"), adapter.aa_levels[i].name );
+			swprintf_s( tempstr, _T("%hs"), adapter.aa_levels[i].name );
 			ComboBox_AddString(GetDlgItem(hDlg, IDC_ANTIALIASMODE), tempstr);
 		}