diff --git a/plugins/LilyPad/Config.h b/plugins/LilyPad/Config.h
index c610dce81c..9e274906d1 100644
--- a/plugins/LilyPad/Config.h
+++ b/plugins/LilyPad/Config.h
@@ -84,8 +84,6 @@ extern GeneralConfig config;
 
 void UnloadConfigs();
 
-void AddIgnore(LPARAM k);
-
 void SetVolume(int volume);
 
 int LoadSettings(int force = 0, wchar_t *file = 0);
diff --git a/plugins/LilyPad/Global.h b/plugins/LilyPad/Global.h
index 7c6162d13b..0398ae94c5 100644
--- a/plugins/LilyPad/Global.h
+++ b/plugins/LilyPad/Global.h
@@ -106,6 +106,7 @@ EXPORT_C_(void) PADconfigure();
 EXPORT_C_(s32) PADfreeze(int mode, freezeData *data);
 EXPORT_C_(s32) PADsetSlot(u8 port, u8 slot);
 EXPORT_C_(s32) PADqueryMtap(u8 port);
+EXPORT_C_(void) PADsetSettingsDir(const char *dir);
 
 #ifdef NO_CRT
 
diff --git a/plugins/LilyPad/InputManager.cpp b/plugins/LilyPad/InputManager.cpp
index 44d1ea0b41..beaec4ff54 100644
--- a/plugins/LilyPad/InputManager.cpp
+++ b/plugins/LilyPad/InputManager.cpp
@@ -221,7 +221,7 @@ void Device::CalcVirtualState() {
 				double East = sin(angle);
 				double South = -cos(angle);
 				// Normalize so greatest direction is 1.
-				double mul = FULLY_DOWN / max(fabs(South), fabs(East));
+				double mul = FULLY_DOWN / std::max(fabs(South), fabs(East));
 				iEast = (int) floor(East * mul + 0.5);
 				iSouth = (int) floor(South * mul + 0.5);
 			}