4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/NewAwaySysMod/src/Common.h b/plugins/NewAwaySysMod/src/Common.h
index c8a99eef6d..36b036c619 100644
--- a/plugins/NewAwaySysMod/src/Common.h
+++ b/plugins/NewAwaySysMod/src/Common.h
@@ -294,7 +294,7 @@ TCString VariablesEscape(TCString Str);
 INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 // ReadAwayMsg.cpp
-extern HANDLE g_hReadWndList;
+extern MWindowList g_hReadWndList;
 INT_PTR GetContactStatMsg(WPARAM wParam, LPARAM lParam);
 
 // AwayOpt.cpp
diff --git a/plugins/NewAwaySysMod/src/ContactList.cpp b/plugins/NewAwaySysMod/src/ContactList.cpp
index 4d998293d8..8d7784a42e 100644
--- a/plugins/NewAwaySysMod/src/ContactList.cpp
+++ b/plugins/NewAwaySysMod/src/ContactList.cpp
@@ -23,7 +23,7 @@
 
 #define EXTRAICON_XSTEP (GetSystemMetrics(SM_CXSMICON) + 1)
 
-static HANDLE hCLWindowList;
+static MWindowList hCLWindowList;
 
 static int CLContactDeleted(WPARAM wParam, LPARAM lParam)
 {
diff --git a/plugins/NewAwaySysMod/src/MsgTree.cpp b/plugins/NewAwaySysMod/src/MsgTree.cpp
index 7cc7c12fc8..04163e7dd5 100644
--- a/plugins/NewAwaySysMod/src/MsgTree.cpp
+++ b/plugins/NewAwaySysMod/src/MsgTree.cpp
@@ -46,12 +46,12 @@ SettingsList[] = {
 	IDS_MESSAGEDLG_DEF_OTL,  ID_STATUS_OUTTOLUNCH, IDR_MSGTREEMENU_DEF_OTL
 };
 
-static HANDLE hMTWindowList;
+static MWindowList hMTWindowList;
 static WNDPROC g_OrigEditProc;
 
 void LoadMsgTreeModule()
 {
-	hMTWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
+	hMTWindowList = WindowList_Create();
 }
 
 static LRESULT CALLBACK EditSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
diff --git a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
index f394c9bdda..1123ae5fab 100644
--- a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
@@ -30,7 +30,7 @@ struct READAWAYMSGDATA
 
 #define RAMDLGSIZESETTING "ReadAwayMsgDlg"
 
-HANDLE g_hReadWndList = NULL;
+MWindowList g_hReadWndList = NULL;
 
 static int ReadAwayMsgDlgResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc)
 {