5 files changed, 6 insertions, 7 deletions
diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp
index fd110987e6..1da5f8a6fb 100644
--- a/plugins/Weather/src/weather.cpp
+++ b/plugins/Weather/src/weather.cpp
@@ -70,7 +70,7 @@ static const PLUGININFOEX pluginInfoEx =
 	__COPYRIGHT,
 	__AUTHORWEB,
 	UNICODE_AWARE,
-	// {6B612A34-DCF2-4e32-85CF-B6FD006B745E}
+	// {6B612A34-DCF2-4E32-85CF-B6FD006B745E}
 	{0x6b612a34, 0xdcf2, 0x4e32, {0x85, 0xcf, 0xb6, 0xfd, 0x0, 0x6b, 0x74, 0x5e}}
 };
 
diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h
index e44a2c4a9a..868440ad22 100644
--- a/plugins/Weather/src/weather.h
+++ b/plugins/Weather/src/weather.h
@@ -25,15 +25,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //============  THE INCLUDES  ===========
 
 #define _CRT_SECURE_NO_WARNINGS
-#include <m_stdhdr.h>
+
 #include <share.h>
 #include <time.h>
 #include <windows.h>
 #include <commctrl.h>
 #include <richedit.h>
+#include <malloc.h>
 
 #include <newpluginapi.h>
-#include <m_system_cpp.h>
 #include <m_protomod.h>
 #include <m_icolib.h>
 #include <m_options.h>
@@ -54,6 +54,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_cluiframes.h>
 #include <m_popup.h>
 #include <win2k.h>
+#include <m_acc.h>
 
 #include <m_weather.h>
 #include <m_toptoolbar.h>
@@ -363,6 +364,7 @@ extern HANDLE hWindowList;
 extern HANDLE hMwinMenu;
 extern HANDLE hTBButton;
 extern UINT_PTR timerId;
+extern HANDLE hUpdateMutex;
 
 // check if weather is currently updating
 extern BOOL ThreadRunning;
@@ -526,6 +528,7 @@ void removeWindow(HANDLE hContact);
 int UserInfoInit(WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK DlgProcUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK DlgProcMoreData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DlgProcINIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 
 #define WM_UPDATEDATA WM_USER + 2687
 
diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 3e6cfd7b9b..4061858a73 100644
--- a/plugins/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "weather.h"
-#include "m_acc.h"
 
 #define MS_TOOLTIP_SHOWTIP		"mToolTip/ShowTip"
 #define MS_TOOLTIP_HIDETIP		"mToolTip/HideTip"
diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp
index 8029b13821..465abe5d74 100644
--- a/plugins/Weather/src/weather_update.cpp
+++ b/plugins/Weather/src/weather_update.cpp
@@ -29,7 +29,6 @@ menu items).
 UPDATELIST *UpdateListHead;
 UPDATELIST *UpdateListTail;
 
-extern HANDLE hUpdateMutex;
 
 //============  RETRIEVE NEW WEATHER  ============
 
diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp
index 1d716a58ef..9ddce8d703 100644
--- a/plugins/Weather/src/weather_userinfo.cpp
+++ b/plugins/Weather/src/weather_userinfo.cpp
@@ -27,8 +27,6 @@ information
 
 #include "weather.h"
 
-extern INT_PTR CALLBACK DlgProcINIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-
 //============  CONTACT INFORMATION  ============
 
 // initialize user info