Disconnect Wiimotes before WPAD_Shutdown

source/StartUpProcess.cpp

@@ -6,6 +6,7 @@
 #include "input.h"
 #include "themes/CTheme.h"
 #include "gecko.h"
+#include "wpad.h"
 #include "Controls/DeviceHandler.hpp"
 #include "wad/nandtitle.h"
 #include "SystemMenu/SystemMenuResources.h"
@@ -298,7 +299,7 @@ int StartUpProcess::Execute()
 			USBStorage2_Deinit();
 
 		// Shut down pads
-		WPAD_Shutdown();
+		Wpad_Disconnect();
 
 		// Loading now the cios setup in the settings
 		IosLoader::LoadAppCios();

source/sys.cpp

@@ -1,6 +1,5 @@
 #include <gctypes.h>
 #include <ogc/system.h>
-#include <wiiuse/wpad.h>
 
 #include "mload/mload.h"
 #include "banner/BannerAsync.h"
@@ -26,6 +25,7 @@
 #include "menu.h"
 #include "video.h"
 #include "gecko.h"
+#include "wpad.h"
 #include "wad/nandtitle.h"
 
 extern "C"
@@ -116,7 +116,7 @@ void AppCleanUp(void)
 
 	ResourceManager::DestroyInstance();
 
-	WPAD_Shutdown();
+	Wpad_Disconnect();
 	ISFS_Deinitialize();
 }