425 files changed, 1399 insertions, 1433 deletions
diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 434f93a5c3..a44aa5245b 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -82,7 +82,7 @@ struct USERINFO : public MZeroedObject, public MNonCopyable
 {
 	wchar_t* pszUID;
 	wchar_t* pszNick;
-	WORD     Status;
+	uint16_t Status;
 	int      iStatusEx;
 	WORD     ContactStatus;
 };
@@ -153,9 +153,9 @@ struct MIR_APP_EXPORT GCSessionInfoBase : public MZeroedObject, public MNonCopya
 	int         iEventCount;
 	int         iStatusCount;
 
-	WORD        wStatus;
-	WORD        wState;
-	WORD        wCommandsNum;
+	uint16_t    wStatus;
+	uint16_t    wState;
+	uint16_t    wCommandsNum;
 	void*       pItemData;
 	time_t      LastTime;
 
@@ -293,16 +293,16 @@ struct CHAT_MANAGER
 	BOOL          (*MM_RemoveAll)(void);
 
 	STATUSINFO*   (*TM_FindStatus)(STATUSINFO *pStatusList, const wchar_t *pszStatus);
-	wchar_t*      (*TM_WordToString)(STATUSINFO *pStatusList, WORD Status);
+	wchar_t*      (*TM_WordToString)(STATUSINFO *pStatusList, uint16_t Status);
 	BOOL          (*TM_RemoveAll)(STATUSINFO** pStatusList);
 
 	int           (*UM_CompareItem)(const USERINFO *u1, const USERINFO *u2);
-	USERINFO*     (*UM_AddUser)(SESSION_INFO *si, const wchar_t *pszUID, const wchar_t *pszNick, WORD wStatus);
+	USERINFO*     (*UM_AddUser)(SESSION_INFO *si, const wchar_t *pszUID, const wchar_t *pszNick, uint16_t wStatus);
 	USERINFO*     (*UM_FindUser)(SESSION_INFO *si, const wchar_t *pszUID);
 	USERINFO*     (*UM_FindUserFromIndex)(SESSION_INFO *si, int index);
-	USERINFO*     (*UM_GiveStatus)(SESSION_INFO *si, const wchar_t *pszUID, WORD status);
-	USERINFO*     (*UM_SetContactStatus)(SESSION_INFO *si, const wchar_t *pszUID, WORD status);
-	USERINFO*     (*UM_TakeStatus)(SESSION_INFO *si, const wchar_t *pszUID, WORD status);
+	USERINFO*     (*UM_GiveStatus)(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status);
+	USERINFO*     (*UM_SetContactStatus)(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status);
+	USERINFO*     (*UM_TakeStatus)(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status);
 	wchar_t*      (*UM_FindUserAutoComplete)(SESSION_INFO *si, const wchar_t* pszOriginal, const wchar_t* pszCurrent);
 	BOOL          (*UM_RemoveUser)(SESSION_INFO *si, const wchar_t *pszUID);
 
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 339ed32aa8..a1c0ea5815 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -109,11 +109,11 @@ struct ClcContactBase
 			MCONTACT hContact;
 		};
 		struct {
-			WORD groupId;
+			uint16_t groupId;
 			ClcGroup *group;
 		};
 	};
-	WORD  iExtraImage[EXTRA_ICON_COUNT];
+	uint16_t iExtraImage[EXTRA_ICON_COUNT];
 	wchar_t szText[120-EXTRA_ICON_COUNT];
 	ClcCacheEntry *pce; // cache is persistent, contacts aren't
 };
diff --git a/include/m_database.h b/include/m_database.h
index 838506f38d..a34aba57fa 100644
--- a/include/m_database.h
+++ b/include/m_database.h
@@ -146,17 +146,17 @@ struct DBVARIANT
 	uint8_t type;
 	union {
 		uint8_t bVal; char cVal;
-		WORD wVal; short sVal;
+		uint16_t wVal; short sVal;
 		DWORD dVal; long lVal;
 		struct {
 			union {
 				char *pszVal;
 				wchar_t *pwszVal;
 			};
-			WORD cchVal;   //only used for db/contact/getsettingstatic
+			uint16_t cchVal;   //only used for db/contact/getsettingstatic
 		};
 		struct {
-			WORD cpbVal;
+			uint16_t cpbVal;
 			uint8_t *pbVal;
 		};
 	};
@@ -176,10 +176,10 @@ struct DBEVENTINFO
 	DWORD timestamp;            // seconds since 00:00, 01/01/1970. Gives us times until 2106
 									    // unless you use the standard C library which is
 									    // signed and can only do until 2038. In GMT.
-	DWORD flags;                // combination of DBEF_* flags
-	WORD  eventType;            // module-defined event type field
-	int   cbBlob;               // size of pBlob in bytes
-	uint8_t *pBlob;             // pointer to buffer containing module-defined event data
+	DWORD      flags;           // combination of DBEF_* flags
+	uint16_t   eventType;       // module-defined event type field
+	int        cbBlob;          // size of pBlob in bytes
+	uint8_t    *pBlob;          // pointer to buffer containing module-defined event data
 	const char *szId;           // server id
 
 	bool __forceinline markedRead() const {
@@ -383,7 +383,7 @@ EXTERN_C MIR_CORE_DLL(int)      db_get_wstatic(MCONTACT hContact, const char *sz
 
 EXTERN_C MIR_CORE_DLL(INT_PTR)  db_set(MCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv);
 EXTERN_C MIR_CORE_DLL(INT_PTR)  db_set_b(MCONTACT hContact, const char *szModule, const char *szSetting, uint8_t val);
-EXTERN_C MIR_CORE_DLL(INT_PTR)  db_set_w(MCONTACT hContact, const char *szModule, const char *szSetting, WORD val);
+EXTERN_C MIR_CORE_DLL(INT_PTR)  db_set_w(MCONTACT hContact, const char *szModule, const char *szSetting, uint16_t val);
 EXTERN_C MIR_CORE_DLL(INT_PTR)  db_set_dw(MCONTACT hContact, const char *szModule, const char *szSetting, DWORD val);
 EXTERN_C MIR_CORE_DLL(INT_PTR)  db_set_s(MCONTACT hContact, const char *szModule, const char *szSetting, const char *val);
 EXTERN_C MIR_CORE_DLL(INT_PTR)  db_set_ws(MCONTACT hContact, const char *szModule, const char *szSetting, const wchar_t *val);
@@ -653,9 +653,9 @@ __inline uint8_t DBGetContactSettingRangedByte(MCONTACT hContact, const char *sz
 	return (bVal < minValue || bVal > maxValue) ? errorValue : bVal;
 }
 
-__inline WORD DBGetContactSettingRangedWord(MCONTACT hContact, const char *szModule, const char *szSetting, WORD errorValue, WORD minValue, WORD maxValue)
+__inline uint16_t DBGetContactSettingRangedWord(MCONTACT hContact, const char *szModule, const char *szSetting, uint16_t errorValue, uint16_t minValue, uint16_t maxValue)
 {
-	WORD wVal = db_get_w(hContact, szModule, szSetting, errorValue);
+	uint16_t wVal = db_get_w(hContact, szModule, szSetting, errorValue);
 	return (wVal < minValue || wVal > maxValue) ? errorValue : wVal;
 }
 
diff --git a/include/m_gui.h b/include/m_gui.h
index 537507f54b..91f8ac95b3 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -65,7 +65,7 @@ struct CMDBTraits<1>
 template<>
 struct CMDBTraits<2>
 {
-	typedef WORD DBType;
+	typedef uint16_t DBType;
 	enum { DBTypeId = DBVT_WORD };
 	static __forceinline DBType Get(const char *szModule, const char *szSetting, DBType value)
 	{
@@ -516,7 +516,7 @@ public:
 
 	int      GetInt() const;
 
-	virtual  BOOL OnCommand(HWND /*hwndCtrl*/, WORD /*idCtrl*/, WORD /*idCode*/) { return FALSE; }
+	virtual  BOOL OnCommand(HWND /*hwndCtrl*/, uint16_t /*idCtrl*/, uint16_t /*idCode*/) { return FALSE; }
 	virtual  BOOL OnNotify(int /*idCtrl*/, NMHDR* /*pnmh*/) { return FALSE; }
 
 	virtual  BOOL OnMeasureItem(MEASUREITEMSTRUCT*) { return FALSE; }
@@ -571,7 +571,7 @@ class MIR_CORE_EXPORT CCtrlButton : public CCtrlBase
 public:
 	CCtrlButton(CDlgBase *dlg, int ctrlId);
 
-	BOOL OnCommand(HWND hwndCtrl, WORD idCtrl, WORD idCode) override;
+	BOOL OnCommand(HWND hwndCtrl, uint16_t idCtrl, uint16_t idCode) override;
 
 	CCallback<CCtrlButton> OnClick;
 
@@ -631,7 +631,7 @@ class MIR_CORE_EXPORT CCtrlHyperlink : public CCtrlBase
 public:
 	CCtrlHyperlink(CDlgBase *dlg, int ctrlId, const char* url = nullptr);
 
-	BOOL OnCommand(HWND hwndCtrl, WORD idCtrl, WORD idCode) override;
+	BOOL OnCommand(HWND hwndCtrl, uint16_t idCtrl, uint16_t idCode) override;
 
 	CCallback<CCtrlHyperlink> OnClick;
 
@@ -652,10 +652,10 @@ class MIR_CORE_EXPORT CCtrlProgress : public CCtrlBase
 public:
 	CCtrlProgress(CDlgBase *dlg, int ctrlId);
 
-	void SetRange(WORD max, WORD min = 0);
-	void SetPosition(WORD value);
-	void SetStep(WORD value);
-	WORD Move(WORD delta = 0);
+	void SetRange(uint16_t max, uint16_t min = 0);
+	void SetPosition(uint16_t value);
+	void SetStep(uint16_t value);
+	uint16_t Move(uint16_t delta = 0);
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -771,7 +771,7 @@ class MIR_CORE_EXPORT CCtrlCheck : public CCtrlData
 
 public:
 	CCtrlCheck(CDlgBase *dlg, int ctrlId);
-	BOOL OnCommand(HWND /*hwndCtrl*/, WORD /*idCtrl*/, WORD /*idCode*/) override;
+	BOOL OnCommand(HWND /*hwndCtrl*/, uint16_t /*idCtrl*/, uint16_t /*idCode*/) override;
 
 	bool OnApply() override;
 	void OnReset() override;
@@ -791,7 +791,7 @@ class MIR_CORE_EXPORT CCtrlColor : public CCtrlData
 
 public:
 	CCtrlColor(CDlgBase *dlg, int ctrlId);
-	BOOL OnCommand(HWND /*hwndCtrl*/, WORD /*idCtrl*/, WORD /*idCode*/) override;
+	BOOL OnCommand(HWND /*hwndCtrl*/, uint16_t /*idCtrl*/, uint16_t /*idCode*/) override;
 
 	bool OnApply() override;
 	void OnReset() override;
@@ -825,7 +825,7 @@ class MIR_CORE_EXPORT CCtrlEdit : public CCtrlData
 
 public:
 	CCtrlEdit(CDlgBase *dlg, int ctrlId);
-	BOOL OnCommand(HWND /*hwndCtrl*/, WORD /*idCtrl*/, WORD idCode) override;
+	BOOL OnCommand(HWND /*hwndCtrl*/, uint16_t /*idCtrl*/, uint16_t idCode) override;
 
 	bool OnApply() override;
 	void OnReset() override;
@@ -868,7 +868,7 @@ class MIR_CORE_EXPORT CCtrlSlider : public CCtrlData
 	int m_wMin, m_wMax;
 
 protected:
-	BOOL OnCommand(HWND hwndCtrl, WORD idCtrl, WORD idCode) override;
+	BOOL OnCommand(HWND hwndCtrl, uint16_t idCtrl, uint16_t idCode) override;
 
 public:
 	CCtrlSlider(CDlgBase *dlg, int ctrlId, int max = 100, int min = 0);
@@ -887,18 +887,18 @@ class MIR_CORE_EXPORT CCtrlSpin : public CCtrlData
 {
 	typedef CCtrlData CSuper;
 
-	WORD m_wMin, m_wMax, m_wCurr;
+	uint16_t m_wMin, m_wMax, m_wCurr;
 
 	BOOL OnNotify(int, NMHDR*) override;
 
 public:
-	CCtrlSpin(CDlgBase *dlg, int ctrlId, WORD max = 100, WORD min = 0);
+	CCtrlSpin(CDlgBase *dlg, int ctrlId, uint16_t max = 100, uint16_t min = 0);
 
 	bool OnApply() override;
 	void OnReset() override;
 
-	WORD GetPosition();
-	void SetPosition(WORD pos);
+	uint16_t GetPosition();
+	void SetPosition(uint16_t pos);
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -938,7 +938,7 @@ public:
 	CCallback<CCtrlListBox>	OnSelChange;
 
 protected:
-	BOOL OnCommand(HWND hwndCtrl, WORD idCtrl, WORD idCode) override;
+	BOOL OnCommand(HWND hwndCtrl, uint16_t idCtrl, uint16_t idCode) override;
 	void GetCaretPos(CContextMenuPos&) const override;
 };
 
@@ -952,7 +952,7 @@ class MIR_CORE_EXPORT CCtrlCombo : public CCtrlData
 public:
 	CCtrlCombo(CDlgBase *dlg, int ctrlId);
 
-	BOOL OnCommand(HWND /*hwndCtrl*/, WORD /*idCtrl*/, WORD idCode) override;
+	BOOL OnCommand(HWND /*hwndCtrl*/, uint16_t /*idCtrl*/, uint16_t idCode) override;
 	void OnInit() override;
 	bool OnApply() override;
 	void OnReset() override;
diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h
index 712af60f15..382ee9738a 100644
--- a/include/m_hotkeys.h
+++ b/include/m_hotkeys.h
@@ -38,7 +38,7 @@ struct HOTKEYDESC
 	MAllStrings szDescription;    // description for options dialog
 	MAllStrings szSection;        // section name used to group sounds (NULL is acceptable)
 	const char *pszService;       // Service to call when HotKey Pressed
-	WORD DefHotKey;               // default hot key for action
+	uint16_t DefHotKey;           // default hot key for action
 	DWORD dwFlags;                // one of HKD_* constants
 	LPARAM lParam;                // lParam to pass to service
 };
diff --git a/include/m_netlib.h b/include/m_netlib.h
index 161c1056c4..b322e1866c 100644
--- a/include/m_netlib.h
+++ b/include/m_netlib.h
@@ -272,7 +272,7 @@ struct NETLIBBIND
 	// new connection, IP of remote machine (host byte order)
 	DWORD dwInternalIP;   // set on return, host byte order
 	DWORD dwExternalIP;   // set on return, host byte order
-	WORD  wPort, wExPort; // set on return, host byte order
+	uint16_t  wPort, wExPort; // set on return, host byte order
 	void *pExtra;         // argument is sent to callback
 };
 
@@ -316,8 +316,8 @@ EXTERN_C MIR_APP_DLL(HNETLIBBIND) Netlib_BindPort(HNETLIBUSER nlu, NETLIBBIND *n
 
 struct NETLIBOPENCONNECTION
 {
-	const char *szHost;	  // can contain the string representation of an IP
-	WORD wPort;			  // host byte order
+	const char *szHost;    // can contain the string representation of an IP
+	uint16_t wPort;        // host byte order
 	DWORD flags;
 	unsigned int timeout;
 	/* optional, called in the context of the thread that issued the attempt, if it returns 0 the connection attempt is
@@ -398,7 +398,7 @@ struct NETLIBCONNINFO
 {
 	char szIpPort[64];
 	unsigned dwIpv4;
-	WORD wPort;
+	uint16_t wPort;
 };
 
 EXTERN_C MIR_APP_DLL(int) Netlib_GetConnectionInfo(HNETLIBCONN hConnection, NETLIBCONNINFO *connInfo);
diff --git a/include/m_protoint.h b/include/m_protoint.h
index 6f41d51de3..4876656bd9 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -114,9 +114,9 @@ public:
 	__forceinline int getByte(MCONTACT hContact, const char *name, uint8_t defaultValue = 0) {
 		return db_get_b(hContact, m_szModuleName, name, defaultValue); }
 
-	__forceinline int getWord(const char *name, WORD defaultValue = 0) {
+	__forceinline int getWord(const char *name, uint16_t defaultValue = 0) {
 		return db_get_w(0, m_szModuleName, name, defaultValue); }
-	__forceinline int getWord(MCONTACT hContact, const char *name, WORD defaultValue = 0) {
+	__forceinline int getWord(MCONTACT hContact, const char *name, uint16_t defaultValue = 0) {
 		return db_get_w(hContact, m_szModuleName, name, defaultValue); }
 
 	__forceinline DWORD getDword(const char *name, DWORD defaultValue = 0)  {
@@ -167,8 +167,8 @@ public:
 	__forceinline void setByte(const char *name, uint8_t value) { db_set_b(0, m_szModuleName, name, value); }
 	__forceinline void setByte(MCONTACT hContact, const char *name, uint8_t value) { db_set_b(hContact, m_szModuleName, name, value); }
 
-	__forceinline void setWord(const char *name, WORD value) { db_set_w(0, m_szModuleName, name, value); }
-	__forceinline void setWord(MCONTACT hContact, const char *name, WORD value) { db_set_w(hContact, m_szModuleName, name, value); }
+	__forceinline void setWord(const char *name, uint16_t value) { db_set_w(0, m_szModuleName, name, value); }
+	__forceinline void setWord(MCONTACT hContact, const char *name, uint16_t value) { db_set_w(hContact, m_szModuleName, name, value); }
 
 	__forceinline void setDword(const char *name, DWORD value) { db_set_dw(0, m_szModuleName, name, value); }
 	__forceinline void setDword(MCONTACT hContact, const char *name, DWORD value) { db_set_dw(hContact, m_szModuleName, name, value); }
diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index 715f222da3..09181e5e58 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -478,7 +478,7 @@ struct PROTOFILERESUME
 
 ///////////////////////////////////////////////////////////////////////////////
 // Asks protocol for the status message for a status
-// wParam = (WORD) 0 for current status or a status id
+// wParam = (uint16_t)0 for current status or a status id
 // lParam = SGMA_xxx
 // Returns status msg or NULL if there is none.  The protocol have to handle only the current
 // status. Handling messages for other statuses is optional.
diff --git a/include/m_types.h b/include/m_types.h
index c01c838de2..13208cc993 100644
--- a/include/m_types.h
+++ b/include/m_types.h
@@ -54,7 +54,6 @@ using namespace std;
 
 typedef void          *HANDLE;
 typedef int            BOOL, SOCKET;
-typedef uint16_t       WORD;
 typedef uint32_t       UINT, COLORREF;
 typedef intptr_t       WPARAM, LPARAM, INT_PTR;
 typedef uintptr_t      UINT_PTR, DWORD_PTR, LRESULT;
diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index ee0cc479bb..41b474cc8a 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -343,11 +343,11 @@ public:
 		db_set_b(hContact, m_szModuleName, name, value);
 	}
 
-	__forceinline void setWord(const char *name, WORD value)
+	__forceinline void setWord(const char *name, uint16_t value)
 	{
 		db_set_w(0, m_szModuleName, name, value);
 	}
-	__forceinline void setWord(MCONTACT hContact, const char *name, WORD value)
+	__forceinline void setWord(MCONTACT hContact, const char *name, uint16_t value)
 	{
 		db_set_w(hContact, m_szModuleName, name, value);
 	}
diff --git a/libs/freeimage/src/FreeImage.h b/libs/freeimage/src/FreeImage.h
index 85f4680ca8..c96e579963 100644
--- a/libs/freeimage/src/FreeImage.h
+++ b/libs/freeimage/src/FreeImage.h
@@ -152,7 +152,7 @@ FI_STRUCT (FIMULTIBITMAP) { void *data; };
 #include <inttypes.h>
 typedef int32_t BOOL;
 typedef uint8_t uint8_t;
-typedef uint16_t WORD;
+typedef uint16_t uint16_t;
 typedef uint32_t DWORD;
 typedef int32_t LONG;
 typedef int64_t INT64;
@@ -161,7 +161,7 @@ typedef uint64_t UINT64;
 // MS is not C99 ISO compliant
 typedef long BOOL;
 typedef unsigned char uint8_t;
-typedef unsigned short WORD;
+typedef unsigned short uint16_t;
 typedef unsigned long DWORD;
 typedef long LONG;
 typedef signed __int64 INT64;
@@ -209,8 +209,8 @@ typedef struct tagBITMAPINFOHEADER{
   DWORD biSize;
   LONG  biWidth; 
   LONG  biHeight; 
-  WORD  biPlanes; 
-  WORD  biBitCount;
+  uint16_t  biPlanes; 
+  uint16_t  biBitCount;
   DWORD biCompression; 
   DWORD biSizeImage; 
   LONG  biXPelsPerMeter; 
@@ -237,18 +237,18 @@ typedef struct tagBITMAPINFO {
 /** 48-bit RGB 
 */
 typedef struct tagFIRGB16 {
-	WORD red;
-	WORD green;
-	WORD blue;
+	uint16_t red;
+	uint16_t green;
+	uint16_t blue;
 } FIRGB16;
 
 /** 64-bit RGBA
 */
 typedef struct tagFIRGBA16 {
-	WORD red;
-	WORD green;
-	WORD blue;
-	WORD alpha;
+	uint16_t red;
+	uint16_t green;
+	uint16_t blue;
+	uint16_t alpha;
 } FIRGBA16;
 
 /** 96-bit RGB Float
@@ -371,7 +371,7 @@ typedef struct tagFICOMPLEX {
 #define FIICC_COLOR_IS_CMYK		0x01
 
 FI_STRUCT (FIICCPROFILE) { 
-	WORD    flags;	//! info flag
+	uint16_t    flags;	//! info flag
 	DWORD	size;	//! profile's size measured in bytes
 	void   *data;	//! points to a block of contiguous memory containing the profile
 };
@@ -1062,7 +1062,7 @@ DLL_API FITAG *DLL_CALLCONV FreeImage_CloneTag(FITAG *tag);
 // tag getters and setters
 DLL_API const char *DLL_CALLCONV FreeImage_GetTagKey(FITAG *tag);
 DLL_API const char *DLL_CALLCONV FreeImage_GetTagDescription(FITAG *tag);
-DLL_API WORD DLL_CALLCONV FreeImage_GetTagID(FITAG *tag);
+DLL_API uint16_t DLL_CALLCONV FreeImage_GetTagID(FITAG *tag);
 DLL_API FREE_IMAGE_MDTYPE DLL_CALLCONV FreeImage_GetTagType(FITAG *tag);
 DLL_API DWORD DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag);
 DLL_API DWORD DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag);
@@ -1070,7 +1070,7 @@ DLL_API const void *DLL_CALLCONV FreeImage_GetTagValue(FITAG *tag);
 
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagKey(FITAG *tag, const char *key);
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagDescription(FITAG *tag, const char *description);
-DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, WORD id);
+DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, uint16_t id);
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type);
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagCount(FITAG *tag, DWORD count);
 DLL_API BOOL DLL_CALLCONV FreeImage_SetTagLength(FITAG *tag, DWORD length);
diff --git a/libs/freeimage/src/FreeImage/BitmapAccess.cpp b/libs/freeimage/src/FreeImage/BitmapAccess.cpp
index 4f5fea576a..62a1d216aa 100644
--- a/libs/freeimage/src/FreeImage/BitmapAccess.cpp
+++ b/libs/freeimage/src/FreeImage/BitmapAccess.cpp
@@ -428,7 +428,7 @@ FreeImage_AllocateBitmap(BOOL header_only, uint8_t *ext_bits, unsigned ext_pitch
 			bih->biHeight           = height;
 			bih->biPlanes           = 1;
 			bih->biCompression      = need_masks ? BI_BITFIELDS : BI_RGB;
-			bih->biBitCount         = (WORD)bpp;
+			bih->biBitCount         = (uint16_t)bpp;
 			bih->biClrUsed          = CalculateUsedPaletteEntries(bpp);
 			bih->biClrImportant     = bih->biClrUsed;
 			bih->biXPelsPerMeter	= 2835;	// 72 dpi
@@ -1379,7 +1379,7 @@ FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key,
 						FreeImage_OutputMessageProc(FIF_UNKNOWN, "IPTC: Invalid key '%s'", key);
 					}
 					*/
-					FreeImage_SetTagID(tag, (WORD)id);
+					FreeImage_SetTagID(tag, (uint16_t)id);
 				}
 				break;
 
diff --git a/libs/freeimage/src/FreeImage/Conversion.cpp b/libs/freeimage/src/FreeImage/Conversion.cpp
index 7a700b2e48..e9481c5401 100644
--- a/libs/freeimage/src/FreeImage/Conversion.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion.cpp
@@ -87,7 +87,7 @@ BOOL SwapRedBlue32(FIBITMAP* dib) {
 // ----------------------------------------------------------
 
 static inline void 
-assignRGB(WORD r, WORD g, WORD b, WORD* out) {
+assignRGB(uint16_t r, uint16_t g, uint16_t b, uint16_t* out) {
 	out[0] = r;
 	out[1] = g;
 	out[2] = b;
@@ -162,7 +162,7 @@ ConvertCMYKtoRGBA(FIBITMAP* dib) {
 	
 	unsigned channelSize = 1;
 	if (image_type == FIT_RGBA16 || image_type == FIT_RGB16) {
-		channelSize = sizeof(WORD);
+		channelSize = sizeof(uint16_t);
 	} else if (!(image_type == FIT_BITMAP && (bytesperpixel > 2))) {
 		return FALSE;
 	}
@@ -174,8 +174,8 @@ ConvertCMYKtoRGBA(FIBITMAP* dib) {
 	
 	unsigned samplesperpixel = FreeImage_GetLine(dib) / width / channelSize;
 
-	if(channelSize == sizeof(WORD)) {
-		_convertCMYKtoRGBA<WORD>(width, height, line_start, pitch, samplesperpixel);
+	if(channelSize == sizeof(uint16_t)) {
+		_convertCMYKtoRGBA<uint16_t>(width, height, line_start, pitch, samplesperpixel);
 	} else {
 		_convertCMYKtoRGBA<uint8_t>(width, height, line_start, pitch, samplesperpixel);
 	}
@@ -311,7 +311,7 @@ ConvertLABtoRGB(FIBITMAP* dib) {
 	
 	unsigned channelSize = 1;
 	if (image_type == FIT_RGBA16 || image_type == FIT_RGB16) {
-		channelSize = sizeof(WORD);
+		channelSize = sizeof(uint16_t);
 	} else if (!(image_type == FIT_BITMAP && (bytesperpixel > 2))) {
 		return FALSE;
 	}
@@ -327,7 +327,7 @@ ConvertLABtoRGB(FIBITMAP* dib) {
 		_convertLABtoRGB<uint8_t>(width, height, line_start, pitch, samplesperpixel);
 	}
 	else {
-		_convertLABtoRGB<WORD>(width, height, line_start, pitch, samplesperpixel);
+		_convertLABtoRGB<uint16_t>(width, height, line_start, pitch, samplesperpixel);
 	}
 
 	return TRUE;	
diff --git a/libs/freeimage/src/FreeImage/Conversion16_555.cpp b/libs/freeimage/src/FreeImage/Conversion16_555.cpp
index ae0a4b6d1a..2caa76e9cf 100644
--- a/libs/freeimage/src/FreeImage/Conversion16_555.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion16_555.cpp
@@ -33,7 +33,7 @@
 
 void DLL_CALLCONV
 FreeImage_ConvertLine1To16_555(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		int index = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
@@ -44,7 +44,7 @@ FreeImage_ConvertLine1To16_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine4To16_555(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 	BOOL lonibble = FALSE;
 	int x = 0;
 
@@ -65,7 +65,7 @@ FreeImage_ConvertLine4To16_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine8To16_555(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		RGBQUAD *grab_palette = palette + source[cols];
@@ -76,8 +76,8 @@ FreeImage_ConvertLine8To16_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16_565_To16_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *src_bits = (WORD *)source;
-	WORD *new_bits = (WORD *)target;
+	uint16_t *src_bits = (uint16_t *)source;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB555((((src_bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F,
@@ -88,7 +88,7 @@ FreeImage_ConvertLine16_565_To16_555(uint8_t *target, uint8_t *source, int width
 
 void DLL_CALLCONV
 FreeImage_ConvertLine24To16_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB555(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
@@ -99,7 +99,7 @@ FreeImage_ConvertLine24To16_555(uint8_t *target, uint8_t *source, int width_in_p
 
 void DLL_CALLCONV
 FreeImage_ConvertLine32To16_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB555(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
diff --git a/libs/freeimage/src/FreeImage/Conversion16_565.cpp b/libs/freeimage/src/FreeImage/Conversion16_565.cpp
index e48d53b7ad..0a36fdaa8b 100644
--- a/libs/freeimage/src/FreeImage/Conversion16_565.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion16_565.cpp
@@ -29,7 +29,7 @@
 
 void DLL_CALLCONV
 FreeImage_ConvertLine1To16_565(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		int index = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
@@ -40,7 +40,7 @@ FreeImage_ConvertLine1To16_565(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine4To16_565(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 	BOOL lonibble = FALSE;
 	int x = 0;
 
@@ -61,7 +61,7 @@ FreeImage_ConvertLine4To16_565(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine8To16_565(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		RGBQUAD *grab_palette = palette + source[cols];
@@ -72,8 +72,8 @@ FreeImage_ConvertLine8To16_565(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16_555_To16_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *src_bits = (WORD *)source;
-	WORD *new_bits = (WORD *)target;
+	uint16_t *src_bits = (uint16_t *)source;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB565((((src_bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F,
@@ -84,7 +84,7 @@ FreeImage_ConvertLine16_555_To16_565(uint8_t *target, uint8_t *source, int width
 
 void DLL_CALLCONV
 FreeImage_ConvertLine24To16_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB565(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
@@ -95,7 +95,7 @@ FreeImage_ConvertLine24To16_565(uint8_t *target, uint8_t *source, int width_in_p
 
 void DLL_CALLCONV
 FreeImage_ConvertLine32To16_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB565(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
diff --git a/libs/freeimage/src/FreeImage/Conversion24.cpp b/libs/freeimage/src/FreeImage/Conversion24.cpp
index 9586d853dd..4520e6cae2 100644
--- a/libs/freeimage/src/FreeImage/Conversion24.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion24.cpp
@@ -78,7 +78,7 @@ FreeImage_ConvertLine8To24(uint8_t *target, uint8_t *source, int width_in_pixels
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To24_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		target[FI_RGBA_RED]   = (uint8_t)((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F);
@@ -91,7 +91,7 @@ FreeImage_ConvertLine16To24_555(uint8_t *target, uint8_t *source, int width_in_p
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To24_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		target[FI_RGBA_RED]   = (uint8_t)((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F);
diff --git a/libs/freeimage/src/FreeImage/Conversion32.cpp b/libs/freeimage/src/FreeImage/Conversion32.cpp
index 43845e19aa..52b85d097d 100644
--- a/libs/freeimage/src/FreeImage/Conversion32.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion32.cpp
@@ -79,7 +79,7 @@ FreeImage_ConvertLine8To32(uint8_t *target, uint8_t *source, int width_in_pixels
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To32_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		target[FI_RGBA_RED]   = (uint8_t)((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F);
@@ -92,7 +92,7 @@ FreeImage_ConvertLine16To32_555(uint8_t *target, uint8_t *source, int width_in_p
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To32_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		target[FI_RGBA_RED]   = (uint8_t)((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F);
diff --git a/libs/freeimage/src/FreeImage/Conversion4.cpp b/libs/freeimage/src/FreeImage/Conversion4.cpp
index c1527810d6..a96f6b8d5c 100644
--- a/libs/freeimage/src/FreeImage/Conversion4.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion4.cpp
@@ -59,7 +59,7 @@ FreeImage_ConvertLine8To4(uint8_t *target, uint8_t *source, int width_in_pixels,
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To4_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 	BOOL hinibble = TRUE;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
@@ -81,7 +81,7 @@ FreeImage_ConvertLine16To4_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To4_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 	BOOL hinibble = TRUE;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
diff --git a/libs/freeimage/src/FreeImage/Conversion8.cpp b/libs/freeimage/src/FreeImage/Conversion8.cpp
index 73820a4d66..e20fb0a756 100644
--- a/libs/freeimage/src/FreeImage/Conversion8.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion8.cpp
@@ -55,7 +55,7 @@ FreeImage_ConvertLine4To8(uint8_t *target, uint8_t *source, int width_in_pixels)
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To8_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	const WORD *const bits = (WORD *)source;
+	const uint16_t *const bits = (uint16_t *)source;
 	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
 		target[cols] = GREY((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F,
 			                (((bits[cols] & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F,
@@ -65,7 +65,7 @@ FreeImage_ConvertLine16To8_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To8_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	const WORD *const bits = (WORD *)source;
+	const uint16_t *const bits = (uint16_t *)source;
 	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
 		target[cols] = GREY((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F,
 			        (((bits[cols] & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F,
@@ -204,7 +204,7 @@ FreeImage_ConvertTo8Bits(FIBITMAP *dib) {
 			uint8_t *dst_bits = FreeImage_GetBits(new_dib);
 
 			for (unsigned rows = 0; rows < height; rows++) {
-				const WORD *const src_pixel = (WORD*)src_bits;
+				const uint16_t *const src_pixel = (uint16_t*)src_bits;
 				uint8_t *dst_pixel = (uint8_t*)dst_bits;
 				for(unsigned cols = 0; cols < width; cols++) {
 					dst_pixel[cols] = (uint8_t)(src_pixel[cols] >> 8);
diff --git a/libs/freeimage/src/FreeImage/ConversionFloat.cpp b/libs/freeimage/src/FreeImage/ConversionFloat.cpp
index ca551ab4ad..83fd777271 100644
--- a/libs/freeimage/src/FreeImage/ConversionFloat.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionFloat.cpp
@@ -104,7 +104,7 @@ FreeImage_ConvertToFloat(FIBITMAP *dib) {
 		case FIT_UINT16:
 		{
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
+				const uint16_t *src_pixel = (uint16_t*)src_bits;
 				float *dst_pixel = (float*)dst_bits;
 
 				for(unsigned x = 0; x < width; x++) {
diff --git a/libs/freeimage/src/FreeImage/ConversionRGB16.cpp b/libs/freeimage/src/FreeImage/ConversionRGB16.cpp
index 4852a58866..f748dd1155 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGB16.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGB16.cpp
@@ -103,7 +103,7 @@ FreeImage_ConvertToRGB16(FIBITMAP *dib) {
 		case FIT_UINT16:
 		{
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y);
+				const uint16_t *src_bits = (uint16_t*)FreeImage_GetScanLine(src, y);
 				FIRGB16 *dst_bits = (FIRGB16*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					// convert by copying greyscale channel to each R, G, B channels
diff --git a/libs/freeimage/src/FreeImage/ConversionRGBA16.cpp b/libs/freeimage/src/FreeImage/ConversionRGBA16.cpp
index c5ecfdf438..d28d842ab9 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGBA16.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGBA16.cpp
@@ -104,7 +104,7 @@ FreeImage_ConvertToRGBA16(FIBITMAP *dib) {
 		case FIT_UINT16:
 		{
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y);
+				const uint16_t *src_bits = (uint16_t*)FreeImage_GetScanLine(src, y);
 				FIRGBA16 *dst_bits = (FIRGBA16*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					// convert by copying greyscale channel to each R, G, B channels
diff --git a/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp b/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
index 99ece4604d..b8979cc85b 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
@@ -132,7 +132,7 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
 			uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
 
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
+				const uint16_t *src_pixel = (uint16_t*)src_bits;
 				FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
 
 				for(unsigned x = 0; x < width; x++) {
diff --git a/libs/freeimage/src/FreeImage/ConversionRGBF.cpp b/libs/freeimage/src/FreeImage/ConversionRGBF.cpp
index d1f7611caa..bc24ce2b51 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGBF.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGBF.cpp
@@ -130,7 +130,7 @@ FreeImage_ConvertToRGBF(FIBITMAP *dib) {
 			uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
 
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
+				const uint16_t *src_pixel = (uint16_t*)src_bits;
 				FIRGBF *dst_pixel = (FIRGBF*)dst_bits;
 
 				for(unsigned x = 0; x < width; x++) {
diff --git a/libs/freeimage/src/FreeImage/ConversionUINT16.cpp b/libs/freeimage/src/FreeImage/ConversionUINT16.cpp
index 35f1e2fdd0..2c0562ce89 100644
--- a/libs/freeimage/src/FreeImage/ConversionUINT16.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionUINT16.cpp
@@ -86,7 +86,7 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) {
 		{
 			for(unsigned y = 0; y < height; y++) {
 				const uint8_t *src_bits = (uint8_t*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					dst_bits[x] = src_bits[x] << 8;
 				}
@@ -98,10 +98,10 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) {
 		{
 			for(unsigned y = 0; y < height; y++) {
 				const FIRGB16 *src_bits = (FIRGB16*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					// convert to grey
-					dst_bits[x] = (WORD)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
+					dst_bits[x] = (uint16_t)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
 				}
 			}
 		}
@@ -111,10 +111,10 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) {
 		{
 			for(unsigned y = 0; y < height; y++) {
 				const FIRGBA16 *src_bits = (FIRGBA16*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					// convert to grey
-					dst_bits[x] = (WORD)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
+					dst_bits[x] = (uint16_t)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
 				}
 			}
 		}
diff --git a/libs/freeimage/src/FreeImage/MNGHelper.cpp b/libs/freeimage/src/FreeImage/MNGHelper.cpp
index d89ec23c6b..865cbe38c7 100644
--- a/libs/freeimage/src/FreeImage/MNGHelper.cpp
+++ b/libs/freeimage/src/FreeImage/MNGHelper.cpp
@@ -241,7 +241,7 @@ mng_GetChunckType(const uint8_t *mChunkName) {
 }
 
 inline void
-mng_SwapShort(WORD *sp) {
+mng_SwapShort(uint16_t *sp) {
 #ifndef FREEIMAGE_BIGENDIAN
 	SwapShort(sp);
 #endif
@@ -786,7 +786,7 @@ mng_ReadChunks(int format_id, FreeImageIO *io, fi_handle handle, long Offset, in
 	DWORD res_x = 2835;	// 72 dpi
 	DWORD res_y = 2835;	// 72 dpi
 	RGBQUAD rgbBkColor = {0, 0, 0, 0};
-	WORD bk_red, bk_green, bk_blue;
+	uint16_t bk_red, bk_green, bk_blue;
 	BOOL hasBkColor = FALSE;
 	BOOL mHasIDAT = FALSE;
 
diff --git a/libs/freeimage/src/FreeImage/NNQuantizer.cpp b/libs/freeimage/src/FreeImage/NNQuantizer.cpp
index 092bad23b8..c91d01b053 100644
--- a/libs/freeimage/src/FreeImage/NNQuantizer.cpp
+++ b/libs/freeimage/src/FreeImage/NNQuantizer.cpp
@@ -489,11 +489,11 @@ FIBITMAP* NNQuantizer::Quantize(FIBITMAP *dib, int ReserveSize, RGBQUAD *Reserve
 
 	// 6) Write output image using inxsearch(b,g,r)
 
-	for (WORD rows = 0; rows < img_height; rows++) {
+	for (uint16_t rows = 0; rows < img_height; rows++) {
 		uint8_t *new_bits = FreeImage_GetScanLine(new_dib, rows);			
 		uint8_t *bits = FreeImage_GetScanLine(dib_ptr, rows);
 
-		for (WORD cols = 0; cols < img_width; cols++) {
+		for (uint16_t cols = 0; cols < img_width; cols++) {
 			new_bits[cols] = (uint8_t)inxsearch(bits[FI_RGBA_BLUE], bits[FI_RGBA_GREEN], bits[FI_RGBA_RED]);
 
 			bits += 3;
diff --git a/libs/freeimage/src/FreeImage/PixelAccess.cpp b/libs/freeimage/src/FreeImage/PixelAccess.cpp
index 185763c3ba..1a6b316980 100644
--- a/libs/freeimage/src/FreeImage/PixelAccess.cpp
+++ b/libs/freeimage/src/FreeImage/PixelAccess.cpp
@@ -77,7 +77,7 @@ FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) {
 			case 16:
 			{
 				bits += 2*x;
-				WORD *pixel = (WORD *)bits;
+				uint16_t *pixel = (uint16_t *)bits;
 				if((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
 					value->rgbBlue		= (uint8_t)((((*pixel & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F);
 					value->rgbGreen		= (uint8_t)((((*pixel & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F);
@@ -159,7 +159,7 @@ FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) {
 			case 16:
 			{
 				bits += 2*x;
-				WORD *pixel = (WORD *)bits;
+				uint16_t *pixel = (uint16_t *)bits;
 				if((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
 					*pixel = ((value->rgbBlue >> 3) << FI16_565_BLUE_SHIFT) |
 						((value->rgbGreen >> 2) << FI16_565_GREEN_SHIFT) |
diff --git a/libs/freeimage/src/FreeImage/PluginBMP.cpp b/libs/freeimage/src/FreeImage/PluginBMP.cpp
index a27760a1ea..8734c51b9b 100644
--- a/libs/freeimage/src/FreeImage/PluginBMP.cpp
+++ b/libs/freeimage/src/FreeImage/PluginBMP.cpp
@@ -39,10 +39,10 @@ static const uint8_t BI_ALPHABITFIELDS = 6;	// compression: Bit field (this valu
 
 typedef struct tagBITMAPINFOOS2_1X_HEADER {
   DWORD  biSize;
-  WORD   biWidth;
-  WORD   biHeight; 
-  WORD   biPlanes; 
-  WORD   biBitCount;
+  uint16_t   biWidth;
+  uint16_t   biHeight; 
+  uint16_t   biPlanes; 
+  uint16_t   biBitCount;
 } BITMAPINFOOS2_1X_HEADER, *PBITMAPINFOOS2_1X_HEADER; 
 
 // ==========================================================
@@ -136,7 +136,7 @@ LoadPixelData(FreeImageIO *io, fi_handle handle, FIBITMAP *dib, int height, unsi
 #ifdef FREEIMAGE_BIGENDIAN
 	if (bit_count == 16) {
 		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-			WORD *pixel = (WORD *)FreeImage_GetScanLine(dib, y);
+			uint16_t *pixel = (uint16_t *)FreeImage_GetScanLine(dib, y);
 			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
 				SwapShort(pixel);
 				pixel++;
@@ -1383,15 +1383,15 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 			free(buffer);
 #ifdef FREEIMAGE_BIGENDIAN
 		} else if (bpp == 16) {
-			int padding = dst_pitch - dst_width * sizeof(WORD);
-			WORD pad = 0;
-			WORD pixel;
+			int padding = dst_pitch - dst_width * sizeof(uint16_t);
+			uint16_t pad = 0;
+			uint16_t pixel;
 			for(unsigned y = 0; y < dst_height; y++) {
 				uint8_t *line = FreeImage_GetScanLine(dib, y);
 				for(unsigned x = 0; x < dst_width; x++) {
-					pixel = ((WORD *)line)[x];
+					pixel = ((uint16_t *)line)[x];
 					SwapShort(&pixel);
-					if (io->write_proc(&pixel, sizeof(WORD), 1, handle) != 1) {
+					if (io->write_proc(&pixel, sizeof(uint16_t), 1, handle) != 1) {
 						return FALSE;
 					}
 				}
diff --git a/libs/freeimage/src/FreeImage/PluginGIF.cpp b/libs/freeimage/src/FreeImage/PluginGIF.cpp
index b1c823bdc8..3ec9a1b280 100644
--- a/libs/freeimage/src/FreeImage/PluginGIF.cpp
+++ b/libs/freeimage/src/FreeImage/PluginGIF.cpp
@@ -64,10 +64,10 @@ struct GIFinfo {
 
 struct PageInfo {
 	PageInfo(int d, int l, int t, int w, int h) { 
-		disposal_method = d; left = (WORD)l; top = (WORD)t; width = (WORD)w; height = (WORD)h; 
+		disposal_method = d; left = (uint16_t)l; top = (uint16_t)t; width = (uint16_t)w; height = (uint16_t)h; 
 	}
 	int disposal_method;
-	WORD left, top, width, height;
+	uint16_t left, top, width, height;
 };
 
 //GIF defines a max of 12 bits per code
@@ -144,7 +144,7 @@ static int g_GifInterlaceIncrement[GIF_INTERLACE_PASSES] = {8, 8, 4, 2};
 // ==========================================================
 
 static BOOL 
-FreeImage_SetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, WORD id, FREE_IMAGE_MDTYPE type, DWORD count, DWORD length, const void *value)
+FreeImage_SetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, uint16_t id, FREE_IMAGE_MDTYPE type, DWORD count, DWORD length, const void *value)
 {
 	BOOL bResult = FALSE;
 	FITAG *tag = FreeImage_CreateTag();
@@ -672,15 +672,15 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 	try {
 		bool have_transparent = false, no_local_palette = false, interlaced = false;
 		int disposal_method = GIF_DISPOSAL_LEAVE, delay_time = 0, transparent_color = 0;
-		WORD left, top, width, height;
+		uint16_t left, top, width, height;
 		uint8_t packed, b;
-		WORD w;
+		uint16_t w;
 
 		//playback pages to generate what the user would see for this frame
 		if( (flags & GIF_PLAYBACK) == GIF_PLAYBACK ) {
 			//Logical Screen Descriptor
 			io->seek_proc(handle, 6, SEEK_SET);
-			WORD logicalwidth, logicalheight;
+			uint16_t logicalwidth, logicalheight;
 			io->read_proc(&logicalwidth, 2, 1, handle);
 			io->read_proc(&logicalheight, 2, 1, handle);
 #ifdef FREEIMAGE_BIGENDIAN
@@ -958,7 +958,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 
 			//Logical Screen Descriptor
 			io->seek_proc(handle, 6, SEEK_SET);
-			WORD logicalwidth, logicalheight;
+			uint16_t logicalwidth, logicalheight;
 			io->read_proc(&logicalwidth, 2, 1, handle);
 			io->read_proc(&logicalheight, 2, 1, handle);
 #ifdef FREEIMAGE_BIGENDIAN
@@ -1083,7 +1083,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 
 	try {
 		uint8_t packed, b;
-		WORD w;
+		uint16_t w;
 		FITAG *tag;
 
 		int bpp = FreeImage_GetBPP(dib);
@@ -1093,13 +1093,13 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 
 		bool have_transparent = false, no_local_palette = false, interlaced = false;
 		int disposal_method = GIF_DISPOSAL_BACKGROUND, delay_time = 100, transparent_color = 0;
-		WORD left = 0, top = 0, width = (WORD)FreeImage_GetWidth(dib), height = (WORD)FreeImage_GetHeight(dib);
-		WORD output_height = height;
+		uint16_t left = 0, top = 0, width = (uint16_t)FreeImage_GetWidth(dib), height = (uint16_t)FreeImage_GetHeight(dib);
+		uint16_t output_height = height;
 		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameLeft", FIDT_SHORT, &tag) ) {
-			left = *(WORD *)FreeImage_GetTagValue(tag);
+			left = *(uint16_t *)FreeImage_GetTagValue(tag);
 		}
 		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameTop", FIDT_SHORT, &tag) ) {
-			top = *(WORD *)FreeImage_GetTagValue(tag);
+			top = *(uint16_t *)FreeImage_GetTagValue(tag);
 		}
 		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "NoLocalPalette", FIDT_BYTE, &tag) ) {
 			no_local_palette = *(uint8_t *)FreeImage_GetTagValue(tag) ? true : false;
@@ -1124,16 +1124,16 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 
 		if( page == 0 ) {
 			//gather some info
-			WORD logicalwidth = width; // width has already been swapped...
+			uint16_t logicalwidth = width; // width has already been swapped...
 			if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalWidth", FIDT_SHORT, &tag) ) {
-				logicalwidth = *(WORD *)FreeImage_GetTagValue(tag);
+				logicalwidth = *(uint16_t *)FreeImage_GetTagValue(tag);
 #ifdef FREEIMAGE_BIGENDIAN
 				SwapShort(&logicalwidth);
 #endif
 			}
-			WORD logicalheight = height; // height has already been swapped...
+			uint16_t logicalheight = height; // height has already been swapped...
 			if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalHeight", FIDT_SHORT, &tag) ) {
-				logicalheight = *(WORD *)FreeImage_GetTagValue(tag);
+				logicalheight = *(uint16_t *)FreeImage_GetTagValue(tag);
 #ifdef FREEIMAGE_BIGENDIAN
 				SwapShort(&logicalheight);
 #endif
@@ -1219,7 +1219,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 				//the Netscape extension is really "repeats" not "loops"
 				if( loop > 1 ) loop--;
 				if( loop > 0xFFFF ) loop = 0xFFFF;
-				w = (WORD)loop;
+				w = (uint16_t)loop;
 #ifdef FREEIMAGE_BIGENDIAN
 				SwapShort(&w);
 #endif
@@ -1275,7 +1275,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 		//IE5/IE6 have a minimum and default of 100ms
 		//Mozilla/Firefox/Netscape 6+/Opera have a minimum of 20ms and a default of 100ms if <20ms is specified or the GCE is absent
 		//Netscape 4 has a minimum of 10ms if 0ms is specified, but will use 0ms if the GCE is absent
-		w = (WORD)(delay_time / 10); //convert ms to cs
+		w = (uint16_t)(delay_time / 10); //convert ms to cs
 #ifdef FREEIMAGE_BIGENDIAN
 		SwapShort(&w);
 #endif
@@ -1344,7 +1344,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 		}
 		size = (int)(bufptr - buf);
 		uint8_t last[4];
-		w = (WORD)stringtable->CompressEnd(last);
+		w = (uint16_t)stringtable->CompressEnd(last);
 		if( size + w >= sizeof(buf) ) {
 			//one last full size sub-block
 			io->write_proc(&b, 1, 1, handle);
diff --git a/libs/freeimage/src/FreeImage/PluginICO.cpp b/libs/freeimage/src/FreeImage/PluginICO.cpp
index d34c49fde4..96db02ad3c 100644
--- a/libs/freeimage/src/FreeImage/PluginICO.cpp
+++ b/libs/freeimage/src/FreeImage/PluginICO.cpp
@@ -36,9 +36,9 @@
 // in an ICO file.
 
 typedef struct tagICONHEADER {
-	WORD			idReserved;   // reserved
-	WORD			idType;       // resource type (1 for icons)
-	WORD			idCount;      // how many images?
+	uint16_t			idReserved;   // reserved
+	uint16_t			idType;       // resource type (1 for icons)
+	uint16_t			idCount;      // how many images?
 } ICONHEADER;
 
 typedef struct tagICONDIRECTORYENTRY {
@@ -46,8 +46,8 @@ typedef struct tagICONDIRECTORYENTRY {
 	uint8_t	bHeight;              // height of the image (times 2)
 	uint8_t	bColorCount;          // number of colors in image (0 if >=8bpp)
 	uint8_t	bReserved;            // reserved
-	WORD	wPlanes;              // color Planes
-	WORD	wBitCount;            // bits per pixel
+	uint16_t	wPlanes;              // color Planes
+	uint16_t	wBitCount;            // bits per pixel
 	DWORD	dwBytesInRes;         // how many bytes in this resource?
 	DWORD	dwImageOffset;        // where in the file is this image
 } ICONDIRENTRY;
@@ -333,7 +333,7 @@ LoadStandardIcon(FreeImageIO *io, fi_handle handle, int flags, BOOL header_only)
 #ifdef FREEIMAGE_BIGENDIAN
 	if (bit_count == 16) {
 		for(int y = 0; y < height; y++) {
-			WORD *pixel = (WORD *)FreeImage_GetScanLine(dib, y);
+			uint16_t *pixel = (uint16_t *)FreeImage_GetScanLine(dib, y);
 			for(int x = 0; x < width; x++) {
 				SwapShort(pixel);
 				pixel++;
@@ -496,13 +496,13 @@ SaveStandardIcon(FreeImageIO *io, FIBITMAP *dib, fi_handle handle) {
 	// XOR mask
 #ifdef FREEIMAGE_BIGENDIAN
 	if (bit_count == 16) {
-		WORD pixel;
+		uint16_t pixel;
 		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
 			uint8_t *line = FreeImage_GetScanLine(dib, y);
 			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-				pixel = ((WORD *)line)[x];
+				pixel = ((uint16_t *)line)[x];
 				SwapShort(&pixel);
-				if (io->write_proc(&pixel, sizeof(WORD), 1, handle) != 1)
+				if (io->write_proc(&pixel, sizeof(uint16_t), 1, handle) != 1)
 					return FALSE;
 			}
 		}
diff --git a/libs/freeimage/src/FreeImage/PluginJPEG.cpp b/libs/freeimage/src/FreeImage/PluginJPEG.cpp
index dc76574723..23c13deef2 100644
--- a/libs/freeimage/src/FreeImage/PluginJPEG.cpp
+++ b/libs/freeimage/src/FreeImage/PluginJPEG.cpp
@@ -1308,7 +1308,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 					jpeg_read_scanlines(&cinfo, buffer, 1);
 
 					for(unsigned x = 0; x < cinfo.output_width; x++) {
-						WORD K = (WORD)src[3];
+						uint16_t K = (uint16_t)src[3];
 						dst[FI_RGBA_RED]   = (uint8_t)((K * src[0]) / 255);	// C -> R
 						dst[FI_RGBA_GREEN] = (uint8_t)((K * src[1]) / 255);	// M -> G
 						dst[FI_RGBA_BLUE]  = (uint8_t)((K * src[2]) / 255);	// Y -> B
@@ -1408,7 +1408,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 			const char *sError = "only 24-bit RGB, 8-bit greyscale/palette or 32-bit CMYK bitmaps can be saved as JPEG";
 
 			FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
-			WORD bpp = (WORD)FreeImage_GetBPP(dib);
+			uint16_t bpp = (uint16_t)FreeImage_GetBPP(dib);
 
 			if ((bpp != 24) && (bpp != 8) && !(bpp == 32 && (color_type == FIC_CMYK))) {
 				throw sError;
diff --git a/libs/freeimage/src/FreeImage/WuQuantizer.cpp b/libs/freeimage/src/FreeImage/WuQuantizer.cpp
index c84f1c593e..bbf3fd0a7c 100644
--- a/libs/freeimage/src/FreeImage/WuQuantizer.cpp
+++ b/libs/freeimage/src/FreeImage/WuQuantizer.cpp
@@ -62,7 +62,7 @@ WuQuantizer::WuQuantizer(FIBITMAP *dib) {
 	mb = (LONG*)malloc(SIZE_3D * sizeof(LONG));
 
 	// Allocate Qadd
-	Qadd = (WORD *)malloc(sizeof(WORD) * width * height);
+	Qadd = (uint16_t *)malloc(sizeof(uint16_t) * width * height);
 
 	if(!gm2 || !wt || !mr || !mg || !mb || !Qadd) {
 		if(gm2)	free(gm2);
@@ -78,7 +78,7 @@ WuQuantizer::WuQuantizer(FIBITMAP *dib) {
 	memset(mr, 0, SIZE_3D * sizeof(LONG));
 	memset(mg, 0, SIZE_3D * sizeof(LONG));
 	memset(mb, 0, SIZE_3D * sizeof(LONG));
-	memset(Qadd, 0, sizeof(WORD) * width * height);
+	memset(Qadd, 0, sizeof(uint16_t) * width * height);
 }
 
 WuQuantizer::~WuQuantizer() {
@@ -115,7 +115,7 @@ WuQuantizer::Hist3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2, int R
 				ing = (bits[FI_RGBA_GREEN] >> 3) + 1;
 				inb = (bits[FI_RGBA_BLUE] >> 3) + 1;
 				ind = INDEX(inr, ing, inb);
-				Qadd[y*width + x] = (WORD)ind;
+				Qadd[y*width + x] = (uint16_t)ind;
 				// [inr][ing][inb]
 				vwt[ind]++;
 				vmr[ind] += bits[FI_RGBA_RED];
@@ -134,7 +134,7 @@ WuQuantizer::Hist3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2, int R
 				ing = (bits[FI_RGBA_GREEN] >> 3) + 1;
 				inb = (bits[FI_RGBA_BLUE] >> 3) + 1;
 				ind = INDEX(inr, ing, inb);
-				Qadd[y*width + x] = (WORD)ind;
+				Qadd[y*width + x] = (uint16_t)ind;
 				// [inr][ing][inb]
 				vwt[ind]++;
 				vmr[ind] += bits[FI_RGBA_RED];
diff --git a/libs/freeimage/src/FreeImageToolkit/Background.cpp b/libs/freeimage/src/FreeImageToolkit/Background.cpp
index db4e679d87..86e6088149 100644
--- a/libs/freeimage/src/FreeImageToolkit/Background.cpp
+++ b/libs/freeimage/src/FreeImageToolkit/Background.cpp
@@ -192,9 +192,9 @@ GetAlphaBlendedColor(const RGBQUAD *bgcolor, const RGBQUAD *fgcolor, RGBQUAD *bl
 	uint8_t alpha = fgcolor->rgbReserved;
 	uint8_t not_alpha = ~alpha;
 	
-	blended->rgbRed   = (uint8_t)( ((WORD)fgcolor->rgbRed   * alpha + not_alpha * (WORD)bgcolor->rgbRed)   >> 8 );
-	blended->rgbGreen = (uint8_t)( ((WORD)fgcolor->rgbGreen * alpha + not_alpha * (WORD)bgcolor->rgbGreen) >> 8) ;
-	blended->rgbBlue  = (uint8_t)( ((WORD)fgcolor->rgbBlue   * alpha + not_alpha * (WORD)bgcolor->rgbBlue)  >> 8 );
+	blended->rgbRed   = (uint8_t)( ((uint16_t)fgcolor->rgbRed   * alpha + not_alpha * (uint16_t)bgcolor->rgbRed)   >> 8 );
+	blended->rgbGreen = (uint8_t)( ((uint16_t)fgcolor->rgbGreen * alpha + not_alpha * (uint16_t)bgcolor->rgbGreen) >> 8) ;
+	blended->rgbBlue  = (uint8_t)( ((uint16_t)fgcolor->rgbBlue   * alpha + not_alpha * (uint16_t)bgcolor->rgbBlue)  >> 8 );
 	blended->rgbReserved = 0xFF;
 
 	return TRUE;
@@ -309,9 +309,9 @@ FillBackgroundBitmap(FIBITMAP *dib, const RGBQUAD *color, int options) {
 			break;
 		}
 		case 16: {
-			WORD wcolor = RGBQUAD_TO_WORD(dib, color_intl);
+			uint16_t wcolor = RGBQUAD_TO_WORD(dib, color_intl);
 			for (unsigned x = 0; x < width; x++) {
-				((WORD *)dst_bits)[x] = wcolor;
+				((uint16_t *)dst_bits)[x] = wcolor;
 			}
 			break;
 		}
@@ -626,8 +626,8 @@ FreeImage_AllocateExT(FREE_IMAGE_TYPE type, int width, int height, int bpp, cons
 				break;
 			}
 			case 16: {
-				WORD wcolor = (type == FIT_BITMAP) ?
-					RGBQUAD_TO_WORD(bitmap, ((RGBQUAD *)color)) : *((WORD *)color);
+				uint16_t wcolor = (type == FIT_BITMAP) ?
+					RGBQUAD_TO_WORD(bitmap, ((RGBQUAD *)color)) : *((uint16_t *)color);
 				if (wcolor != 0) {
 					FreeImage_FillBackground(bitmap, color, options);
 				}
diff --git a/libs/freeimage/src/FreeImageToolkit/ClassicRotate.cpp b/libs/freeimage/src/FreeImageToolkit/ClassicRotate.cpp
index 18088debff..2ccb25739b 100644
--- a/libs/freeimage/src/FreeImageToolkit/ClassicRotate.cpp
+++ b/libs/freeimage/src/FreeImageToolkit/ClassicRotate.cpp
@@ -42,7 +42,7 @@
 /**
 Skews a row horizontally (with filtered weights). 
 Limited to 45 degree skewing only. Filters two adjacent pixels.
-Parameter T can be uint8_t, WORD of float. 
+Parameter T can be uint8_t, uint16_t of float. 
 @param src Pointer to source image to rotate
 @param dst Pointer to destination image
 @param row Row index
@@ -160,7 +160,7 @@ HorizontalSkew(FIBITMAP *src, FIBITMAP *dst, int row, int iOffset, double dWeigh
 		case FIT_UINT16:
 		case FIT_RGB16:
 		case FIT_RGBA16:
-			HorizontalSkewT<WORD>(src, dst, row, iOffset, dWeight, bkcolor);
+			HorizontalSkewT<uint16_t>(src, dst, row, iOffset, dWeight, bkcolor);
 			break;
 		case FIT_FLOAT:
 		case FIT_RGBF:
@@ -173,7 +173,7 @@ HorizontalSkew(FIBITMAP *src, FIBITMAP *dst, int row, int iOffset, double dWeigh
 /**
 Skews a column vertically (with filtered weights). 
 Limited to 45 degree skewing only. Filters two adjacent pixels.
-Parameter T can be uint8_t, WORD of float. 
+Parameter T can be uint8_t, uint16_t of float. 
 @param src Pointer to source image to rotate
 @param dst Pointer to destination image
 @param col Column index
@@ -299,7 +299,7 @@ VerticalSkew(FIBITMAP *src, FIBITMAP *dst, int col, int iOffset, double dWeight,
 			case FIT_UINT16:
 			case FIT_RGB16:
 			case FIT_RGBA16:
-				VerticalSkewT<WORD>(src, dst, col, iOffset, dWeight, bkcolor);
+				VerticalSkewT<uint16_t>(src, dst, col, iOffset, dWeight, bkcolor);
 				break;
 			case FIT_FLOAT:
 			case FIT_RGBF:
diff --git a/libs/freeimage/src/FreeImageToolkit/Colors.cpp b/libs/freeimage/src/FreeImageToolkit/Colors.cpp
index cd67567c0c..c32f52fcc3 100644
--- a/libs/freeimage/src/FreeImageToolkit/Colors.cpp
+++ b/libs/freeimage/src/FreeImageToolkit/Colors.cpp
@@ -109,10 +109,10 @@ FreeImage_Invert(FIBITMAP *src) {
 	}
 	else if((image_type == FIT_UINT16) || (image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) {
 		// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-		const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD);
+		const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(uint16_t);
 
 		for(y = 0; y < height; y++) {
-			WORD *bits = (WORD*)FreeImage_GetScanLine(src, y);
+			uint16_t *bits = (uint16_t*)FreeImage_GetScanLine(src, y);
 			for(x = 0; x < width; x++) {
 				for(k = 0; k < wordspp; k++) {
 					bits[k] = ~bits[k];
@@ -704,12 +704,12 @@ FreeImage_ApplyColorMapping(FIBITMAP *dib, RGBQUAD *srccolors, RGBQUAD *dstcolor
 			return result;
 		}
 		case 16: {
-			WORD *src16 = (WORD *)malloc(sizeof(WORD) * count);
+			uint16_t *src16 = (uint16_t *)malloc(sizeof(uint16_t) * count);
 			if (NULL == src16) {
 				return 0;
 			}
 
-			WORD *dst16 = (WORD *)malloc(sizeof(WORD) * count);
+			uint16_t *dst16 = (uint16_t *)malloc(sizeof(uint16_t) * count);
 			if (NULL == dst16) {
 				free(src16);
 				return 0;
@@ -722,9 +722,9 @@ FreeImage_ApplyColorMapping(FIBITMAP *dib, RGBQUAD *srccolors, RGBQUAD *dstcolor
 
 			unsigned height = FreeImage_GetHeight(dib);
 			unsigned width = FreeImage_GetWidth(dib);
-			WORD *a, *b;
+			uint16_t *a, *b;
 			for (unsigned y = 0; y < height; y++) {
-				WORD *bits = (WORD *)FreeImage_GetScanLine(dib, y);
+				uint16_t *bits = (uint16_t *)FreeImage_GetScanLine(dib, y);
 				for (unsigned x = 0; x < width; x++, bits++) {
 					for (unsigned j = 0; j < count; j++) {
 						a = src16;
diff --git a/libs/freeimage/src/FreeImageToolkit/CopyPaste.cpp b/libs/freeimage/src/FreeImageToolkit/CopyPaste.cpp
index 3a9d555ba7..67c3771bcc 100644
--- a/libs/freeimage/src/FreeImageToolkit/CopyPaste.cpp
+++ b/libs/freeimage/src/FreeImageToolkit/CopyPaste.cpp
@@ -115,11 +115,11 @@ Combine4(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned
 	// build a swap table for the closest color match from the source palette to the destination palette
 
 	for (int i = 0; i < 16; i++)	{
-		WORD min_diff = (WORD)-1;
+		uint16_t min_diff = (uint16_t)-1;
 
 		for (int j = 0; j < 16; j++)	{
 			// calculates the color difference using a Manhattan distance
-			WORD abs_diff = (WORD)(
+			uint16_t abs_diff = (uint16_t)(
 				abs(src_pal[i].rgbBlue - dst_pal[j].rgbBlue)
 				+ abs(src_pal[i].rgbGreen - dst_pal[j].rgbGreen)
 				+ abs(src_pal[i].rgbRed - dst_pal[j].rgbRed)
@@ -262,8 +262,8 @@ Combine16_555(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsi
 				RGBTRIPLE color_s;
 				RGBTRIPLE color_t;
 				
-				WORD *tmp1 = (WORD *)&dst_bits[cols];
-				WORD *tmp2 = (WORD *)&src_bits[cols];
+				uint16_t *tmp1 = (uint16_t *)&dst_bits[cols];
+				uint16_t *tmp2 = (uint16_t *)&src_bits[cols];
 
 				// convert 16-bit colors to 24-bit
 
@@ -322,8 +322,8 @@ Combine16_565(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsi
 				RGBTRIPLE color_s;
 				RGBTRIPLE color_t;
 				
-				WORD *tmp1 = (WORD *)&dst_bits[cols];
-				WORD *tmp2 = (WORD *)&src_bits[cols];
+				uint16_t *tmp1 = (uint16_t *)&dst_bits[cols];
+				uint16_t *tmp2 = (uint16_t *)&src_bits[cols];
 
 				// convert 16-bit colors to 24-bit
 
diff --git a/libs/freeimage/src/FreeImageToolkit/Display.cpp b/libs/freeimage/src/FreeImageToolkit/Display.cpp
index 5b879aa656..a6ca2ae3d4 100644
--- a/libs/freeimage/src/FreeImageToolkit/Display.cpp
+++ b/libs/freeimage/src/FreeImageToolkit/Display.cpp
@@ -165,9 +165,9 @@ FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg, RGBQUAD *appBkColor, FIBITMAP
 			else {
 				// output = alpha * foreground + (1-alpha) * background
 				not_alpha = (uint8_t)~alpha;
-				cp_bits[FI_RGBA_BLUE] = (uint8_t)((alpha * (WORD)fgc.rgbBlue  + not_alpha * (WORD)bkc.rgbBlue) >> 8);
-				cp_bits[FI_RGBA_GREEN] = (uint8_t)((alpha * (WORD)fgc.rgbGreen + not_alpha * (WORD)bkc.rgbGreen) >> 8);
-				cp_bits[FI_RGBA_RED] = (uint8_t)((alpha * (WORD)fgc.rgbRed   + not_alpha * (WORD)bkc.rgbRed) >> 8);
+				cp_bits[FI_RGBA_BLUE] = (uint8_t)((alpha * (uint16_t)fgc.rgbBlue  + not_alpha * (uint16_t)bkc.rgbBlue) >> 8);
+				cp_bits[FI_RGBA_GREEN] = (uint8_t)((alpha * (uint16_t)fgc.rgbGreen + not_alpha * (uint16_t)bkc.rgbGreen) >> 8);
+				cp_bits[FI_RGBA_RED] = (uint8_t)((alpha * (uint16_t)fgc.rgbRed   + not_alpha * (uint16_t)bkc.rgbRed) >> 8);
 			}
 
 			fg_bits += bytespp;
@@ -217,9 +217,9 @@ FreeImage_PreMultiplyWithAlpha(FIBITMAP *dib) {
 				// color * 0xFF / 0xFF = color
 				continue;
 			} else {
-				bits[FI_RGBA_BLUE] = (uint8_t)( (alpha * (WORD)bits[FI_RGBA_BLUE] + 127) / 255 );
-				bits[FI_RGBA_GREEN] = (uint8_t)( (alpha * (WORD)bits[FI_RGBA_GREEN] + 127) / 255 );
-				bits[FI_RGBA_RED] = (uint8_t)( (alpha * (WORD)bits[FI_RGBA_RED] + 127) / 255 );
+				bits[FI_RGBA_BLUE] = (uint8_t)( (alpha * (uint16_t)bits[FI_RGBA_BLUE] + 127) / 255 );
+				bits[FI_RGBA_GREEN] = (uint8_t)( (alpha * (uint16_t)bits[FI_RGBA_GREEN] + 127) / 255 );
+				bits[FI_RGBA_RED] = (uint8_t)( (alpha * (uint16_t)bits[FI_RGBA_RED] + 127) / 255 );
 			}
 		}
 	}
diff --git a/libs/freeimage/src/FreeImageToolkit/Flip.cpp b/libs/freeimage/src/FreeImageToolkit/Flip.cpp
index 3f7bcf972a..52a43d2f24 100644
--- a/libs/freeimage/src/FreeImageToolkit/Flip.cpp
+++ b/libs/freeimage/src/FreeImageToolkit/Flip.cpp
@@ -86,8 +86,8 @@ FreeImage_FlipHorizontal(FIBITMAP *src) {
 
 			case 16:
 			{				
-				WORD *dst_data = (WORD*) bits; 				
-				WORD *src_data = (WORD*) (new_bits + line - bytespp); 				
+				uint16_t *dst_data = (uint16_t*) bits; 				
+				uint16_t *src_data = (uint16_t*) (new_bits + line - bytespp); 				
 				for(unsigned c = 0; c < width; c++) { 			
 					*dst_data++ = *src_data--;  
 				} 
diff --git a/libs/freeimage/src/FreeImageToolkit/Resize.cpp b/libs/freeimage/src/FreeImageToolkit/Resize.cpp
index 9781be9788..7eac266cd0 100644
--- a/libs/freeimage/src/FreeImageToolkit/Resize.cpp
+++ b/libs/freeimage/src/FreeImageToolkit/Resize.cpp
@@ -981,14 +981,14 @@ void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsig
 						// image has 565 format
 						for (unsigned y = 0; y < height; y++) {
 							// scale each row
-							const WORD * const src_bits = (WORD *)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(WORD);
+							const uint16_t * const src_bits = (uint16_t *)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(uint16_t);
 							uint8_t *dst_bits = FreeImage_GetScanLine(dst, y);
 
 							for (unsigned x = 0; x < dst_width; x++) {
 								// loop through row
 								const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
 								const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-								const WORD *pixel = src_bits + iLeft;
+								const uint16_t *pixel = src_bits + iLeft;
 								double r = 0, g = 0, b = 0;
 
 								// for(i = iLeft to iRight)
@@ -1013,14 +1013,14 @@ void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsig
 						// image has 555 format
 						for (unsigned y = 0; y < height; y++) {
 							// scale each row
-							const WORD * const src_bits = (WORD *)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
+							const uint16_t * const src_bits = (uint16_t *)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x;
 							uint8_t *dst_bits = FreeImage_GetScanLine(dst, y);
 
 							for (unsigned x = 0; x < dst_width; x++) {
 								// loop through row
 								const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
 								const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-								const WORD *pixel = src_bits + iLeft;
+								const uint16_t *pixel = src_bits + iLeft;
 								double r = 0, g = 0, b = 0;
 
 								// for(i = iLeft to iRight)
@@ -1125,18 +1125,18 @@ void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsig
 		case FIT_UINT16:
 		{
 			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(WORD);
+			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(uint16_t);
 
 			for (unsigned y = 0; y < height; y++) {
 				// scale each row
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(WORD);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				const uint16_t *src_bits = (uint16_t*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(uint16_t);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 
 				for (unsigned x = 0; x < dst_width; x++) {
 					// loop through row
 					const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
 					const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-					const WORD *pixel = src_bits + iLeft * wordspp;
+					const uint16_t *pixel = src_bits + iLeft * wordspp;
 					double value = 0;
 
 					// for(i = iLeft to iRight)
@@ -1149,7 +1149,7 @@ void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsig
 					}
 
 					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(value + 0.5), 0, 0xFFFF);
+					dst_bits[0] = (uint16_t)CLAMP<int>((int)(value + 0.5), 0, 0xFFFF);
 					dst_bits += wordspp;
 				}
 			}
@@ -1159,18 +1159,18 @@ void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsig
 		case FIT_RGB16:
 		{
 			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(WORD);
+			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(uint16_t);
 
 			for (unsigned y = 0; y < height; y++) {
 				// scale each row
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(WORD);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				const uint16_t *src_bits = (uint16_t*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(uint16_t);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 
 				for (unsigned x = 0; x < dst_width; x++) {
 					// loop through row
 					const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
 					const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-					const WORD *pixel = src_bits + iLeft * wordspp;
+					const uint16_t *pixel = src_bits + iLeft * wordspp;
 					double r = 0, g = 0, b = 0;
 
 					// for(i = iLeft to iRight)
@@ -1185,9 +1185,9 @@ void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsig
 					}
 
 					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
-					dst_bits[1] = (WORD)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
-					dst_bits[2] = (WORD)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
+					dst_bits[0] = (uint16_t)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
+					dst_bits[1] = (uint16_t)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
+					dst_bits[2] = (uint16_t)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
 					dst_bits += wordspp;
 				}
 			}
@@ -1197,18 +1197,18 @@ void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsig
 		case FIT_RGBA16:
 		{
 			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(WORD);
+			const unsigned wordspp = (FreeImage_GetLine(src) / src_width) / sizeof(uint16_t);
 
 			for (unsigned y = 0; y < height; y++) {
 				// scale each row
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(WORD);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				const uint16_t *src_bits = (uint16_t*)FreeImage_GetScanLine(src, y + src_offset_y) + src_offset_x / sizeof(uint16_t);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 
 				for (unsigned x = 0; x < dst_width; x++) {
 					// loop through row
 					const unsigned iLeft = weightsTable.getLeftBoundary(x);				// retrieve left boundary
 					const unsigned iLimit = weightsTable.getRightBoundary(x) - iLeft;	// retrieve right boundary
-					const WORD *pixel = src_bits + iLeft * wordspp;
+					const uint16_t *pixel = src_bits + iLeft * wordspp;
 					double r = 0, g = 0, b = 0, a = 0;
 
 					// for(i = iLeft to iRight)
@@ -1224,10 +1224,10 @@ void CResizeEngine::horizontalFilter(FIBITMAP *const src, unsigned height, unsig
 					}
 
 					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
-					dst_bits[1] = (WORD)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
-					dst_bits[2] = (WORD)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
-					dst_bits[3] = (WORD)CLAMP<int>((int)(a + 0.5), 0, 0xFFFF);
+					dst_bits[0] = (uint16_t)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
+					dst_bits[1] = (uint16_t)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
+					dst_bits[2] = (uint16_t)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
+					dst_bits[3] = (uint16_t)CLAMP<int>((int)(a + 0.5), 0, 0xFFFF);
 					dst_bits += wordspp;
 				}
 			}
@@ -1781,8 +1781,8 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 				case 16:
 				{
 					// transparently convert the 16-bit non-transparent image to 24 bpp
-					const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(WORD);
-					const WORD *const src_base = (WORD *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x;
+					const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(uint16_t);
+					const uint16_t *const src_base = (uint16_t *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x;
 
 					if (IS_FORMAT_RGB565(src)) {
 						// image has 565 format
@@ -1795,7 +1795,7 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 								// loop through column
 								const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
 								const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-								const WORD *src_bits = src_base + iLeft * src_pitch + x;
+								const uint16_t *src_bits = src_base + iLeft * src_pitch + x;
 								double r = 0, g = 0, b = 0;
 
 								for (unsigned i = 0; i < iLimit; i++) {
@@ -1826,7 +1826,7 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 								// loop through column
 								const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
 								const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-								const WORD *src_bits = src_base + iLeft * src_pitch + x;
+								const uint16_t *src_bits = src_base + iLeft * src_pitch + x;
 								double r = 0, g = 0, b = 0;
 
 								for (unsigned i = 0; i < iLimit; i++) {
@@ -1936,25 +1936,25 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 		case FIT_UINT16:
 		{
 			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD);
+			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(uint16_t);
 
-			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(WORD);
-			WORD *const dst_base = (WORD *)FreeImage_GetBits(dst);
+			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(uint16_t);
+			uint16_t *const dst_base = (uint16_t *)FreeImage_GetBits(dst);
 
-			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(WORD);
-			const WORD *const src_base = (WORD *)FreeImage_GetBits(src)	+ src_offset_y * src_pitch + src_offset_x * wordspp;
+			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(uint16_t);
+			const uint16_t *const src_base = (uint16_t *)FreeImage_GetBits(src)	+ src_offset_y * src_pitch + src_offset_x * wordspp;
 
 			for (unsigned x = 0; x < width; x++) {
 				// work on column x in dst
 				const unsigned index = x * wordspp;	// pixel index
-				WORD *dst_bits = dst_base + index;
+				uint16_t *dst_bits = dst_base + index;
 
 				// scale each column
 				for (unsigned y = 0; y < dst_height; y++) {
 					// loop through column
 					const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
 					const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-					const WORD *src_bits = src_base + iLeft * src_pitch + index;
+					const uint16_t *src_bits = src_base + iLeft * src_pitch + index;
 					double value = 0;
 
 					for (unsigned i = 0; i < iLimit; i++) {
@@ -1966,7 +1966,7 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 					}
 
 					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(value + 0.5), 0, 0xFFFF);
+					dst_bits[0] = (uint16_t)CLAMP<int>((int)(value + 0.5), 0, 0xFFFF);
 
 					dst_bits += dst_pitch;
 				}
@@ -1977,25 +1977,25 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 		case FIT_RGB16:
 		{
 			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD);
+			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(uint16_t);
 
-			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(WORD);
-			WORD *const dst_base = (WORD *)FreeImage_GetBits(dst);
+			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(uint16_t);
+			uint16_t *const dst_base = (uint16_t *)FreeImage_GetBits(dst);
 
-			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(WORD);
-			const WORD *const src_base = (WORD *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * wordspp;
+			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(uint16_t);
+			const uint16_t *const src_base = (uint16_t *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * wordspp;
 
 			for (unsigned x = 0; x < width; x++) {
 				// work on column x in dst
 				const unsigned index = x * wordspp;	// pixel index
-				WORD *dst_bits = dst_base + index;
+				uint16_t *dst_bits = dst_base + index;
 
 				// scale each column
 				for (unsigned y = 0; y < dst_height; y++) {
 					// loop through column
 					const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
 					const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-					const WORD *src_bits = src_base + iLeft * src_pitch + index;
+					const uint16_t *src_bits = src_base + iLeft * src_pitch + index;
 					double r = 0, g = 0, b = 0;
 
 					for (unsigned i = 0; i < iLimit; i++) {
@@ -2010,9 +2010,9 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 					}
 
 					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
-					dst_bits[1] = (WORD)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
-					dst_bits[2] = (WORD)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
+					dst_bits[0] = (uint16_t)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
+					dst_bits[1] = (uint16_t)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
+					dst_bits[2] = (uint16_t)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
 
 					dst_bits += dst_pitch;
 				}
@@ -2023,25 +2023,25 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 		case FIT_RGBA16:
 		{
 			// Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit)
-			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD);
+			const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(uint16_t);
 
-			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(WORD);
-			WORD *const dst_base = (WORD *)FreeImage_GetBits(dst);
+			const unsigned dst_pitch = FreeImage_GetPitch(dst) / sizeof(uint16_t);
+			uint16_t *const dst_base = (uint16_t *)FreeImage_GetBits(dst);
 
-			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(WORD);
-			const WORD *const src_base = (WORD *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * wordspp;
+			const unsigned src_pitch = FreeImage_GetPitch(src) / sizeof(uint16_t);
+			const uint16_t *const src_base = (uint16_t *)FreeImage_GetBits(src) + src_offset_y * src_pitch + src_offset_x * wordspp;
 
 			for (unsigned x = 0; x < width; x++) {
 				// work on column x in dst
 				const unsigned index = x * wordspp;	// pixel index
-				WORD *dst_bits = dst_base + index;
+				uint16_t *dst_bits = dst_base + index;
 
 				// scale each column
 				for (unsigned y = 0; y < dst_height; y++) {
 					// loop through column
 					const unsigned iLeft = weightsTable.getLeftBoundary(y);				// retrieve left boundary
 					const unsigned iLimit = weightsTable.getRightBoundary(y) - iLeft;	// retrieve right boundary
-					const WORD *src_bits = src_base + iLeft * src_pitch + index;
+					const uint16_t *src_bits = src_base + iLeft * src_pitch + index;
 					double r = 0, g = 0, b = 0, a = 0;
 
 					for (unsigned i = 0; i < iLimit; i++) {
@@ -2057,10 +2057,10 @@ void CResizeEngine::verticalFilter(FIBITMAP *const src, unsigned width, unsigned
 					}
 
 					// clamp and place result in destination pixel
-					dst_bits[0] = (WORD)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
-					dst_bits[1] = (WORD)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
-					dst_bits[2] = (WORD)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
-					dst_bits[3] = (WORD)CLAMP<int>((int)(a + 0.5), 0, 0xFFFF);
+					dst_bits[0] = (uint16_t)CLAMP<int>((int)(r + 0.5), 0, 0xFFFF);
+					dst_bits[1] = (uint16_t)CLAMP<int>((int)(g + 0.5), 0, 0xFFFF);
+					dst_bits[2] = (uint16_t)CLAMP<int>((int)(b + 0.5), 0, 0xFFFF);
+					dst_bits[3] = (uint16_t)CLAMP<int>((int)(a + 0.5), 0, 0xFFFF);
 
 					dst_bits += dst_pitch;
 				}
diff --git a/libs/freeimage/src/Metadata/Exif.cpp b/libs/freeimage/src/Metadata/Exif.cpp
index 9fbaf3b1af..1b7dad3916 100644
--- a/libs/freeimage/src/Metadata/Exif.cpp
+++ b/libs/freeimage/src/Metadata/Exif.cpp
@@ -121,15 +121,15 @@ ReadInt32(BOOL msb_order, const void *buffer) {
 	return value;
 }
 
-static WORD 
+static uint16_t 
 ReadUint16(BOOL msb_order, const void *buffer) {
-	WORD value;
+	uint16_t value;
 	
 	if(msb_order) {
-		value = (WORD) ((((uint8_t*) buffer)[0] << 8) | ((uint8_t*) buffer)[1]);
+		value = (uint16_t) ((((uint8_t*) buffer)[0] << 8) | ((uint8_t*) buffer)[1]);
 		return value;
     }
-	value = (WORD) ((((uint8_t*) buffer)[1] << 8) | ((uint8_t*) buffer)[0]);
+	value = (uint16_t) ((((uint8_t*) buffer)[1] << 8) | ((uint8_t*) buffer)[0]);
 	return value;
 }
 
@@ -310,7 +310,7 @@ processCanonMakerNoteTag(FIBITMAP *dib, FITAG *tag) {
 	DWORD startIndex = 0;
 	TagLib& s = TagLib::instance();
 
-	WORD tag_id = FreeImage_GetTagID(tag);
+	uint16_t tag_id = FreeImage_GetTagID(tag);
 
 	int subTagTypeBase = 0;
 
@@ -361,7 +361,7 @@ processCanonMakerNoteTag(FIBITMAP *dib, FITAG *tag) {
 
 	}
 
-	WORD *pvalue = (WORD*)FreeImage_GetTagValue(tag);
+	uint16_t *pvalue = (uint16_t*)FreeImage_GetTagValue(tag);
 
 	// create a tag
 	FITAG *canonTag = FreeImage_CreateTag();
@@ -370,7 +370,7 @@ processCanonMakerNoteTag(FIBITMAP *dib, FITAG *tag) {
 	// we intentionally skip the first array member (if needed)
     for (DWORD i = startIndex; i < FreeImage_GetTagCount(tag); i++) {
 
-		tag_id = (WORD)(subTagTypeBase + i);
+		tag_id = (uint16_t)(subTagTypeBase + i);
 
 		FreeImage_SetTagID(canonTag, tag_id);
 		FreeImage_SetTagType(canonTag, FIDT_SHORT);
@@ -418,9 +418,9 @@ processExifTag(FIBITMAP *dib, FITAG *tag, char *pval, BOOL msb_order, TagLib::MD
 
 		case FIDT_SHORT:
 		{
-			WORD *value = (WORD*)&exif_value[0];
+			uint16_t *value = (uint16_t*)&exif_value[0];
 			for(i = 0; i < FreeImage_GetTagCount(tag); i++) {
-				value[i] = ReadUint16(msb_order, pval + i * sizeof(WORD));
+				value[i] = ReadUint16(msb_order, pval + i * sizeof(uint16_t));
 			}
 			FreeImage_SetTagValue(tag, value);
 			break;
@@ -494,7 +494,7 @@ processExifTag(FIBITMAP *dib, FITAG *tag, char *pval, BOOL msb_order, TagLib::MD
 	else {
 		TagLib& s = TagLib::instance();
 
-		WORD tag_id = FreeImage_GetTagID(tag);
+		uint16_t tag_id = FreeImage_GetTagID(tag);
 
 		// get the tag key and description
 		const char *key = s.getTagFieldName(md_model, tag_id, defaultKey);
@@ -528,9 +528,9 @@ Process Exif directory
 */
 static BOOL 
 jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWORD dwLength, DWORD dwProfileOffset, BOOL msb_order, TagLib::MDMODEL starting_md_model) {
-	WORD de, nde;
+	uint16_t de, nde;
 
-	std::stack<WORD>			destack;	// directory entries stack
+	std::stack<uint16_t>			destack;	// directory entries stack
 	std::stack<const uint8_t*>		ifdstack;	// IFD stack
 	std::stack<TagLib::MDMODEL>	modelstack; // metadata model stack
 
@@ -595,11 +595,11 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR
 			pde = (char*) DIR_ENTRY_ADDR(ifdp, de);
 
 			// get the tag ID
-			WORD tag_id = ReadUint16(msb_order, pde);
+			uint16_t tag_id = ReadUint16(msb_order, pde);
 			FreeImage_SetTagID(tag, tag_id);
 
 			// get the tag type
-			WORD tag_type = (WORD)ReadUint16(msb_order, pde + 2);
+			uint16_t tag_type = (uint16_t)ReadUint16(msb_order, pde + 2);
             if((tag_type - 1) >= EXIF_NUM_FORMATS) {
                 // a problem occured : delete the tag (not free'd after)
 			    FreeImage_DeleteTag(tag);
@@ -718,7 +718,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR
 	// --- handle thumbnail data ---
 	//
 
-	const WORD entriesCount0th = ReadUint16(msb_order, ifd0th);
+	const uint16_t entriesCount0th = ReadUint16(msb_order, ifd0th);
 	
 	DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th));
 	if((next_offset == 0) || (next_offset >= dwLength)) {
@@ -726,7 +726,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR
 	}
 	
 	const uint8_t* const ifd1st = (uint8_t*)tiffp + next_offset;
-	const WORD entriesCount1st = ReadUint16(msb_order, ifd1st);
+	const uint16_t entriesCount1st = ReadUint16(msb_order, ifd1st);
 	
 	unsigned thCompression = 0;
 	unsigned thOffset = 0; 
@@ -745,13 +745,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR
 		}
 
 		// get the tag ID
-		WORD tag = ReadUint16(msb_order, base);
+		uint16_t tag = ReadUint16(msb_order, base);
 		// get the tag type
-		/*WORD type = */ReadUint16(msb_order, base + sizeof(WORD));
+		/*uint16_t type = */ReadUint16(msb_order, base + sizeof(uint16_t));
 		// get number of components
-		/*DWORD count = */ReadUint32(msb_order, base + sizeof(WORD) + sizeof(WORD));
+		/*DWORD count = */ReadUint32(msb_order, base + sizeof(uint16_t) + sizeof(uint16_t));
 		// get the tag value
-		DWORD offset = ReadUint32(msb_order, base + sizeof(WORD) + sizeof(WORD) + sizeof(DWORD));
+		DWORD offset = ReadUint32(msb_order, base + sizeof(uint16_t) + sizeof(uint16_t) + sizeof(DWORD));
 
 		switch(tag) {
 			case TAG_COMPRESSION:
@@ -973,7 +973,7 @@ RotateExif(FIBITMAP **dib) {
 		FITAG *tag = NULL;
 		FreeImage_GetMetadata(FIMD_EXIF_MAIN, *dib, "Orientation", &tag);
 		if((tag != NULL) && (FreeImage_GetTagID(tag) == TAG_ORIENTATION)) {
-			const WORD orientation = *((WORD *)FreeImage_GetTagValue(tag));
+			const uint16_t orientation = *((uint16_t *)FreeImage_GetTagValue(tag));
 			switch (orientation) {
 				case 1:		// "top, left side" => 0°
 					break;
@@ -1024,8 +1024,8 @@ RotateExif(FIBITMAP **dib) {
 class PredicateTagIDCompare {
 public:
 	bool operator()(FITAG *a, FITAG *b) {
-		WORD tag_id_a = FreeImage_GetTagID(a);
-		WORD tag_id_b = FreeImage_GetTagID(b);
+		uint16_t tag_id_a = FreeImage_GetTagID(a);
+		uint16_t tag_id_b = FreeImage_GetTagID(b);
 		return (tag_id_a < tag_id_b);
 	}
 };
@@ -1056,7 +1056,7 @@ tiff_write_ifd(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, FIMEMORY *hmem) {
 	std::vector<FITAG*> vTagList;
 	TagLib::MDMODEL internal_md_model;
 
-	DWORD ifd_offset = 0;	// WORD-aligned IFD value offset
+	DWORD ifd_offset = 0;	// uint16_t-aligned IFD value offset
 
 	const uint8_t empty_byte = 0;
 
@@ -1105,7 +1105,7 @@ tiff_write_ifd(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, FIMEMORY *hmem) {
 				int tag_id = s.getTagID(internal_md_model, key);
 				if(tag_id != -1) {
 					// this is a known tag, set the tag ID
-					FreeImage_SetTagID(tag, (WORD)tag_id);
+					FreeImage_SetTagID(tag, (uint16_t)tag_id);
 					// record the tag
 					vTagList.push_back(tag);
 				}
@@ -1145,17 +1145,17 @@ tiff_write_ifd(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, FIMEMORY *hmem) {
 		// 3) write each IFD entry in tag id ascending order
 
 		// number of directory entries
-		WORD nde = (WORD)metadata_count;
+		uint16_t nde = (uint16_t)metadata_count;
 		FreeImage_WriteMemory(&nde, 1, 2, hmem);
 
 		// for each entry ...
 		for(unsigned i = 0; i < metadata_count; i++) {
 			FITAG *tag = vTagList[i];
 			// tag id
-			WORD tag_id = FreeImage_GetTagID(tag);
+			uint16_t tag_id = FreeImage_GetTagID(tag);
 			FreeImage_WriteMemory(&tag_id, 1, 2, hmem);
 			// tag type (compliant with TIFF specification)
-			WORD tag_type = (WORD)FreeImage_GetTagType(tag);
+			uint16_t tag_type = (uint16_t)FreeImage_GetTagType(tag);
 			FreeImage_WriteMemory(&tag_type, 1, 2, hmem);
 			// tag count
 			DWORD tag_count = FreeImage_GetTagCount(tag);
@@ -1177,7 +1177,7 @@ tiff_write_ifd(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, FIMEMORY *hmem) {
 				FreeImage_SeekMemory(hmem, ifd_offset, SEEK_SET);
 				FreeImage_WriteMemory(FreeImage_GetTagValue(tag), 1, tag_length, hmem);
 				if(tag_length & 1) {
-					// align to the next WORD boundary
+					// align to the next uint16_t boundary
 					FreeImage_WriteMemory(&empty_byte, 1, 1, hmem);
 				}
 				// next offset to use
diff --git a/libs/freeimage/src/Metadata/FreeImageTag.cpp b/libs/freeimage/src/Metadata/FreeImageTag.cpp
index 1f4f709010..ceaec666f1 100644
--- a/libs/freeimage/src/Metadata/FreeImageTag.cpp
+++ b/libs/freeimage/src/Metadata/FreeImageTag.cpp
@@ -34,8 +34,8 @@
 FI_STRUCT (FITAGHEADER) { 
 	char *key;			// tag field name
 	char *description;	// tag description
-	WORD id;			// tag ID
-	WORD type;			// tag data type (see FREE_IMAGE_MDTYPE)
+	uint16_t id;			// tag ID
+	uint16_t type;			// tag data type (see FREE_IMAGE_MDTYPE)
 	DWORD count;		// number of components (in 'tag data types' units)
 	DWORD length;		// value length in bytes
 	void *value;		// tag value
@@ -158,7 +158,7 @@ FreeImage_GetTagDescription(FITAG *tag) {
 	return tag ? ((FITAGHEADER *)tag->data)->description : 0;
 }
 
-WORD DLL_CALLCONV 
+uint16_t DLL_CALLCONV 
 FreeImage_GetTagID(FITAG *tag) {
 	return tag ? ((FITAGHEADER *)tag->data)->id : 0;
 }
@@ -208,7 +208,7 @@ FreeImage_SetTagDescription(FITAG *tag, const char *description) {
 }
 
 BOOL DLL_CALLCONV 
-FreeImage_SetTagID(FITAG *tag, WORD id) {
+FreeImage_SetTagID(FITAG *tag, uint16_t id) {
 	if(tag) {
 		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
 		tag_header->id = id;
@@ -221,7 +221,7 @@ BOOL DLL_CALLCONV
 FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type) {
 	if(tag) {
 		FITAGHEADER *tag_header = (FITAGHEADER *)tag->data;
-		tag_header->type = (WORD)type;
+		tag_header->type = (uint16_t)type;
 		return TRUE;
 	}
 	return FALSE;
diff --git a/libs/freeimage/src/Metadata/IPTC.cpp b/libs/freeimage/src/Metadata/IPTC.cpp
index c8884e4b32..149ecc9b33 100644
--- a/libs/freeimage/src/Metadata/IPTC.cpp
+++ b/libs/freeimage/src/Metadata/IPTC.cpp
@@ -46,7 +46,7 @@ read_iptc_profile(FIBITMAP *dib, const uint8_t *dataptr, unsigned int datalen) {
 	std::string Keywords;
 	std::string SupplementalCategory;
 
-	WORD tag_id;
+	uint16_t tag_id;
 
 	if(!dataptr || (datalen == 0)) {
 		return FALSE;
@@ -107,7 +107,7 @@ read_iptc_profile(FIBITMAP *dib, const uint8_t *dataptr, unsigned int datalen) {
 
 		// process the tag
 
-		tag_id = (WORD)(tagType | (directoryType << 8));
+		tag_id = (uint16_t)(tagType | (directoryType << 8));
 
 		FreeImage_SetTagID(tag, tag_id);
 		FreeImage_SetTagLength(tag, tagByteCount);
@@ -222,7 +222,7 @@ read_iptc_profile(FIBITMAP *dib, const uint8_t *dataptr, unsigned int datalen) {
 // --------------------------------------------------------------------------
 
 static uint8_t* 
-append_iptc_tag(uint8_t *profile, unsigned *profile_size, WORD id, DWORD length, const void *value) {
+append_iptc_tag(uint8_t *profile, unsigned *profile_size, uint16_t id, DWORD length, const void *value) {
 	uint8_t *buffer = NULL;
 
 	// calculate the new buffer size
@@ -271,7 +271,7 @@ write_iptc_profile(FIBITMAP *dib, uint8_t **profile, unsigned *profile_size) {
 
 	if(mdhandle) {
 		do {
-			WORD tag_id	= FreeImage_GetTagID(tag);
+			uint16_t tag_id	= FreeImage_GetTagID(tag);
 
 			// append the tag to the profile
 
diff --git a/libs/freeimage/src/Metadata/TagConversion.cpp b/libs/freeimage/src/Metadata/TagConversion.cpp
index 02743d929d..6d2ca14e2d 100644
--- a/libs/freeimage/src/Metadata/TagConversion.cpp
+++ b/libs/freeimage/src/Metadata/TagConversion.cpp
@@ -896,7 +896,7 @@ ConvertExifTag(FITAG *tag) {
 
 		case TAG_COMPRESSION:
 		{
-			WORD compression = *((WORD*)FreeImage_GetTagValue(tag));
+			uint16_t compression = *((uint16_t*)FreeImage_GetTagValue(tag));
 			switch(compression) {
 				case TAG_COMPRESSION_NONE:
 					sprintf(format, "dump mode (%d)", compression);
diff --git a/libs/freeimage/src/Metadata/TagLib.cpp b/libs/freeimage/src/Metadata/TagLib.cpp
index cc496dd58a..dfec8a4dcd 100644
--- a/libs/freeimage/src/Metadata/TagLib.cpp
+++ b/libs/freeimage/src/Metadata/TagLib.cpp
@@ -1515,7 +1515,7 @@ TagLib& TagLib::instance() {
 }
 
 const TagInfo* 
-TagLib::getTagInfo(MDMODEL md_model, WORD tagID) {
+TagLib::getTagInfo(MDMODEL md_model, uint16_t tagID) {
 
 	if(_table_map.find(md_model) != _table_map.end()) {
 
@@ -1528,7 +1528,7 @@ TagLib::getTagInfo(MDMODEL md_model, WORD tagID) {
 }
 
 const char* 
-TagLib::getTagFieldName(MDMODEL md_model, WORD tagID, char *defaultKey) {
+TagLib::getTagFieldName(MDMODEL md_model, uint16_t tagID, char *defaultKey) {
 
 	const TagInfo *info = getTagInfo(md_model, tagID);
 	if(NULL == info) {
@@ -1544,7 +1544,7 @@ TagLib::getTagFieldName(MDMODEL md_model, WORD tagID, char *defaultKey) {
 }
 
 const char* 
-TagLib::getTagDescription(MDMODEL md_model, WORD tagID) {
+TagLib::getTagDescription(MDMODEL md_model, uint16_t tagID) {
 
 	const TagInfo *info = getTagInfo(md_model, tagID);
 	if(info) {
diff --git a/libs/freeimage/src/Quantizers.h b/libs/freeimage/src/Quantizers.h
index 71627361f6..289f237bbb 100644
--- a/libs/freeimage/src/Quantizers.h
+++ b/libs/freeimage/src/Quantizers.h
@@ -50,7 +50,7 @@ typedef struct tagBox {
 protected:
     float *gm2;
 	LONG *wt, *mr, *mg, *mb;
-	WORD *Qadd;
+	uint16_t *Qadd;
 
 	// DIB data
 	unsigned width, height;
diff --git a/libs/freeimage/src/Utilities.h b/libs/freeimage/src/Utilities.h
index c783ba44e9..5c8331eea3 100644
--- a/libs/freeimage/src/Utilities.h
+++ b/libs/freeimage/src/Utilities.h
@@ -288,11 +288,11 @@ AssignPixel(uint8_t* dst, const uint8_t* src, unsigned bytesperpixel) {
 			break;
 
 		case 2: // FIT_UINT16 / FIT_INT16 / 16-bit
-			*(reinterpret_cast<WORD*>(dst)) = *(reinterpret_cast<const WORD*> (src));
+			*(reinterpret_cast<uint16_t*>(dst)) = *(reinterpret_cast<const uint16_t*> (src));
 			break;
 
 		case 3: // FIT_BITMAP (24-bit)
-			*(reinterpret_cast<WORD*>(dst)) = *(reinterpret_cast<const WORD*> (src));
+			*(reinterpret_cast<uint16_t*>(dst)) = *(reinterpret_cast<const uint16_t*> (src));
 			dst[2] = src[2];
 			break;
 
@@ -302,7 +302,7 @@ AssignPixel(uint8_t* dst, const uint8_t* src, unsigned bytesperpixel) {
 
 		case 6: // FIT_RGB16 (3 x 16-bit)
 			*(reinterpret_cast<DWORD*>(dst)) = *(reinterpret_cast<const DWORD*> (src));
-			*(reinterpret_cast<WORD*>(dst + 4)) = *(reinterpret_cast<const WORD*> (src + 4));	
+			*(reinterpret_cast<uint16_t*>(dst + 4)) = *(reinterpret_cast<const uint16_t*> (src + 4));	
 			break;
 
 		// the rest can be speeded up with int64
@@ -370,20 +370,20 @@ void RotateExif(FIBITMAP **dib);
 //   Big Endian / Little Endian utility functions
 // ==========================================================
 
-inline WORD 
-__SwapUInt16(WORD arg) { 
+inline uint16_t 
+__SwapUInt16(uint16_t arg) { 
 #if defined(_MSC_VER) && _MSC_VER >= 1310 
 	return _byteswap_ushort(arg); 
 #elif defined(__i386__) && defined(__GNUC__) 
 	__asm__("xchgb %b0, %h0" : "+q" (arg)); 
 	return arg; 
 #elif defined(__ppc__) && defined(__GNUC__) 
-	WORD result; 
+	uint16_t result; 
 	__asm__("lhbrx %0,0,%1" : "=r" (result) : "r" (&arg), "m" (arg)); 
 	return result; 
 #else 
 	// swap bytes 
-	WORD result;
+	uint16_t result;
 	result = ((arg << 8) & 0xFF00) | ((arg >> 8) & 0x00FF); 
 	return result; 
 #endif 
@@ -409,7 +409,7 @@ __SwapUInt32(DWORD arg) {
 } 
 
 inline void
-SwapShort(WORD *sp) {
+SwapShort(uint16_t *sp) {
 	*sp = __SwapUInt16(*sp);
 }
 
@@ -452,10 +452,10 @@ A Standard Default Color Space for the Internet - sRGB.
 
 #define GREY(r, g, b) (uint8_t)(LUMA_REC709(r, g, b) + 0.5F)
 /*
-#define GREY(r, g, b) (uint8_t)(((WORD)r * 77 + (WORD)g * 150 + (WORD)b * 29) >> 8)	// .299R + .587G + .114B
+#define GREY(r, g, b) (uint8_t)(((uint16_t)r * 77 + (uint16_t)g * 150 + (uint16_t)b * 29) >> 8)	// .299R + .587G + .114B
 */
 /*
-#define GREY(r, g, b) (uint8_t)(((WORD)r * 169 + (WORD)g * 256 + (WORD)b * 87) >> 9)	// .33R + 0.5G + .17B
+#define GREY(r, g, b) (uint8_t)(((uint16_t)r * 169 + (uint16_t)g * 256 + (uint16_t)b * 87) >> 9)	// .33R + 0.5G + .17B
 */
 
 /**
@@ -474,7 +474,7 @@ Returns TRUE if the format of a dib is RGB565
 #define IS_FORMAT_RGB565(dib) ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK))
 
 /**
-Convert a RGB565 or RGB555 RGBQUAD pixel to a WORD
+Convert a RGB565 or RGB555 RGBQUAD pixel to a uint16_t
 */
 #define RGBQUAD_TO_WORD(dib, color) (IS_FORMAT_RGB565(dib) ? RGB565((color)->rgbBlue, (color)->rgbGreen, (color)->rgbRed) : RGB555((color)->rgbBlue, (color)->rgbGreen, (color)->rgbRed))
 
diff --git a/libs/mTextControl/src/richeditutils.cpp b/libs/mTextControl/src/richeditutils.cpp
index 29f05e17e6..310b19c67f 100644
--- a/libs/mTextControl/src/richeditutils.cpp
+++ b/libs/mTextControl/src/richeditutils.cpp
@@ -55,7 +55,7 @@ public:
 		return E_NOTIMPL;
 	}
 
-	HRESULT STDMETHODCALLTYPE  GetContextMenu(WORD, LPOLEOBJECT, CHARRANGE *, HMENU *)
+	HRESULT STDMETHODCALLTYPE  GetContextMenu(uint16_t, LPOLEOBJECT, CHARRANGE *, HMENU *)
 	{
 		return E_INVALIDARG;
 	}
diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp
index bc65051d2d..e6ede21b3c 100644
--- a/plugins/AVS/src/acc.cpp
+++ b/plugins/AVS/src/acc.cpp
@@ -85,11 +85,11 @@ BOOL AnimatedGifGetData(ACCData *data)
 	FITAG *tag = nullptr;
 	if (!FreeImage_GetMetadata(FIMD_ANIMATION, page, "LogicalWidth", &tag))
 		goto ERR;
-	data->ag.logicalWidth = *(WORD *)FreeImage_GetTagValue(tag);
+	data->ag.logicalWidth = *(uint16_t *)FreeImage_GetTagValue(tag);
 
 	if (!FreeImage_GetMetadata(FIMD_ANIMATION, page, "LogicalHeight", &tag))
 		goto ERR;
-	data->ag.logicalHeight = *(WORD *)FreeImage_GetTagValue(tag);
+	data->ag.logicalHeight = *(uint16_t *)FreeImage_GetTagValue(tag);
 
 	if (!FreeImage_GetMetadata(FIMD_ANIMATION, page, "Loop", &tag))
 		goto ERR;
@@ -135,12 +135,12 @@ void AnimatedGifMountFrame(ACCData* data, int page)
 
 	FITAG *tag = nullptr;
 	if (FreeImage_GetMetadata(FIMD_ANIMATION, dib, "FrameLeft", &tag))
-		data->ag.frame.left = *(WORD *)FreeImage_GetTagValue(tag);
+		data->ag.frame.left = *(uint16_t *)FreeImage_GetTagValue(tag);
 	else
 		data->ag.frame.left = 0;
 
 	if (FreeImage_GetMetadata(FIMD_ANIMATION, dib, "FrameTop", &tag))
-		data->ag.frame.top = *(WORD *)FreeImage_GetTagValue(tag);
+		data->ag.frame.top = *(uint16_t *)FreeImage_GetTagValue(tag);
 	else
 		data->ag.frame.top = 0;
 
diff --git a/plugins/AVS/src/image_utils.cpp b/plugins/AVS/src/image_utils.cpp
index 3783f2ab3a..a43177ad9b 100644
--- a/plugins/AVS/src/image_utils.cpp
+++ b/plugins/AVS/src/image_utils.cpp
@@ -270,7 +270,7 @@ DWORD GetImgHash(HBITMAP hBitmap)
 	GetObject(hBitmap, sizeof(bmp), &bmp);
 
 	DWORD dwLen = bmp.bmWidth * bmp.bmHeight * (bmp.bmBitsPixel / 8);
-	WORD *p = (WORD *)malloc(dwLen);
+	uint16_t *p = (uint16_t *)malloc(dwLen);
 	if (p == nullptr)
 		return 0;
 	memset(p, 0, dwLen);
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp
index f75005773b..76387ce72f 100644
--- a/plugins/AVS/src/options.cpp
+++ b/plugins/AVS/src/options.cpp
@@ -221,8 +221,8 @@ static INT_PTR CALLBACK DlgProcOptionsAvatars(HWND hwndDlg, UINT msg, WPARAM wPa
 				g_plugin.setByte("MakeGrayscale", IsDlgButtonChecked(hwndDlg, IDC_MAKE_GRAYSCALE) ? 1 : 0);
 				g_plugin.setByte("MakeTransparentBkg", IsDlgButtonChecked(hwndDlg, IDC_MAKE_TRANSPARENT_BKG) ? 1 : 0);
 				g_plugin.setByte("MakeTransparencyProportionalToColorDiff", IsDlgButtonChecked(hwndDlg, IDC_MAKE_TRANSP_PROPORTIONAL) ? 1 : 0);
-				g_plugin.setWord("TranspBkgNumPoints", (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_GETPOS, 0, 0));
-				g_plugin.setWord("TranspBkgColorDiff", (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("TranspBkgNumPoints", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("TranspBkgColorDiff", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_GETPOS, 0, 0));
 			}
 		}
 		break;
@@ -452,13 +452,13 @@ static void SaveTransparentData(HWND hwndDlg, MCONTACT hContact)
 	else
 		db_set_b(hContact, "ContactPhoto", "MakeTransparentBkg", transp);
 
-	WORD tmp = (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_GETPOS, 0, 0);
+	uint16_t tmp = (uint16_t)SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_GETPOS, 0, 0);
 	if (g_plugin.getWord("TranspBkgNumPoints", 5) == tmp)
 		db_unset(hContact, "ContactPhoto", "TranspBkgNumPoints");
 	else
 		db_set_w(hContact, "ContactPhoto", "TranspBkgNumPoints", tmp);
 
-	tmp = (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_GETPOS, 0, 0);
+	tmp = (uint16_t)SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_GETPOS, 0, 0);
 	if (g_plugin.getWord("TranspBkgColorDiff", 10) == tmp)
 		db_unset(hContact, "ContactPhoto", "TranspBkgColorDiff");
 	else
diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp
index 177dd5a2af..1f7fbb429f 100755
--- a/plugins/Alarms/src/options.cpp
+++ b/plugins/Alarms/src/options.cpp
@@ -361,7 +361,7 @@ static INT_PTR CALLBACK DlgProcAddEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			add_edit_alarm->time.wDayOfWeek = (unsigned short)SendDlgItemMessage(hwndDlg, IDC_DAY, CB_GETCURSEL, 0, 0);
 
 		if (add_edit_alarm->occurrence == OC_MONTHLY)
-			add_edit_alarm->time.wDay = (WORD)SendDlgItemMessage(hwndDlg, IDC_DAYNUM, CB_GETCURSEL, 0, 0) + 1;
+			add_edit_alarm->time.wDay = (uint16_t)SendDlgItemMessage(hwndDlg, IDC_DAYNUM, CB_GETCURSEL, 0, 0) + 1;
 
 		SendDlgItemMessage(hwndDlg, IDC_TIME, DTM_GETSYSTEMTIME, 0, (LPARAM)&temp_time);
 		add_edit_alarm->time.wHour = temp_time.wHour;
diff --git a/plugins/AsSingleWindow/src/Options.cpp b/plugins/AsSingleWindow/src/Options.cpp
index 3bbabf2c9c..a55c9fb667 100644
--- a/plugins/AsSingleWindow/src/Options.cpp
+++ b/plugins/AsSingleWindow/src/Options.cpp
@@ -64,8 +64,8 @@ void dlgProcessInit(HWND hWnd, UINT, WPARAM, LPARAM)
 
 void dlgProcessCommand(HWND hWnd, UINT, WPARAM wParam, LPARAM)
 {
-	WORD idCtrl = LOWORD(wParam);
-	WORD idNotifyCode = HIWORD(wParam);
+	uint16_t idCtrl = LOWORD(wParam);
+	uint16_t idNotifyCode = HIWORD(wParam);
 
 	switch (idCtrl) {
 	case IDC_RADIO_G1_LEFTCL:
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index ecaa58231f..74504addaa 100644
--- a/plugins/AssocMgr/src/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
@@ -351,9 +351,9 @@ static bool AddNewAssocItem_Worker(char *pszClassName, const TYPEDESCHEAD *tdh,
 	assoc->pszClassName = pszClassName; // no dup here
 	assoc->pszDescription = s2t(tdh->pszDescription, tdh->flags & FTDF_UNICODE, TRUE); // does NULL check
 	assoc->hInstance = tdh->hInstance; // hInstance is allowed to be NULL for miranda32.exe
-	assoc->nIconResID = (WORD)tdh->nIconResID; // default icon selected later on
+	assoc->nIconResID = (uint16_t)tdh->nIconResID; // default icon selected later on
 	assoc->pszService = mir_strdup(tdh->pszService); // does NULL check
-	assoc->flags = (WORD)tdh->flags;
+	assoc->flags = (uint16_t)tdh->flags;
 	assoc->pszFileExt = pszFileExt;
 	assoc->pszMimeType = pszMimeType;
 	assoc->pszVerbDesc = pszVerbDesc;
diff --git a/plugins/AssocMgr/src/assoclist.h b/plugins/AssocMgr/src/assoclist.h
index 5ae8e1938b..1cecac01f2 100644
--- a/plugins/AssocMgr/src/assoclist.h
+++ b/plugins/AssocMgr/src/assoclist.h
@@ -41,9 +41,9 @@ struct ASSOCDATA : public MZeroedObject
 	ptrA pszClassName;    // class name as used in registry and db
 	ptrW pszDescription;
 	HINSTANCE hInstance;   // allowed to be NULL for miranda32.exe
-	WORD nIconResID;
+	uint16_t nIconResID;
 	ptrA pszService;
-	WORD flags;            // set of FTDF_* and UTDF_* flags
+	uint16_t flags;            // set of FTDF_* and UTDF_* flags
 	ptrA pszFileExt;      // file type: NULL for url type
 	ptrA pszMimeType;     // file type: allowed to be NULL
 	ptrW pszVerbDesc;    // file type: allowed to be NULL
diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp
index 4bd7f44bbf..effd65643b 100644
--- a/plugins/AssocMgr/src/reg.cpp
+++ b/plugins/AssocMgr/src/reg.cpp
@@ -220,7 +220,7 @@ static BOOL IsValidRunCommand(const wchar_t *pszRunCmd)
 }
 
 // mir_free() the return value
-wchar_t* MakeIconLocation(HMODULE hModule, WORD nIconResID)
+wchar_t* MakeIconLocation(HMODULE hModule, uint16_t nIconResID)
 {
 	wchar_t szModule[MAX_PATH], *pszIconLoc = nullptr;
 	int cch;
diff --git a/plugins/AssocMgr/src/reg.h b/plugins/AssocMgr/src/reg.h
index 6716d31e60..edcb7c4ded 100644
--- a/plugins/AssocMgr/src/reg.h
+++ b/plugins/AssocMgr/src/reg.h
@@ -50,5 +50,5 @@ char* MakeFileClassName(const char *pszFileExt);
 char* MakeUrlClassName(const char *pszUrl);
 
 wchar_t* MakeRunCommand(BOOL fMirExe, BOOL fFixedDbProfile);
-wchar_t* MakeIconLocation(HMODULE hModule, WORD nIconResID);
+wchar_t* MakeIconLocation(HMODULE hModule, uint16_t nIconResID);
 wchar_t* MakeAppFileName(BOOL fMirExe);
diff --git a/plugins/AutoShutdown/src/frame.cpp b/plugins/AutoShutdown/src/frame.cpp
index 6ff377a99a..b340a69db5 100644
--- a/plugins/AutoShutdown/src/frame.cpp
+++ b/plugins/AutoShutdown/src/frame.cpp
@@ -83,7 +83,7 @@ struct CountdownFrameWndData
 	HBRUSH hbrBackground;
 	COLORREF clrBackground, clrText;
 	HFONT hFont;
-	WORD fTimeFlags;
+	uint16_t fTimeFlags;
 	uint8_t flags;
 };
 
@@ -116,7 +116,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwndFrame, UINT msg, WPARAM wParam, LP
 		dat = (struct CountdownFrameWndData*)mir_calloc(sizeof(*dat));
 		SetWindowLongPtr(hwndFrame, GWLP_USERDATA, (LONG_PTR)dat);
 		if (dat == nullptr) return FALSE; /* creation failed */
-		dat->fTimeFlags = *(WORD*)((CREATESTRUCT*)lParam)->lpCreateParams;
+		dat->fTimeFlags = *(uint16_t*)((CREATESTRUCT*)lParam)->lpCreateParams;
 		dat->flags = FWPDF_COUNTDOWNINVALID;
 		break;
 
@@ -478,7 +478,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwndFrame, UINT msg, WPARAM wParam, LP
 
 /************************* Show Frame *********************************/
 
-void ShowCountdownFrame(WORD fTimeFlags)
+void ShowCountdownFrame(uint16_t fTimeFlags)
 {
 	hwndCountdownFrame = CreateWindowEx(WS_EX_CONTROLPARENT | WS_EX_NOPARENTNOTIFY | WS_EX_TRANSPARENT,
 		COUNTDOWNFRAME_CLASS,
diff --git a/plugins/AutoShutdown/src/frame.h b/plugins/AutoShutdown/src/frame.h
index e8f642bbe8..3394252645 100644
--- a/plugins/AutoShutdown/src/frame.h
+++ b/plugins/AutoShutdown/src/frame.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #pragma once
 
 /* Show Frame */
-void ShowCountdownFrame(WORD fTimeFlags);
+void ShowCountdownFrame(uint16_t fTimeFlags);
 void CloseCountdownFrame(void);
 
 /* Misc */
diff --git a/plugins/AutoShutdown/src/options.cpp b/plugins/AutoShutdown/src/options.cpp
index 06756a5407..4dcf972a56 100644
--- a/plugins/AutoShutdown/src/options.cpp
+++ b/plugins/AutoShutdown/src/options.cpp
@@ -31,7 +31,7 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 	case WM_INITDIALOG:
 		TranslateDialogDefault(hwndDlg);
 		{
-			WORD setting = g_plugin.getWord("ConfirmDlgCountdown", SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT);
+			uint16_t setting = g_plugin.getWord("ConfirmDlgCountdown", SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT);
 			if (setting < 3)
 				setting = SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT;
 			SendDlgItemMessage(hwndDlg, IDC_SPIN_CONFIRMDLGCOUNTDOWN, UDM_SETRANGE, 0, MAKELPARAM(999, 3));
@@ -86,7 +86,7 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 		switch (((NMHDR*)lParam)->code) {
 		case PSN_APPLY:
 			g_plugin.setByte("ShowConfirmDlg", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOWCONFIRMDLG) != 0));
-			g_plugin.setWord("ConfirmDlgCountdown", (WORD)GetDlgItemInt(hwndDlg, IDC_EDIT_CONFIRMDLGCOUNTDOWN, nullptr, FALSE));
+			g_plugin.setWord("ConfirmDlgCountdown", (uint16_t)GetDlgItemInt(hwndDlg, IDC_EDIT_CONFIRMDLGCOUNTDOWN, nullptr, FALSE));
 			g_plugin.setByte("RememberOnRestart", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_REMEMBERONRESTART) != 0));
 			g_plugin.setByte("SmartOfflineCheck", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SMARTOFFLINECHECK) != 0));
 			if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_CHECK_WEATHER)))
diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp
index 8e1e9642ef..e162c374df 100644
--- a/plugins/AutoShutdown/src/settingsdlg.cpp
+++ b/plugins/AutoShutdown/src/settingsdlg.cpp
@@ -81,7 +81,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			}
 			/* read-in watcher flags */
 			{
-				WORD watcherType = g_plugin.getWord("WatcherFlags", SETTING_WATCHERFLAGS_DEFAULT);
+				uint16_t watcherType = g_plugin.getWord("WatcherFlags", SETTING_WATCHERFLAGS_DEFAULT);
 				CheckRadioButton(hwndDlg, IDC_RADIO_STTIME, IDC_RADIO_STCOUNTDOWN, (watcherType&SDWTF_ST_TIME) ? IDC_RADIO_STTIME : IDC_RADIO_STCOUNTDOWN);
 				CheckDlgButton(hwndDlg, IDC_CHECK_SPECIFICTIME, (watcherType&SDWTF_SPECIFICTIME) != 0 ? BST_CHECKED : BST_UNCHECKED);
 				CheckDlgButton(hwndDlg, IDC_CHECK_MESSAGE, (watcherType&SDWTF_MESSAGE) != 0 ? BST_CHECKED : BST_UNCHECKED);
@@ -313,7 +313,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 
 		case IDC_EDIT_CPUUSAGE:
 			if (HIWORD(wParam) == EN_KILLFOCUS) {
-				WORD val = (WORD)GetDlgItemInt(hwndDlg, IDC_EDIT_CPUUSAGE, nullptr, FALSE);
+				uint16_t val = (uint16_t)GetDlgItemInt(hwndDlg, IDC_EDIT_CPUUSAGE, nullptr, FALSE);
 				if (val < 1) val = 1;
 				else if (val>100) val = 100;
 				SendDlgItemMessage(hwndDlg, IDC_SPIN_CPUUSAGE, UDM_SETPOS, 0, MAKELPARAM(val, 0));
@@ -366,7 +366,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			}
 			/* watcher type */
 			{
-				WORD watcherType = (WORD)(IsDlgButtonChecked(hwndDlg, IDC_RADIO_STTIME) ? SDWTF_ST_TIME : SDWTF_ST_COUNTDOWN);
+				uint16_t watcherType = (uint16_t)(IsDlgButtonChecked(hwndDlg, IDC_RADIO_STTIME) ? SDWTF_ST_TIME : SDWTF_ST_COUNTDOWN);
 				if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_SPECIFICTIME)) watcherType |= SDWTF_SPECIFICTIME;
 				if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_MESSAGE)) watcherType |= SDWTF_MESSAGE;
 				if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_FILETRANSFER)) watcherType |= SDWTF_FILETRANSFER;
diff --git a/plugins/AutoShutdown/src/shutdownsvc.cpp b/plugins/AutoShutdown/src/shutdownsvc.cpp
index 064c1fd843..d071656ee0 100644
--- a/plugins/AutoShutdown/src/shutdownsvc.cpp
+++ b/plugins/AutoShutdown/src/shutdownsvc.cpp
@@ -298,7 +298,7 @@ static DWORD ShutdownNow(uint8_t shutdownType)
 static INT_PTR CALLBACK ShutdownDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	uint8_t shutdownType = (uint8_t)GetWindowLongPtr(hwndDlg, DWLP_USER);
-	WORD countdown = (WORD)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TEXT_HEADER), GWLP_USERDATA);
+	uint16_t countdown = (uint16_t)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TEXT_HEADER), GWLP_USERDATA);
 
 	switch (msg) {
 	case WM_INITDIALOG:
@@ -380,7 +380,7 @@ static INT_PTR CALLBACK ShutdownDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		PostMessage(hwndDlg, M_UPDATE_COUNTDOWN, 0, countdown);
 		return TRUE;
 
-	case M_UPDATE_COUNTDOWN:  /* lParam=(WORD)countdown */
+	case M_UPDATE_COUNTDOWN:  /* lParam=(uint16_t)countdown */
 		{
 			wchar_t szText[256];
 			mir_snwprintf(szText, TranslateW(desc[shutdownType - 1]), lParam);
diff --git a/plugins/AutoShutdown/src/utils.cpp b/plugins/AutoShutdown/src/utils.cpp
index cd2b247703..ddd353f9aa 100644
--- a/plugins/AutoShutdown/src/utils.cpp
+++ b/plugins/AutoShutdown/src/utils.cpp
@@ -95,13 +95,13 @@ BOOL TimeStampToSystemTime(time_t timestamp, SYSTEMTIME *st)
 		return FALSE;
 
 	st->wMilliseconds = 0;                 /* 0-999 (not given in tm) */
-	st->wSecond = (WORD)ts.tm_sec;       /* 0-59 */
-	st->wMinute = (WORD)ts.tm_min;       /* 0-59 */
-	st->wHour = (WORD)ts.tm_hour;        /* 0-23 */
-	st->wDay = (WORD)ts.tm_mday;         /* 1-31 */
-	st->wDayOfWeek = (WORD)ts.tm_wday;   /* 0-6 (Sun-Sat) */
-	st->wMonth = (WORD)(ts.tm_mon + 1);    /* 1-12 (Jan-Dec) */
-	st->wYear = (WORD)(ts.tm_year + 1900); /* 1601-30827 */
+	st->wSecond = (uint16_t)ts.tm_sec;       /* 0-59 */
+	st->wMinute = (uint16_t)ts.tm_min;       /* 0-59 */
+	st->wHour = (uint16_t)ts.tm_hour;        /* 0-23 */
+	st->wDay = (uint16_t)ts.tm_mday;         /* 1-31 */
+	st->wDayOfWeek = (uint16_t)ts.tm_wday;   /* 0-6 (Sun-Sat) */
+	st->wMonth = (uint16_t)(ts.tm_mon + 1);    /* 1-12 (Jan-Dec) */
+	st->wYear = (uint16_t)(ts.tm_year + 1900); /* 1601-30827 */
 	return TRUE;
 }
 
diff --git a/plugins/AutoShutdown/src/watcher.cpp b/plugins/AutoShutdown/src/watcher.cpp
index 0d53d9deed..a84253b536 100644
--- a/plugins/AutoShutdown/src/watcher.cpp
+++ b/plugins/AutoShutdown/src/watcher.cpp
@@ -38,7 +38,7 @@ static HANDLE hHookModulesLoaded;
 
 /************************* Shared *************************************/
 
-static WORD currentWatcherType;
+static uint16_t currentWatcherType;
 
 static void __stdcall MainThreadMapping(void *param)
 {
@@ -228,7 +228,7 @@ INT_PTR ServiceStartWatcher(WPARAM, LPARAM lParam)
 	if (lParam&SDWTF_SPECIFICTIME && !(lParam&SDWTF_ST_MASK))
 		return 2;
 
-	if (currentWatcherType == (WORD)lParam)
+	if (currentWatcherType == (uint16_t)lParam)
 		return 3;
 
 	if (currentWatcherType != 0) {
@@ -239,7 +239,7 @@ INT_PTR ServiceStartWatcher(WPARAM, LPARAM lParam)
 	}
 	SetShutdownMenuItem(true);
 	SetShutdownToolbarButton(true);
-	currentWatcherType = (WORD)lParam;
+	currentWatcherType = (uint16_t)lParam;
 	NotifyEventHooks(hEventWatcherChanged, TRUE, 0);
 
 	/* Time Shutdown */
diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp
index d3a93e1fe3..5bdca65851 100644
--- a/plugins/AvatarHistory/src/options.cpp
+++ b/plugins/AvatarHistory/src/options.cpp
@@ -37,7 +37,7 @@ static OptPageControl popupsControls[] = {
 	{ &opts.popup_delay_type,         CONTROL_RADIO,    IDC_DELAYFROMPU,    "PopupsDelayType",   POPUP_DELAY_DEFAULT, POPUP_DELAY_DEFAULT },
 	{ nullptr,                        CONTROL_RADIO,    IDC_DELAYCUSTOM,    "PopupsDelayType",   POPUP_DELAY_DEFAULT, POPUP_DELAY_CUSTOM },
 	{ nullptr,                        CONTROL_RADIO,    IDC_DELAYPERMANENT, "PopupsDelayType",   POPUP_DELAY_DEFAULT, POPUP_DELAY_PERMANENT },
-	{ &opts.popup_timeout,            CONTROL_SPIN,     IDC_DELAY,          "PopupsTimeout", 10, IDC_DELAY_SPIN, (WORD)1, (WORD)255 },
+	{ &opts.popup_timeout,            CONTROL_SPIN,     IDC_DELAY,          "PopupsTimeout", 10, IDC_DELAY_SPIN, (uint16_t)1, (uint16_t)255 },
 	{ &opts.popup_right_click_action, CONTROL_COMBO,    IDC_RIGHT_ACTION,   "PopupsRightClick",  POPUP_ACTION_CLOSEPOPUP },
 	{ &opts.popup_left_click_action,  CONTROL_COMBO,    IDC_LEFT_ACTION,    "PopupsLeftClick",   POPUP_ACTION_OPENAVATARHISTORY },
 	{ &opts.popup_show_changed,       CONTROL_CHECKBOX, IDC_CHANGED_L,      "PopupsShowChanged", TRUE },
diff --git a/plugins/AvatarHistory/src/popup.h b/plugins/AvatarHistory/src/popup.h
index 9a432051fa..bc76524ae2 100644
--- a/plugins/AvatarHistory/src/popup.h
+++ b/plugins/AvatarHistory/src/popup.h
@@ -32,14 +32,14 @@ struct Options {
 	wchar_t popup_changed[1024];
 	BOOL popup_show_removed;
 	wchar_t popup_removed[1024];
-	WORD popup_delay_type;
-	WORD popup_timeout;
+	uint16_t popup_delay_type;
+	uint16_t popup_timeout;
 	uint8_t popup_use_win_colors;
 	uint8_t popup_use_default_colors;
 	COLORREF popup_bkg_color;
 	COLORREF popup_text_color;
-	WORD popup_left_click_action;
-	WORD popup_right_click_action;
+	uint16_t popup_left_click_action;
+	uint16_t popup_right_click_action;
 };
 
 // Initializations needed by popups
diff --git a/plugins/BASS_interface/src/Bass.h b/plugins/BASS_interface/src/Bass.h
index fab48d6120..271be94d09 100644
--- a/plugins/BASS_interface/src/Bass.h
+++ b/plugins/BASS_interface/src/Bass.h
@@ -19,7 +19,7 @@ typedef unsigned __int64 QWORD;
 #define WINAPI
 #define CALLBACK
 typedef uint8_t uint8_t;
-typedef uint16_t WORD;
+typedef uint16_t uint16_t;
 typedef uint32_t DWORD;
 typedef uint64_t QWORD;
 #ifdef __OBJC__
@@ -34,9 +34,9 @@ typedef int BOOL;
 #endif
 #define LOBYTE(a) (uint8_t)(a)
 #define HIBYTE(a) (uint8_t)((a)>>8)
-#define LOWORD(a) (WORD)(a)
-#define HIWORD(a) (WORD)((a)>>16)
-#define MAKEWORD(a,b) (WORD)(((a)&0xff)|((b)<<8))
+#define LOWORD(a) (uint16_t)(a)
+#define HIWORD(a) (uint16_t)((a)>>16)
+#define MAKEWORD(a,b) (uint16_t)(((a)&0xff)|((b)<<8))
 #define MAKELONG(a,b) (DWORD)(((a)&0xffff)|((b)<<16))
 #endif
 
@@ -695,7 +695,7 @@ typedef struct {
 	char OriginationDate[10];		// date of creation (yyyy-mm-dd)
 	char OriginationTime[8];		// time of creation (hh-mm-ss)
 	QWORD TimeReference;			// first sample count since midnight (little-endian)
-	WORD Version;					// BWF version (little-endian)
+	uint16_t Version;					// BWF version (little-endian)
 	uint8_t UMID[64];					// SMPTE UMID
 	uint8_t Reserved[190];
 #if defined(__GNUC__) && __GNUC__<3
@@ -814,13 +814,13 @@ typedef struct {
 #pragma pack(push,1)
 typedef struct tWAVEFORMATEX
 {
-	WORD wFormatTag;
-	WORD nChannels;
+	uint16_t wFormatTag;
+	uint16_t nChannels;
 	DWORD nSamplesPerSec;
 	DWORD nAvgBytesPerSec;
-	WORD nBlockAlign;
-	WORD wBitsPerSample;
-	WORD cbSize;
+	uint16_t nBlockAlign;
+	uint16_t wBitsPerSample;
+	uint16_t cbSize;
 } WAVEFORMATEX, *PWAVEFORMATEX, *LPWAVEFORMATEX;
 typedef const WAVEFORMATEX *LPCWAVEFORMATEX;
 #pragma pack(pop)
diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp
index 51d0489a95..f47410d593 100644
--- a/plugins/BASS_interface/src/Main.cpp
+++ b/plugins/BASS_interface/src/Main.cpp
@@ -58,7 +58,7 @@ static wchar_t CurrBassPath[MAX_PATH], tmp[MAX_PATH];
 static int sndNSnd = 0, sndLimSnd;
 static HSTREAM sndSSnd[MAXCHAN] = { 0 };
 
-static WORD TimeWrd1, TimeWrd2, StatMask;
+static uint16_t TimeWrd1, TimeWrd2, StatMask;
 static BOOL QuietTime, Preview, EnPreview;
 static int Volume;
 static int device = -1;
@@ -77,9 +77,9 @@ static int OnPlaySnd(WPARAM wParam, LPARAM lParam)
 	BOOL doPlay = TRUE;
 
 	GetLocalTime(&systime);
-	WORD currtime = MAKEWORD(systime.wMinute, systime.wHour);
+	uint16_t currtime = MAKEWORD(systime.wMinute, systime.wHour);
 
-	WORD currstat = 1;
+	uint16_t currstat = 1;
 	switch (CallService(MS_CLIST_GETSTATUSMODE, 0, 0)) {
 	case ID_STATUS_INVISIBLE:    currstat <<= 1;
 	case ID_STATUS_FREECHAT:     currstat <<= 1;
diff --git a/plugins/BasicHistory/src/BinaryExport.cpp b/plugins/BasicHistory/src/BinaryExport.cpp
index bc67e95756..791be5f2b6 100644
--- a/plugins/BasicHistory/src/BinaryExport.cpp
+++ b/plugins/BasicHistory/src/BinaryExport.cpp
@@ -40,8 +40,8 @@ struct BinaryFileHeader
 struct BinaryFileMessageHeader
 {
 	DWORD timestamp;
-	WORD eventType;
-	WORD flags;
+	uint16_t eventType;
+	uint16_t flags;
 };
 
 #pragma pack(pop)
diff --git a/plugins/BasicHistory/src/DatExport.cpp b/plugins/BasicHistory/src/DatExport.cpp
index 3b1fa0f8cb..d21f66e0c5 100644
--- a/plugins/BasicHistory/src/DatExport.cpp
+++ b/plugins/BasicHistory/src/DatExport.cpp
@@ -46,7 +46,7 @@ typedef struct
 							//2106 unless you use the standard C library which is
 					  //signed and can only do until 2038. In GMT.
 	DWORD flags;	  //the omnipresent flags
-	WORD eventType;	  //module-defined event type field
+	uint16_t eventType;	  //module-defined event type field
 	DWORD cbBlob;	  //size of pBlob in bytes
 	DWORD pBlob;	  //pointer to buffer containing module-defined event data
 } DBEVENTINFO86;
diff --git a/plugins/BasicHistory/src/EventList.h b/plugins/BasicHistory/src/EventList.h
index 3117807923..df8db5fbc3 100644
--- a/plugins/BasicHistory/src/EventList.h
+++ b/plugins/BasicHistory/src/EventList.h
@@ -33,7 +33,7 @@ public:
 	struct EventData
 	{
 		bool isMe;
-		WORD eventType;
+		uint16_t eventType;
 		DWORD timestamp;
 	};
 	struct EventIndex
diff --git a/plugins/BasicHistory/src/IImport.h b/plugins/BasicHistory/src/IImport.h
index 6752bf9eef..a33f2f3931 100644
--- a/plugins/BasicHistory/src/IImport.h
+++ b/plugins/BasicHistory/src/IImport.h
@@ -32,8 +32,8 @@ public:
 	struct ExternalMessage
 	{
 		DWORD timestamp;
-		WORD eventType;
-		WORD flags;
+		uint16_t eventType;
+		uint16_t flags;
 		std::wstring message;
 	};
 
diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp
index f434dab93d..d51ae87aa0 100644
--- a/plugins/BasicHistory/src/Options.cpp
+++ b/plugins/BasicHistory/src/Options.cpp
@@ -174,7 +174,7 @@ struct HotkeyOptionsList
 	wchar_t *pwszDescription;
 	wchar_t *pwszSection;
 	const char *pszService;
-	WORD DefHotKey;
+	uint16_t DefHotKey;
 	LPARAM lParam;
 };
 
diff --git a/plugins/BasicHistory/src/RichHtmlExport.cpp b/plugins/BasicHistory/src/RichHtmlExport.cpp
index d4322abac6..a1c01a9d1c 100644
--- a/plugins/BasicHistory/src/RichHtmlExport.cpp
+++ b/plugins/BasicHistory/src/RichHtmlExport.cpp
@@ -147,17 +147,17 @@ typedef struct
 	uint8_t        bHeight;         // Height, in pixels, of the image
 	uint8_t        bColorCount;     // Number of colors in image (0 if >=8bpp)
 	uint8_t        bReserved;       // Reserved ( must be 0)
-	WORD        wPlanes;         // Color Planes
-	WORD        wBitCount;       // Bits per pixel
+	uint16_t        wPlanes;         // Color Planes
+	uint16_t        wBitCount;       // Bits per pixel
 	DWORD       dwBytesInRes;    // How many bytes in this resource?
 	DWORD       dwImageOffset;   // Where in the file is this image?
 } ICONDIRENTRY, *LPICONDIRENTRY;
 
 typedef struct
 {
-	WORD           idReserved;   // Reserved (must be 0)
-	WORD           idType;       // Resource Type (1 for icons)
-	WORD           idCount;      // How many images?
+	uint16_t           idReserved;   // Reserved (must be 0)
+	uint16_t           idType;       // Resource Type (1 for icons)
+	uint16_t           idCount;      // How many images?
 	//ICONDIRENTRY   idEntries; // An entry for each image (idCount of 'em)
 } ICONDIR, *LPICONDIR;
 
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp
index cf1bac9af8..38bf026122 100644
--- a/plugins/Boltun/src/boltun.cpp
+++ b/plugins/Boltun/src/boltun.cpp
@@ -305,7 +305,7 @@ void UpdateUnderstandAlwaysCheckbox(HWND hwndDlg)
 
 static INT_PTR CALLBACK EngineDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	WORD param;
+	uint16_t param;
 	BOOL bTranslated = FALSE;
 	static bool loading = true;
 	static int changeCount = 0;
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index 869eef985e..45bb89b1ff 100644
--- a/plugins/BossKeyPlus/src/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
@@ -25,7 +25,7 @@ HWND g_hListenWindow, g_hDlgPass, hOldForegroundWindow;
 HWND_ITEM *g_pMirWnds; // a pretty simple linked list
 HMODULE hDwmApi;
 DWORD g_dwMirandaPID;
-WORD g_wMask, g_wMaskAdv;
+uint16_t g_wMask, g_wMaskAdv;
 bool g_bWindowHidden, g_fPassRequested, g_TrayIcon;
 char g_password[MAXPASSLEN + 1];
 HKL oldLangID, oldLayout;
@@ -436,7 +436,7 @@ INT_PTR BossKeyHideMiranda(WPARAM, LPARAM) // for service :)
 	return 0;
 }
 
-static wchar_t* HotkeyVkToName(WORD vkKey)
+static wchar_t* HotkeyVkToName(uint16_t vkKey)
 {
 	static wchar_t buf[32] = { 0 };
 	DWORD code = MapVirtualKey(vkKey, 0) << 16;
@@ -474,7 +474,7 @@ static wchar_t* HotkeyVkToName(WORD vkKey)
 
 static wchar_t* GetBossKeyText(void)
 {
-	WORD wHotKey = db_get_w(0, "SkinHotKeys", "Hide/Show Miranda", HOTKEYCODE(HOTKEYF_CONTROL, VK_F12));
+	uint16_t wHotKey = db_get_w(0, "SkinHotKeys", "Hide/Show Miranda", HOTKEYCODE(HOTKEYF_CONTROL, VK_F12));
 
 	uint8_t key = LOBYTE(wHotKey);
 	uint8_t shift = HIBYTE(wHotKey);
diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp
index 7d05135e10..ed3fe62384 100644
--- a/plugins/BossKeyPlus/src/Options.cpp
+++ b/plugins/BossKeyPlus/src/Options.cpp
@@ -33,7 +33,7 @@ class COptMainDlg : public CDlgBase
 	void ComboboxSelState()
 	{
 		uint8_t bSelection = (uint8_t)m_cbStatusList.GetCurSel();
-		WORD wMode = STATUS_ARR_TO_ID[bSelection];
+		uint16_t wMode = STATUS_ARR_TO_ID[bSelection];
 		if (m_chkUsrDefMsg.GetState()) {
 			wchar_t *ptszDefMsg = GetDefStatusMsg(wMode, nullptr);
 			m_edtStatMsg.SetText(ptszDefMsg);
@@ -128,7 +128,7 @@ public:
 
 	bool OnApply() override
 	{
-		WORD wMask = 0;
+		uint16_t wMask = 0;
 		// we apply changes here
 		// this plugin ain't that big, no need for a seperate routine
 
@@ -244,7 +244,7 @@ public:
 
 	bool OnApply() override
 	{
-		WORD wMaskAdv = 0;
+		uint16_t wMaskAdv = 0;
 		if (m_chkHideIfLock.GetState())
 			wMaskAdv |= OPT_HIDEIFLOCK;
 		if (m_chkHideIfWinIdle.GetState())
diff --git a/plugins/BossKeyPlus/src/stdafx.h b/plugins/BossKeyPlus/src/stdafx.h
index 2e8cd39402..0538d3cdb5 100644
--- a/plugins/BossKeyPlus/src/stdafx.h
+++ b/plugins/BossKeyPlus/src/stdafx.h
@@ -98,7 +98,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 
 const unsigned STATUS_ARR_TO_ID[] = { ID_STATUS_OFFLINE, ID_STATUS_ONLINE, ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND, ID_STATUS_FREECHAT, ID_STATUS_INVISIBLE };
 extern bool g_fOptionsOpen; // options dialog is open. be sure not to hide anything while we're there.
-extern WORD g_wMask, g_wMaskAdv;
+extern uint16_t g_wMask, g_wMaskAdv;
 extern bool g_bWindowHidden;
 
 int OptsDlgInit(WPARAM wParam, LPARAM lParam);
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index a128e0dbd0..47216a2169 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -220,8 +220,8 @@ INT_PTR AddSimpleMessage(WPARAM wParam, LPARAM lParam)
 	MCONTACT hContact = wParam;
 	wchar_t* message = (wchar_t*)lParam;
 	g_plugin.setWString(hContact, "PounceMsg", message);
-	g_plugin.setWord(hContact, "SendIfMyStatusIsFLAG", (WORD)g_plugin.getWord("SendIfMyStatusIsFLAG", 1));
-	g_plugin.setWord(hContact, "SendIfTheirStatusIsFLAG", (WORD)g_plugin.getWord("SendIfTheirStatusIsFLAG", 1));
+	g_plugin.setWord(hContact, "SendIfMyStatusIsFLAG", (uint16_t)g_plugin.getWord("SendIfMyStatusIsFLAG", 1));
+	g_plugin.setWord(hContact, "SendIfTheirStatusIsFLAG", (uint16_t)g_plugin.getWord("SendIfTheirStatusIsFLAG", 1));
 	g_plugin.setByte(hContact, "Reuse", (uint8_t)g_plugin.getByte("Reuse", 0));
 	g_plugin.setByte(hContact, "GiveUpDays", (uint8_t)g_plugin.getByte("GiveUpDays", 0));
 	g_plugin.setDword(hContact, "GiveUpDate", (DWORD)(g_plugin.getByte(hContact, "GiveUpDays", 0)*SECONDSINADAY));
diff --git a/plugins/BuddyPounce/src/options.cpp b/plugins/BuddyPounce/src/options.cpp
index 16cc57cc1f..6aa967f358 100644
--- a/plugins/BuddyPounce/src/options.cpp
+++ b/plugins/BuddyPounce/src/options.cpp
@@ -119,7 +119,7 @@ void COptionsDlg::saveLastSetting()
 		g_plugin.setDword(hContact, "GiveUpDate", (DWORD)edtNumber.GetInt() * SECONDSINADAY);
 		break;
 	case 5:	// confirm window
-		g_plugin.setWord(hContact, "ConfirmTimeout", (WORD)edtNumber.GetInt());
+		g_plugin.setWord(hContact, "ConfirmTimeout", (uint16_t)edtNumber.GetInt());
 		break;
 	}
 }
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp
index 08d8abb871..698112b10e 100644
--- a/plugins/CSList/src/cslist.cpp
+++ b/plugins/CSList/src/cslist.cpp
@@ -147,7 +147,7 @@ void RegisterHotkeys(char buf[200], wchar_t* accName, int Number)
 	g_plugin.addHotkey(&hotkey);
 }
 
-void SetStatus(WORD code, StatusItem* item, char *szAccName)
+void SetStatus(uint16_t code, StatusItem* item, char *szAccName)
 {
 	if (code == IDCLOSE)
 		return;
@@ -413,7 +413,7 @@ BOOL CSWindow::toggleButtons()
 ///////////////////////////////////////////////////////////////////////////////
 // CSAMWindow class - add form window
 
-CSAMWindow::CSAMWindow(WORD action, CSWindow* parent)
+CSAMWindow::CSAMWindow(uint16_t action, CSWindow* parent)
 {
 	m_action = action;
 	m_parent = parent;
@@ -491,7 +491,7 @@ void CSAMWindow::fillDialog()
 	SetDlgItemText(m_handle, IDC_MESSAGE, m_item->m_tszMessage);
 }
 
-void CSAMWindow::checkFieldLimit(WORD action, WORD item)
+void CSAMWindow::checkFieldLimit(uint16_t action, uint16_t item)
 {
 	BOOL type = (item == IDC_MESSAGE) ? TRUE : FALSE;
 	unsigned int limit = type ? EXTRASTATUS_MESSAGE_LIMIT : EXTRASTATUS_TITLE_LIMIT;
diff --git a/plugins/CSList/src/stdafx.h b/plugins/CSList/src/stdafx.h
index b70f359d2e..8586578d5d 100644
--- a/plugins/CSList/src/stdafx.h
+++ b/plugins/CSList/src/stdafx.h
@@ -363,7 +363,7 @@ struct CSWindow
 
 struct CSAMWindow
 {
-	WORD        m_action;
+	uint16_t        m_action;
 	StatusItem* m_item;
 	CSWindow*   m_parent;
 	BOOL        m_bChanged;
@@ -372,13 +372,13 @@ struct CSAMWindow
 	HWND        m_hCombo;
 	HWND        m_hMessage;
 
-	CSAMWindow(WORD action, CSWindow* parent);
+	CSAMWindow(uint16_t action, CSWindow* parent);
 	~CSAMWindow();
 
 	void    exec();
 	void    setCombo();
 	void    fillDialog();
-	void    checkFieldLimit(WORD action, WORD item);
+	void    checkFieldLimit(uint16_t action, uint16_t item);
 	void    checkItemValidity();
 };
 
@@ -391,7 +391,7 @@ void addProtoStatusMenuItem(char *protoName);
 
 // other functions
 void RegisterHotkeys(char buf[200], wchar_t* accName, int Number);
-void SetStatus(WORD code, StatusItem* item, char *protoName);
+void SetStatus(uint16_t code, StatusItem* item, char *protoName);
 
 //====[ PROCEDURES ]=========================================================
 
diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp
index 74fb2fc4f3..d40b428626 100644
--- a/plugins/Clist_blind/src/clcopts.cpp
+++ b/plugins/Clist_blind/src/clcopts.cpp
@@ -91,7 +91,7 @@ public:
 
 		db_set_b(0, "CLC", "ShowIdle", (uint8_t)(IsDlgButtonChecked(m_hwnd, IDC_IDLE) ? 1 : 0));
 		db_set_b(0, "CLC", "LeftMargin", (uint8_t)SendDlgItemMessage(m_hwnd, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0));
-		db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
+		db_set_w(0, "CLC", "ScrollTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
 		db_set_b(0, "CLC", "GroupIndent", (uint8_t)SendDlgItemMessage(m_hwnd, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0));
 
 		wchar_t tmp[1024];
diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp
index f6be83ca73..8977531003 100644
--- a/plugins/Clist_blind/src/clistopts.cpp
+++ b/plugins/Clist_blind/src/clistopts.cpp
@@ -86,8 +86,8 @@ public:
 		g_plugin.setByte("SortByProto", (uint8_t)(g_bSortByProto = IsDlgButtonChecked(m_hwnd, IDC_SORTBYPROTO)));
 		g_plugin.setByte("AlwaysMulti", (uint8_t)!IsDlgButtonChecked(m_hwnd, IDC_ALWAYSMULTI));
 		g_plugin.setByte("TrayIcon", iTrayIcon);
-		g_plugin.setWord("CycleTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));
-		g_plugin.setWord("IconFlashTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
+		g_plugin.setWord("CycleTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));
+		g_plugin.setWord("IconFlashTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
 		g_plugin.setByte("DisableTrayFlash", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_DISABLEBLINK));
 
 		int cur = SendDlgItemMessage(m_hwnd, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0);
diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp
index 403ad5188f..134299752b 100644
--- a/plugins/Clist_modern/src/cluiframes.cpp
+++ b/plugins/Clist_modern/src/cluiframes.cpp
@@ -684,20 +684,20 @@ static int CLUIFramesStoreFrameSettings(int Frameid)
 	db_set_b(0, CLUIFrameModule, buf.Format("Visible%d", storpos), (uint8_t)btoint(F.visible));
 	db_set_b(0, CLUIFrameModule, buf.Format("TBVisile%d", storpos), (uint8_t)btoint(F.TitleBar.ShowTitleBar));
 
-	db_set_w(0, CLUIFrameModule, buf.Format("Height%d", storpos), (WORD)F.height);
-	db_set_w(0, CLUIFrameModule, buf.Format("HeightCollapsed%d", storpos), (WORD)F.HeightWhenCollapsed);
-	db_set_w(0, CLUIFrameModule, buf.Format("Align%d", storpos), (WORD)F.align);
+	db_set_w(0, CLUIFrameModule, buf.Format("Height%d", storpos), (uint16_t)F.height);
+	db_set_w(0, CLUIFrameModule, buf.Format("HeightCollapsed%d", storpos), (uint16_t)F.HeightWhenCollapsed);
+	db_set_w(0, CLUIFrameModule, buf.Format("Align%d", storpos), (uint16_t)F.align);
 
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatX%d", storpos), (WORD)F.FloatingPos.x);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatY%d", storpos), (WORD)F.FloatingPos.y);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatW%d", storpos), (WORD)F.FloatingSize.x);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatH%d", storpos), (WORD)F.FloatingSize.y);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatX%d", storpos), (uint16_t)F.FloatingPos.x);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatY%d", storpos), (uint16_t)F.FloatingPos.y);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatW%d", storpos), (uint16_t)F.FloatingSize.x);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatH%d", storpos), (uint16_t)F.FloatingSize.y);
 
 	db_set_b(0, CLUIFrameModule, buf.Format("Floating%d", storpos), (uint8_t)btoint(F.floating));
 	db_set_b(0, CLUIFrameModule, buf.Format("UseBorder%d", storpos), (uint8_t)btoint(F.UseBorder));
-	db_set_w(0, CLUIFrameModule, buf.Format("Order%d", storpos), (WORD)F.order);
+	db_set_w(0, CLUIFrameModule, buf.Format("Order%d", storpos), (uint16_t)F.order);
 
-	db_set_w(0, CLUIFrameModule, "StoredFrames", (WORD)maxstored);
+	db_set_w(0, CLUIFrameModule, "StoredFrames", (uint16_t)maxstored);
 	return 0;
 }
 
diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index 292b2607bc..d9bec8a4a0 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -276,7 +276,7 @@ int GetStatusName(wchar_t *text, int text_size, ClcCacheEntry *pdnce, BOOL bXsta
 	BOOL noAwayMsg = FALSE;
 	BOOL noXstatus = FALSE;
 	// Hide status text if Offline  /// no offline
-	WORD nStatus = pdnce->getStatus();
+	uint16_t nStatus = pdnce->getStatus();
 	if ((nStatus == ID_STATUS_OFFLINE || nStatus == 0) && g_CluiData.bRemoveAwayMessageForOffline) noAwayMsg = TRUE;
 	if (nStatus == ID_STATUS_OFFLINE || nStatus == 0) noXstatus = TRUE;
 	text[0] = '\0';
@@ -336,7 +336,7 @@ void GetListeningTo(wchar_t *text, int text_size, ClcCacheEntry *pdnce)
 int GetStatusMessage(wchar_t *text, int text_size, ClcCacheEntry *pdnce, BOOL bXstatusHasPriority)
 {
 	BOOL noAwayMsg = FALSE;
-	WORD wStatus = pdnce->getStatus();
+	uint16_t wStatus = pdnce->getStatus();
 	*text = '\0';
 
 	// Hide status text if Offline  /// no offline
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 050e550525..ce8fcf072d 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1295,7 +1295,7 @@ static LRESULT clcOnDestroy(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LP
 
 static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM)
 {
-	WORD iExtraImage[EXTRA_ICON_COUNT];
+	uint16_t iExtraImage[EXTRA_ICON_COUNT];
 	uint8_t flags = 0;
 
 	ClcContact *contact;
@@ -1337,7 +1337,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam
 	ClcContact *selcontact = nullptr;
 
 	char *szProto = Proto_GetBaseAccountName(wParam);
-	WORD status = (szProto == nullptr) ? ID_STATUS_OFFLINE : GetContactCachedStatus(wParam);
+	uint16_t status = (szProto == nullptr) ? ID_STATUS_OFFLINE : GetContactCachedStatus(wParam);
 	bool bImageIsSpecial = (LOWORD(contacticon) != (LOWORD(lParam))); //check only base icons
 
 	int nHiddenStatus = CLVM_GetContactHiddenStatus(wParam, szProto, dat);
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 0c1d383421..cb8f919932 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -50,7 +50,7 @@ void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup)
 		if (pdnce->szProto == nullptr)
 			continue;
 
-		WORD wStatus = pdnce->getStatus();
+		uint16_t wStatus = pdnce->getStatus();
 		if (!showOfflineHereGroup && bHideOffline && !pdnce->m_bNoHiddenOffline && wStatus == ID_STATUS_OFFLINE)
 			continue;
 
@@ -132,7 +132,7 @@ static void _LoadDataToContact(ClcContact *cont, ClcCacheEntry *pdnce, ClcGroup
 	if (szProto != nullptr && !Clist_IsHiddenMode(dat, pdnce->m_iStatus))
 		cont->flags |= CONTACTF_ONLINE;
 
-	WORD apparentMode = szProto != nullptr ? pdnce->ApparentMode : 0;
+	uint16_t apparentMode = szProto != nullptr ? pdnce->ApparentMode : 0;
 	if (apparentMode)
 		switch (apparentMode) {
 		case ID_STATUS_OFFLINE:
@@ -422,7 +422,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat)
 		if (g_CluiData.bFilterEffective & CLVM_STICKY_CONTACTS) {
 			if (DWORD dwLocalMask = db_get_dw(hContact, CLVM_MODULE, g_CluiData.current_viewmode, 0)) {
 				if (g_CluiData.bFilterEffective & CLVM_FILTER_STICKYSTATUS) {
-					WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
+					uint16_t wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
 					return !((1 << (wStatus - ID_STATUS_OFFLINE)) & HIWORD(dwLocalMask)) | searchResult;
 				}
 				return 0 | searchResult;
@@ -459,7 +459,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat)
 		}
 
 		if (g_CluiData.bFilterEffective & CLVM_FILTER_STATUS) {
-			WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
+			uint16_t wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
 			filterResult = (g_CluiData.filterFlags & CLVM_GROUPSTATUS_OP) ? ((filterResult | ((1 << (wStatus - ID_STATUS_OFFLINE)) & g_CluiData.statusMaskFilter ? 1 : 0))) : (filterResult & ((1 << (wStatus - ID_STATUS_OFFLINE)) & g_CluiData.statusMaskFilter ? 1 : 0));
 		}
 
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 468fa1eefe..af5103c31a 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -433,7 +433,7 @@ static INT_PTR CALLBACK DlgProcClistListOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 					db_set_dw(0, "CLC", "GreyoutFlags", 0);
 
 				db_set_b(0, "CLC", "ShowIdle", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0));
-				db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
+				db_set_w(0, "CLC", "ScrollTime", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
 				db_set_b(0, "CLC", "GroupIndent", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0));
 				db_set_b(0, "CLC", "NoVScrollBar", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0));
 
@@ -676,7 +676,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		case 0:
 			switch (((LPNMHDR)lParam)->code) {
 			case PSN_APPLY:
-				g_plugin.setWord("IconFlashTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("IconFlashTime", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
 				g_plugin.setByte("DisableTrayFlash", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK));
 
 				uint8_t xOptions = 0;
@@ -700,7 +700,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				}
 
 				// icon cycling timeout.
-				g_plugin.setWord("CycleTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("CycleTime", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));
 
 				// icon modes
 				g_plugin.setByte("tiModeS",
@@ -859,9 +859,9 @@ static INT_PTR CALLBACK DlgProcClistBehaviourOpts(HWND hwndDlg, UINT msg, WPARAM
 		switch (((LPNMHDR)lParam)->code) {
 		case PSN_APPLY:
 			db_set_b(0, "ModernData", "HideBehind", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_HIDEMETHOD, CB_GETCURSEL, 0, 0));
-			db_set_w(0, "ModernData", "ShowDelay", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN2, UDM_GETPOS, 0, 0));
-			db_set_w(0, "ModernData", "HideDelay", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN3, UDM_GETPOS, 0, 0));
-			db_set_w(0, "ModernData", "HideBehindBorderSize", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN4, UDM_GETPOS, 0, 0));
+			db_set_w(0, "ModernData", "ShowDelay", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN2, UDM_GETPOS, 0, 0));
+			db_set_w(0, "ModernData", "HideDelay", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN3, UDM_GETPOS, 0, 0));
+			db_set_w(0, "ModernData", "HideBehindBorderSize", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN4, UDM_GETPOS, 0, 0));
 
 			db_set_b(0, "CLUI", "DragToScroll", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_DRAGTOSCROLL));
 			g_plugin.setByte("BringToFront", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT));
@@ -880,7 +880,7 @@ static INT_PTR CALLBACK DlgProcClistBehaviourOpts(HWND hwndDlg, UINT msg, WPARAM
 				(uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_EVENTAREA_ALWAYS) ? 2 : (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_EVENTAREA) ? 1 : 0));
 
 			g_plugin.setByte("AutoHide", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));
-			g_plugin.setWord("HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
+			g_plugin.setWord("HideTime", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
 			CLUI_ChangeWindowMode();
 			SendMessage(g_clistApi.hwndContactTree, WM_SIZE, 0, 0);	//forces it to send a cln_listsizechanged
 			CLUI_ReloadCLUIOptions();
@@ -1201,7 +1201,7 @@ struct BkgrItem
 	uint8_t useBitmap;
 	COLORREF bkColor, selColor;
 	char filename[MAX_PATH];
-	WORD flags;
+	uint16_t flags;
 	uint8_t useWinColours;
 };
 struct BkgrData
@@ -1277,7 +1277,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 
 			GetDlgItemTextA(hwndDlg, IDC_FILENAME, dat->item[indx].filename, _countof(dat->item[indx].filename));
 
-			WORD flags = 0;
+			uint16_t flags = 0;
 			if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHH)) flags |= CLB_STRETCHH;
 			if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHV)) flags |= CLB_STRETCHV;
 			if (IsDlgButtonChecked(hwndDlg, IDC_TILEH)) flags |= CLBF_TILEH;
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index acc206f351..1556ab0d4e 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -192,8 +192,8 @@ static INT_PTR CALLBACK DlgProcItemRowOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 		case 0:
 			switch (((LPNMHDR)lParam)->code) {
 			case PSN_APPLY:
-				g_plugin.setWord("MinRowHeight", (WORD)SendDlgItemMessage(hwndDlg, IDC_MIN_ROW_HEIGHT_SPIN, UDM_GETPOS, 0, 0));
-				g_plugin.setWord("RowBorder", (WORD)SendDlgItemMessage(hwndDlg, IDC_ROW_BORDER_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("MinRowHeight", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_MIN_ROW_HEIGHT_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("RowBorder", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_ROW_BORDER_SPIN, UDM_GETPOS, 0, 0));
 				g_plugin.setByte("VariableRowHeight", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_VARIABLE_ROW_HEIGHT));
 				g_plugin.setByte("AlignLeftItemsToLeft", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_ALIGN_TO_LEFT));
 				g_plugin.setByte("AlignRightItemsToRight", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_ALIGN_TO_RIGHT));
@@ -205,7 +205,7 @@ static INT_PTR CALLBACK DlgProcItemRowOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 					for (int i = 0; i < NUM_ITEM_TYPE; i++) {
 						char tmp[128];
 						mir_snprintf(tmp, "RowPos%d", i);
-						g_plugin.setWord(tmp, (WORD)SendMessage(hwndList, LB_GETITEMDATA, i, 0));
+						g_plugin.setWord(tmp, (uint16_t)SendMessage(hwndList, LB_GETITEMDATA, i, 0));
 					}
 				}
 
@@ -384,10 +384,10 @@ static INT_PTR CALLBACK DlgProcItemAvatarOpts(HWND hwndDlg, UINT msg, WPARAM wPa
 				g_plugin.setByte("AvatarsRoundCorners", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AVATAR_ROUND_CORNERS));
 				g_plugin.setByte("AvatarsIgnoreSizeForRow", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AVATAR_IGNORE_SIZE));
 				g_plugin.setByte("AvatarsUseCustomCornerSize", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AVATAR_CUSTOM_CORNER_SIZE_CHECK));
-				g_plugin.setWord("AvatarsCustomCornerSize", (WORD)SendDlgItemMessage(hwndDlg, IDC_AVATAR_CUSTOM_CORNER_SIZE_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("AvatarsCustomCornerSize", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_AVATAR_CUSTOM_CORNER_SIZE_SPIN, UDM_GETPOS, 0, 0));
 				g_plugin.setByte("AvatarsDrawOverlay", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AVATAR_OVERLAY_ICONS));
-				g_plugin.setWord("AvatarsSize", (WORD)SendDlgItemMessage(hwndDlg, IDC_AVATAR_SIZE_SPIN, UDM_GETPOS, 0, 0));
-				g_plugin.setWord("AvatarsWidth", (WORD)SendDlgItemMessage(hwndDlg, IDC_AVATAR_WIDTH_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("AvatarsSize", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_AVATAR_SIZE_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("AvatarsWidth", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_AVATAR_WIDTH_SPIN, UDM_GETPOS, 0, 0));
 
 				if (IsDlgButtonChecked(hwndDlg, IDC_AVATAR_OVERLAY_ICON_NORMAL))
 					g_plugin.setByte("AvatarsOverlayType", SETTING_AVATAR_OVERLAY_TYPE_NORMAL);
@@ -689,10 +689,10 @@ static INT_PTR CALLBACK DlgProcItemSecondLineOpts(HWND hwndDlg, UINT msg, WPARAM
 			switch (((LPNMHDR)lParam)->code) {
 			case PSN_APPLY:
 				g_plugin.setByte("SecondLineShow", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SHOW));
-				g_plugin.setWord("SecondLineTopSpace", (WORD)SendDlgItemMessage(hwndDlg, IDC_TOP_SPACE_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("SecondLineTopSpace", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_TOP_SPACE_SPIN, UDM_GETPOS, 0, 0));
 				g_plugin.setByte("SecondLineDrawSmileys", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_DRAW_SMILEYS));
 
-				WORD radio;
+				uint16_t radio;
 				if (IsDlgButtonChecked(hwndDlg, IDC_STATUS))
 					radio = TEXT_STATUS;
 				else if (IsDlgButtonChecked(hwndDlg, IDC_NICKNAME))
@@ -846,7 +846,7 @@ static INT_PTR CALLBACK DlgProcItemThirdLineOpts(HWND hwndDlg, UINT msg, WPARAM
 			switch (((LPNMHDR)lParam)->code) {
 			case PSN_APPLY:
 				g_plugin.setByte("ThirdLineShow", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_SHOW));
-				g_plugin.setWord("ThirdLineTopSpace", (WORD)SendDlgItemMessage(hwndDlg, IDC_TOP_SPACE_SPIN, UDM_GETPOS, 0, 0));
+				g_plugin.setWord("ThirdLineTopSpace", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_TOP_SPACE_SPIN, UDM_GETPOS, 0, 0));
 				g_plugin.setByte("ThirdLineDrawSmileys", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_DRAW_SMILEYS));
 				{
 					int radio;
@@ -862,7 +862,7 @@ static INT_PTR CALLBACK DlgProcItemThirdLineOpts(HWND hwndDlg, UINT msg, WPARAM
 						radio = TEXT_LISTENING_TO;
 					else
 						radio = TEXT_STATUS_MESSAGE;
-					g_plugin.setWord("ThirdLineType", (WORD)radio);
+					g_plugin.setWord("ThirdLineType", (uint16_t)radio);
 				}
 				{
 					wchar_t t[TEXT_TEXT_MAX_LENGTH];
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index b938250856..3bf17c5d56 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -74,7 +74,7 @@ static uint8_t bAlphaEnd;
 static int bOldHideOffline;
 static int bOldUseGroups;
 
-static WORD wBehindEdgeShowDelay,
+static uint16_t wBehindEdgeShowDelay,
 wBehindEdgeHideDelay,
 wBehindEdgeBorderSize;
 
diff --git a/plugins/Clist_modern/src/modern_global_structure.h b/plugins/Clist_modern/src/modern_global_structure.h
index 6e76a7367c..cdb8ed6940 100644
--- a/plugins/Clist_modern/src/modern_global_structure.h
+++ b/plugins/Clist_modern/src/modern_global_structure.h
@@ -11,7 +11,7 @@ struct CLUIDATA
 
 	// NotifyArea menu
 	HMENU    hMenuNotify;
-	WORD     wNextMenuID;
+	uint16_t     wNextMenuID;
 	int      iIconNotify;
 	DWORD    dwFlags;
 	int      hIconNotify;
diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp
index 5fe7f39945..a29abd19cc 100644
--- a/plugins/Clist_modern/src/modern_skinbutton.cpp
+++ b/plugins/Clist_modern/src/modern_skinbutton.cpp
@@ -230,7 +230,7 @@ static int ModernSkinButtonToggleDBValue(char * ValueDBSection, char *ValueTypeD
 		case 'w':
 			curval = db_get_w(0, section, key, l2);
 			curval = (curval == l2) ? l1 : l2;
-			db_set_w(0, section, key, (WORD)curval);
+			db_set_w(0, section, key, (uint16_t)curval);
 			break;
 
 		case 'b':
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index 43b5675d15..eb1f1e1ac5 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -187,7 +187,7 @@ HRESULT IniParser::WriteStrToDb(const char * szSection, const char * szName, con
 		break;
 
 	case 'w':
-		db_set_w(0, szSection, szName, (WORD)atoi(szValue + 1));
+		db_set_w(0, szSection, szName, (uint16_t)atoi(szValue + 1));
 		break;
 
 	case 'd':
@@ -2188,9 +2188,9 @@ static int ske_AlphaTextOut(HDC hDC, LPCTSTR lpString, int nCount, RECT *lpRect,
 	// Step first fill fast calc correction tables:
 	static bool _tables_empty = true;
 	static uint8_t gammaTbl[256];			// Gamma correction table
-	static WORD blueMulTbl[256];		// blue  coefficient multiplication table
-	static WORD greenMulTbl[256];		// green coefficient multiplication table
-	static WORD redMulTbl[256];			// red   coefficient multiplication table
+	static uint16_t blueMulTbl[256];		// blue  coefficient multiplication table
+	static uint16_t greenMulTbl[256];		// green coefficient multiplication table
+	static uint16_t redMulTbl[256];			// red   coefficient multiplication table
 	if (_tables_empty) {
 		// fill tables
 		double gammaCfPw = 1000 / (double)DBGetContactSettingRangedWord(0, "ModernData", "AlphaTextOutGamma", 700, 1, 5000);
@@ -2368,7 +2368,7 @@ static int ske_AlphaTextOut(HDC hDC, LPCTSTR lpString, int nCount, RECT *lpRect,
 						if (ax) {
 							//Normalize components to gray
 							uint8_t axx = 255 - ((r + g + b) >> 2); // Coefficient of grayance, more white font - more gray edges
-							WORD atx = ax * (255 - axx);
+							uint16_t atx = ax * (255 - axx);
 							bx = (atx + bx * axx) / 255;
 							gx = (atx + gx * axx) / 255;
 							rx = (atx + rx * axx) / 255;
@@ -3506,12 +3506,12 @@ static DWORD ske_Blend(DWORD X1, DWORD X2, uint8_t alpha)
 
 	uint8_t a_1 = ~a1;
 	uint8_t a_2 = ~a2;
-	WORD am = (WORD)a1*a_2;
+	uint16_t am = (uint16_t)a1*a_2;
 
 	/*  it is possible to use >>8 instead of /255 but it is require additional
 	*   checking of alphavalues
 	*/
-	WORD ar = a1 + (((WORD)a_1*a2) / 255);
+	uint16_t ar = a1 + (((uint16_t)a_1*a2) / 255);
 	// if a2 more than 0 than result should be more
 	// or equal (if a1 == 0) to a2, else in combination
 	// with mask we can get here black points
@@ -3520,10 +3520,10 @@ static DWORD ske_Blend(DWORD X1, DWORD X2, uint8_t alpha)
 
 	if (ar == 0) return 0;
 
-	WORD arm = ar * 255;
-	WORD rr = (((WORD)r1*am + (WORD)r2*a2 * 255)) / arm;
-	WORD gr = (((WORD)g1*am + (WORD)g2*a2 * 255)) / arm;
-	WORD br = (((WORD)b1*am + (WORD)b2*a2 * 255)) / arm;
+	uint16_t arm = ar * 255;
+	uint16_t rr = (((uint16_t)r1*am + (uint16_t)r2*a2 * 255)) / arm;
+	uint16_t gr = (((uint16_t)g1*am + (uint16_t)g2*a2 * 255)) / arm;
+	uint16_t br = (((uint16_t)b1*am + (uint16_t)b2*a2 * 255)) / arm;
 	return (ar << 24) | (rr << 16) | (gr << 8) | br;
 }
 
@@ -3722,13 +3722,13 @@ uint8_t SkinDBGetContactSettingByte(MCONTACT hContact, const char *szSection, co
 	return bDefault;
 }
 
-WORD SkinDBGetContactSettingWord(MCONTACT hContact, const char *szSection, const char *szKey, WORD wDefault)
+uint16_t SkinDBGetContactSettingWord(MCONTACT hContact, const char *szSection, const char *szKey, uint16_t wDefault)
 {
 	BOOL bSkinned = FALSE;
 	DBVARIANT dbv = { 0 };
 	if (!SkinDBGetContactSetting(hContact, szSection, szKey, &dbv, &bSkinned)) {
 		if (dbv.type == DBVT_WORD) {
-			WORD retVal = dbv.wVal;
+			uint16_t retVal = dbv.wVal;
 			db_free(&dbv);
 			return retVal;
 		}
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index e4b935d374..8767a9a457 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -103,7 +103,7 @@ struct
 {
 	HBITMAP  mtb_hBmpBackground;
 	COLORREF mtb_bkColour;
-	WORD     mtb_backgroundBmpUse;
+	uint16_t     mtb_backgroundBmpUse;
 	BOOL     mtb_useWinColors;
 }
 static tbdat = { nullptr, CLCDEFAULT_BKCOLOUR, CLCDEFAULT_BKBMPUSE, CLCDEFAULT_USEWINDOWSCOLOURS };
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 9d2925add7..15843bf7c4 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -273,7 +273,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 
 	case INTM_GROUPCHANGED:
 		{
-			WORD iExtraImage[EXTRA_ICON_COUNT];
+			uint16_t iExtraImage[EXTRA_ICON_COUNT];
 			uint8_t flags = 0;
 			if (!Clist_FindItem(hwnd, dat, wParam, &contact))
 				memset(iExtraImage, 0xFF, sizeof(iExtraImage));
@@ -307,7 +307,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		{
 			int recalcScrollBar = 0;
 			MCONTACT hContact = wParam;
-			WORD status = ID_STATUS_OFFLINE;
+			uint16_t status = ID_STATUS_OFFLINE;
 			int  contactRemoved = 0;
 			MCONTACT hSelItem = NULL;
 			ClcContact *selcontact = nullptr;
@@ -330,7 +330,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 					recalcScrollBar = 1;
 					Clist_FindItem(hwnd, dat, hContact, &contact);
 					if (contact) {
-						contact->iImage = (WORD)lParam;
+						contact->iImage = (uint16_t)lParam;
 						Clist_NotifyNewContact(hwnd, hContact);
 					}
 				}
@@ -338,7 +338,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 			else {
 				// item in list already
 				DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);
-				if (contact->iImage == (WORD)lParam)
+				if (contact->iImage == (uint16_t)lParam)
 					break;
 				if (!shouldShow && !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline || cfg::dat.bFilterEffective)) {        // CLVM changed
 					if (dat->selection >= 0 && g_clistApi.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) != -1)
@@ -348,7 +348,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 					recalcScrollBar = 1;
 				}
 				else {
-					contact->iImage = (WORD)lParam;
+					contact->iImage = (uint16_t)lParam;
 					if (!Clist_IsHiddenMode(dat, status))
 						contact->flags |= CONTACTF_ONLINE;
 					else
@@ -473,7 +473,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 
 	case INTM_STATUSCHANGED:
 		if (Clist_FindItem(hwnd, dat, wParam, &contact)) {
-			WORD wStatus = db_get_w(wParam, contact->pce->szProto, "Status", ID_STATUS_OFFLINE);
+			uint16_t wStatus = db_get_w(wParam, contact->pce->szProto, "Status", ID_STATUS_OFFLINE);
 			if (cfg::dat.bNoOfflineAvatars && wStatus != ID_STATUS_OFFLINE && contact->wStatus == ID_STATUS_OFFLINE) {
 				contact->wStatus = wStatus;
 				if (cfg::dat.bAvatarServiceAvail && contact->ace == nullptr)
diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h
index f838cfea96..aa2bba2455 100644
--- a/plugins/Clist_nicer/src/clc.h
+++ b/plugins/Clist_nicer/src/clc.h
@@ -128,7 +128,7 @@ struct ClcContact : public ClcContactBase
 	MCONTACT	hSubContact;
 	char    *metaProto;
 	DWORD    codePage;
-	WORD     wStatus;
+	uint16_t     wStatus;
 	int      avatarLeft, extraIconRightBegin;
 	int      isRtl;
 	DWORD    cFlags;
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index b8c69babfe..64df6d5f09 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -226,7 +226,7 @@ uint8_t GetCachedStatusMsg(TExtraCache *p, char *szProto)
 		db_free(&dbv);
 
 	if (p->bStatusMsgValid != STATUSMSG_NOTFOUND) {
-		WORD infoTypeC2[12];
+		uint16_t infoTypeC2[12];
 		memset(infoTypeC2, 0, sizeof(infoTypeC2));
 		int iLen = min((int)mir_wstrlen(p->statusMsg), 10);
 		GetStringTypeW(CT_CTYPE2, p->statusMsg, iLen, infoTypeC2);
@@ -262,7 +262,7 @@ void ReloadExtraInfo(MCONTACT hContact)
 
 void RTL_DetectAndSet(ClcContact *contact, MCONTACT hContact)
 {
-	WORD infoTypeC2[12];
+	uint16_t infoTypeC2[12];
 	wchar_t *szText;
 	TExtraCache *p;
 
@@ -291,7 +291,7 @@ void RTL_DetectAndSet(ClcContact *contact, MCONTACT hContact)
 
 void RTL_DetectGroupName(ClcContact *group)
 {
-	WORD infoTypeC2[12];
+	uint16_t infoTypeC2[12];
 
 	group->isRtl = 0;
 
@@ -389,7 +389,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData
 		DWORD dwLocalMask = db_get_dw(hContact, "CLVM", cfg::dat.current_viewmode, 0);
 		if (dwLocalMask != 0) {
 			if (cfg::dat.bFilterEffective & CLVM_FILTER_STICKYSTATUS) {
-				WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
+				uint16_t wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
 				return !((1 << (wStatus - ID_STATUS_OFFLINE)) & HIWORD(dwLocalMask));
 			}
 			return 0;
@@ -419,7 +419,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData
 	}
 
 	if (cfg::dat.bFilterEffective & CLVM_FILTER_STATUS) {
-		WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
+		uint16_t wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
 		filterResult = (cfg::dat.filterFlags & CLVM_GROUPSTATUS_OP) ? ((filterResult | ((1 << (wStatus - ID_STATUS_OFFLINE)) & cfg::dat.statusMaskFilter ? 1 : 0))) : (filterResult & ((1 << (wStatus - ID_STATUS_OFFLINE)) & cfg::dat.statusMaskFilter ? 1 : 0));
 	}
 
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index 8851f896e5..3d92dbf738 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -317,7 +317,7 @@ public:
 		db_set_dw(0, "CLC", "avatarradius", cfg::dat.avatarRadius);
 
 		cfg::dat.avatarSize = GetDlgItemInt(m_hwnd, IDC_AVATARHEIGHT, &translated, FALSE);
-		g_plugin.setWord("AvatarSize", (WORD)cfg::dat.avatarSize);
+		g_plugin.setWord("AvatarSize", (uint16_t)cfg::dat.avatarSize);
 
 		cfg::dat.bNoOfflineAvatars = IsDlgButtonChecked(m_hwnd, IDC_NOAVATARSOFFLINE) ? TRUE : FALSE;
 		g_plugin.setByte("NoOfflineAV", (uint8_t)cfg::dat.bNoOfflineAvatars);
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 84b3418f35..0939582f85 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -182,7 +182,7 @@ HDC hdcAV;
 
 LONG g_maxAV_X = 200, g_maxAV_Y = 200;
 
-static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, WORD cstatus, int rowHeight, DWORD dwFlags)
+static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, uint16_t cstatus, int rowHeight, DWORD dwFlags)
 {
 	float dScale = 0.;
 	float newHeight, newWidth;
@@ -461,7 +461,7 @@ set_bg_l:
 
 	RECT rc;
 	rc.left = 0;
-	WORD cstatus = contact->wStatus;
+	uint16_t cstatus = contact->wStatus;
 
 	/***** BACKGROUND DRAWING *****/
 	// contacts
@@ -829,13 +829,13 @@ bgskipped:
 		rc2.bottom = rc2.top + rowHeight;
 
 		if (av_left) {
-			leftOffset += DrawAvatar(hdcMem, &rc2, contact, y, dat, (WORD)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);
+			leftOffset += DrawAvatar(hdcMem, &rc2, contact, y, dat, (uint16_t)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);
 			rcContent.left += leftOffset;
 			leftX += leftOffset;
 		}
 		else {
 			rc2.left = (rcContent.right - cfg::dat.avatarSize) + 1;
-			rightOffset += DrawAvatar(hdcMem, &rc2, contact, y, dat, (WORD)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);
+			rightOffset += DrawAvatar(hdcMem, &rc2, contact, y, dat, (uint16_t)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);
 			rcContent.right -= (rightOffset);
 		}
 	}
@@ -1014,10 +1014,10 @@ bgskipped:
 					RECT rcAvatar = rcContent;
 
 					rcAvatar.left = rcContent.right - (cfg::dat.avatarSize - 1);
-					DrawAvatar(hdcMem, &rcAvatar, contact, y, dat, (WORD)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);
+					DrawAvatar(hdcMem, &rcAvatar, contact, y, dat, (uint16_t)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);
 					rcContent.right -= (cfg::dat.avatarSize + 2);
 				}
-				else rcContent.left += DrawAvatar(hdcMem, &rcContent, contact, y, dat, (WORD)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);
+				else rcContent.left += DrawAvatar(hdcMem, &rcContent, contact, y, dat, (uint16_t)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);
 			}
 			else if (dwFlags & CLUI_FRAME_ALWAYSALIGNNICK && !avatar_done && av_local_wanted)
 				rcContent.left += (dwFlags & (CLUI_FRAME_AVATARSLEFT | CLUI_FRAME_AVATARSRIGHT | CLUI_FRAME_AVATARSRIGHTWITHNICK) ? 0 : cfg::dat.avatarSize + 2);
diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index a0741a8c15..2dca2ce3c9 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -92,8 +92,8 @@ public:
 	{
 		g_plugin.setByte("AlwaysMulti", (uint8_t)BST_UNCHECKED == IsDlgButtonChecked(m_hwnd, IDC_ALWAYSMULTI));
 		g_plugin.setByte("TrayIcon", (uint8_t)(chkDontCycle.GetState() ? SETTING_TRAYICON_SINGLE : (chkCycle.GetState() ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI)));
-		g_plugin.setWord("CycleTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));
-		g_plugin.setWord("IconFlashTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
+		g_plugin.setWord("CycleTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));
+		g_plugin.setWord("IconFlashTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
 		g_plugin.setByte("DisableTrayFlash", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_DISABLEBLINK));
 		g_plugin.setByte("AutoApplyLastViewMode", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_APPLYLASTVIEWMODE));
 
@@ -254,7 +254,7 @@ public:
 
 		cfgSetFlag(m_hwnd, IDC_FULLROWSELECT, CLUI_FULLROWSELECT);
 
-		db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
+		db_set_w(0, "CLC", "ScrollTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
 		db_set_b(0, "CLC", "NoVScrollBar", (uint8_t)(IsDlgButtonChecked(m_hwnd, IDC_NOSCROLLBAR) ? 1 : 0));
 		cfg::dat.bDblClkAvatars = IsDlgButtonChecked(m_hwnd, IDC_DBLCLKAVATARS) ? TRUE : FALSE;
 		db_set_b(0, "CLC", "dblclkav", (uint8_t)cfg::dat.bDblClkAvatars);
@@ -447,7 +447,7 @@ public:
 		db_set_b(0, "CLUI", "MaxSizeHeight", (uint8_t)GetDlgItemInt(m_hwnd, IDC_MAXSIZEHEIGHT, nullptr, FALSE));
 		db_set_b(0, "CLUI", "AutoSizeUpward", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_AUTOSIZEUPWARD));
 		g_plugin.setByte("AutoHide", chkAutoHide.GetState());
-		g_plugin.setWord("HideTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
+		g_plugin.setWord("HideTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
 
 		g_plugin.setByte("Transparent", cfg::dat.isTransparent = chkTransparent.GetState());
 		g_plugin.setByte("Alpha", cfg::dat.alpha = (uint8_t)SendDlgItemMessage(m_hwnd, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0));
@@ -577,7 +577,7 @@ public:
 			db_free(&dbv);
 		}
 
-		WORD bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
+		uint16_t bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
 		CheckDlgButton(m_hwnd, IDC_STRETCHH, bmpUse & CLB_STRETCHH ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(m_hwnd, IDC_STRETCHV, bmpUse & CLB_STRETCHV ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(m_hwnd, IDC_TILEH, bmpUse & CLBF_TILEH ? BST_CHECKED : BST_UNCHECKED);
@@ -601,7 +601,7 @@ public:
 		else
 			db_set_s(0, "CLC", "BkBitmap", str);
 
-		WORD flags = 0;
+		uint16_t flags = 0;
 		if (IsDlgButtonChecked(m_hwnd, IDC_STRETCHH))
 			flags |= CLB_STRETCHH;
 		if (IsDlgButtonChecked(m_hwnd, IDC_STRETCHV))
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 276010e810..93f9bcb289 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -418,8 +418,8 @@ void SetDBButtonStates(MCONTACT hPassedContact)
 					break;
 				}
 			case DBVT_WORD: {
-					WORD val = db_get_w(hFinalContact, szModule, szSetting, 0);
-					result = (val == *((WORD *)&buttonItem->bValuePush));
+					uint16_t val = db_get_w(hFinalContact, szModule, szSetting, 0);
+					result = (val == *((uint16_t *)&buttonItem->bValuePush));
 					break;
 				}
 			case DBVT_DWORD:
@@ -1387,7 +1387,7 @@ skipbg:
 											db_set_b(finalhContact, szModule, szSetting, pValue[0]);
 											break;
 										case DBVT_WORD:
-											db_set_w(finalhContact, szModule, szSetting, *((WORD *)&pValue[0]));
+											db_set_w(finalhContact, szModule, szSetting, *((uint16_t *)&pValue[0]));
 											break;
 										case DBVT_DWORD:
 											db_set_dw(finalhContact, szModule, szSetting, *((DWORD *)&pValue[0]));
diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp
index 02bb548c61..daaa90863d 100644
--- a/plugins/Clist_nicer/src/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/cluiframes.cpp
@@ -430,18 +430,18 @@ int DBStoreFrameSettingsAtPos(int pos, int Frameid)
 	db_set_b(0, CLUIFrameModule, buf.Format("Visible%d", pos), (uint8_t)btoint(Frames[Frameid].visible));
 	db_set_b(0, CLUIFrameModule, buf.Format("TBVisile%d", pos), (uint8_t)btoint(Frames[Frameid].TitleBar.ShowTitleBar));
 
-	db_set_w(0, CLUIFrameModule, buf.Format("Height%d", pos), (WORD)Frames[Frameid].height);
-	db_set_w(0, CLUIFrameModule, buf.Format("HeightCollapsed%d", pos), (WORD)Frames[Frameid].HeightWhenCollapsed);
-	db_set_w(0, CLUIFrameModule, buf.Format("Align%d", pos), (WORD)Frames[Frameid].align);
+	db_set_w(0, CLUIFrameModule, buf.Format("Height%d", pos), (uint16_t)Frames[Frameid].height);
+	db_set_w(0, CLUIFrameModule, buf.Format("HeightCollapsed%d", pos), (uint16_t)Frames[Frameid].HeightWhenCollapsed);
+	db_set_w(0, CLUIFrameModule, buf.Format("Align%d", pos), (uint16_t)Frames[Frameid].align);
 	//FloatingPos
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatX%d", pos), (WORD)Frames[Frameid].FloatingPos.x);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatY%d", pos), (WORD)Frames[Frameid].FloatingPos.y);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatW%d", pos), (WORD)Frames[Frameid].FloatingSize.x);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatH%d", pos), (WORD)Frames[Frameid].FloatingSize.y);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatX%d", pos), (uint16_t)Frames[Frameid].FloatingPos.x);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatY%d", pos), (uint16_t)Frames[Frameid].FloatingPos.y);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatW%d", pos), (uint16_t)Frames[Frameid].FloatingSize.x);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatH%d", pos), (uint16_t)Frames[Frameid].FloatingSize.y);
 
 	db_set_b(0, CLUIFrameModule, buf.Format("Floating%d", pos), (uint8_t)btoint(Frames[Frameid].floating));
 	db_set_b(0, CLUIFrameModule, buf.Format("UseBorder%d", pos), (uint8_t)btoint(Frames[Frameid].UseBorder));
-	db_set_w(0, CLUIFrameModule, buf.Format("Order%d", pos), (WORD)Frames[Frameid].order);
+	db_set_w(0, CLUIFrameModule, buf.Format("Order%d", pos), (uint16_t)Frames[Frameid].order);
 
 	db_set_b(0, CLUIFrameModule, buf.Format("Skinned%d", pos), Frames[Frameid].Skinned);
 	return 0;
@@ -500,7 +500,7 @@ int CLUIFramesStoreFrameSettings(int Frameid)
 	}
 
 	DBStoreFrameSettingsAtPos(storpos, Frameid);
-	db_set_w(0, CLUIFrameModule, "StoredFrames", (WORD)maxstored);
+	db_set_w(0, CLUIFrameModule, "StoredFrames", (uint16_t)maxstored);
 	return 0;
 }
 
diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp
index 67e699a49b..26f9fffd6b 100644
--- a/plugins/Clist_nicer/src/config.cpp
+++ b/plugins/Clist_nicer/src/config.cpp
@@ -143,7 +143,7 @@ void API::Ex_CopyEditToClipboard(HWND hWnd)
 
 INT_PTR CALLBACK API::Ex_DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM)
 {
-	WORD wNotifyCode, wID;
+	uint16_t wNotifyCode, wID;
 
 	switch (uMsg) {
 	case WM_INITDIALOG: {
diff --git a/plugins/Clist_nicer/src/coolscroll.cpp b/plugins/Clist_nicer/src/coolscroll.cpp
index 01e1e3eede..9c713f9544 100644
--- a/plugins/Clist_nicer/src/coolscroll.cpp
+++ b/plugins/Clist_nicer/src/coolscroll.cpp
@@ -334,7 +334,7 @@ static COLORREF GetSBBackColor(void)
 //
 static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg)
 {
-	static WORD wCheckPat[8] = 
+	static uint16_t wCheckPat[8] = 
 	{ 
 		0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555 
 	};
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 697ef85f7c..9b4e383781 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -1130,8 +1130,8 @@ static void BTN_ReadItem(char *itemName, char *file)
 				}
 			case 'w':
 				{
-					WORD value = (WORD)atol(&szBuffer[1]);
-					*((WORD *)&pValue[0]) = value;
+					uint16_t value = (uint16_t)atol(&szBuffer[1]);
+					*((uint16_t *)&pValue[0]) = value;
 					tmpItem.type = DBVT_WORD;
 					break;
 				}
@@ -1440,12 +1440,12 @@ void extbk_import(char *file, HWND hwndDlg)
 			mir_snprintf(szKey, "Font%dFlags", n);
 			data = 0;
 			GetPrivateProfileStructA(szSection, "Flags", &data, 4, file);
-			db_set_dw(0, "CLC", szKey, (WORD)data);
+			db_set_dw(0, "CLC", szKey, (uint16_t)data);
 
 			mir_snprintf(szKey, "Font%dAs", n);
 			data = 0;
 			GetPrivateProfileStructA(szSection, "SameAs", &data, 2, file);
-			db_set_dw(0, "CLC", szKey, (WORD)data);
+			db_set_dw(0, "CLC", szKey, (uint16_t)data);
 		}
 	}
 	i = 0;
@@ -1464,7 +1464,7 @@ void extbk_import(char *file, HWND hwndDlg)
 				db_set_dw(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, data);
 				break;
 			case 2:
-				db_set_w(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (WORD)data);
+				db_set_w(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (uint16_t)data);
 				break;
 			}
 			i++;
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index 5c95d1f8d6..c0b38de014 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -89,7 +89,7 @@ extern HIMAGELIST hCListImages;
 
 extern CLIST_INTERFACE coreCli;
 
-typedef  int  (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, int selected, WORD cstatus, int rowHeight);
+typedef  int  (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, int selected, uint16_t cstatus, int rowHeight);
 
 BOOL __forceinline GetItemByStatus(int status, StatusItems_t *retitem);
 
diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index ac0342869c..fd85719cbe 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -813,7 +813,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r
 					break;
 
 				case VALUE_WORD:
-					db_set_w(0, module, key, (*(WORD *)value));
+					db_set_w(0, module, key, (*(uint16_t *)value));
 					wrote = Translate("word");
 					break;
 
@@ -1117,7 +1117,7 @@ int ContactMatchSearch(MCONTACT hContact, wchar_t *contact, wchar_t *id, char *a
 				char protocol[128];
 
 				AccountName2Protocol(_A2T(account), protocol, _countof(protocol));
-				WORD contactStatus = db_get_w(hContact, protocol, "Status", ID_STATUS_OFFLINE);
+				uint16_t contactStatus = db_get_w(hContact, protocol, "Status", ID_STATUS_OFFLINE);
 
 				if (searchStatus != contactStatus) {
 					matches = 0;
diff --git a/plugins/CountryFlags/src/ip2country.cpp b/plugins/CountryFlags/src/ip2country.cpp
index ec834a22e1..6f3b2c6901 100644
--- a/plugins/CountryFlags/src/ip2country.cpp
+++ b/plugins/CountryFlags/src/ip2country.cpp
@@ -24,7 +24,7 @@ extern struct CountryListEntry *countries;
 
 /************************* Bin Records ****************************/
 
-#define DATARECORD_SIZE (sizeof(DWORD)+sizeof(DWORD)+sizeof(WORD))
+#define DATARECORD_SIZE (sizeof(DWORD)+sizeof(DWORD)+sizeof(uint16_t))
 
 // mir_free() the return value
 static uint8_t* GetDataHeader(uint8_t *data, DWORD cbDataSize, DWORD *pnDataRecordCount)
@@ -45,7 +45,7 @@ static int GetDataRecord(uint8_t *data, DWORD index, DWORD *pdwFrom, DWORD *pdwT
 	data += sizeof(DWORD);
 	if (pdwTo != nullptr) *pdwTo = *(DWORD*)data;
 	data += sizeof(DWORD);
-	return (int)*(WORD*)data;
+	return (int)*(uint16_t*)data;
 }
 
 /************************* Record Cache ***************************/
@@ -185,7 +185,7 @@ static int EnumIpDataLines(const char *pszFileCSV, const char *pszFileOut)
 	char line[1024], out[512], *pszFrom, *pszTo, *pszTwo, *pszCountry, *buf;
 	int i, j;
 	DWORD dwOut;
-	WORD wOut;
+	uint16_t wOut;
 	struct ResizableByteBuffer buffer;
 
 	memset(&buffer, 0, sizeof(buffer));
@@ -237,8 +237,8 @@ static int EnumIpDataLines(const char *pszFileCSV, const char *pszFileOut)
 					AppendToByteBuffer(&buffer, (void*)&dwOut, sizeof(DWORD));
 					dwOut = (DWORD)atoi(pszTo);
 					AppendToByteBuffer(&buffer, (void*)&dwOut, sizeof(DWORD));
-					wOut = (WORD)countries[i].id;
-					AppendToByteBuffer(&buffer, (void*)&wOut, sizeof(WORD));
+					wOut = (uint16_t)countries[i].id;
+					AppendToByteBuffer(&buffer, (void*)&wOut, sizeof(uint16_t));
 					break;
 				}
 			}
diff --git a/plugins/CryptoPP/src/cpp_svcs.cpp b/plugins/CryptoPP/src/cpp_svcs.cpp
index 15d8202498..b99e0fc15e 100644
--- a/plugins/CryptoPP/src/cpp_svcs.cpp
+++ b/plugins/CryptoPP/src/cpp_svcs.cpp
@@ -85,7 +85,7 @@ LPSTR __cdecl cpp_decrypt(pCNTX ptr, LPCSTR szEncMsg)
 			bciphered++; clen--; // cut GZIP flag
 		}
 		if (ptr->features & FEATURES_CRC32) {
-			int len = *(WORD*)bciphered;
+			int len = *(uint16_t*)bciphered;
 			bciphered += 2; clen -= 2; // cut CRC32 length
 
 			if ((int)clen - CRC32::DIGESTSIZE < len) { // mesage not full
diff --git a/plugins/Db3x_mmap/src/dbcrypt.cpp b/plugins/Db3x_mmap/src/dbcrypt.cpp
index 39f523be8e..bd8b1495f0 100644
--- a/plugins/Db3x_mmap/src/dbcrypt.cpp
+++ b/plugins/Db3x_mmap/src/dbcrypt.cpp
@@ -79,7 +79,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::StoreCryptoKey()
 
 	DBCONTACTWRITESETTING dbcws = { "CryptoEngine", "StoredKey" };
 	dbcws.value.type = DBVT_BLOB;
-	dbcws.value.cpbVal = (WORD)iKeyLength;
+	dbcws.value.cpbVal = (uint16_t)iKeyLength;
 	dbcws.value.pbVal = pKey;
 	WriteContactSetting(0, &dbcws);
 
@@ -120,7 +120,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::StoreProvider(CRYPTO_PROVIDER *pProvider)
 	DBCONTACTWRITESETTING dbcws = { "CryptoEngine", "Provider" };
 	dbcws.value.type = DBVT_BLOB;
 	dbcws.value.pbVal = (uint8_t*)pProvider->pszName;
-	dbcws.value.cpbVal = (WORD)mir_strlen(pProvider->pszName) + 1;
+	dbcws.value.cpbVal = (uint16_t)mir_strlen(pProvider->pszName) + 1;
 	WriteContactSetting(0, &dbcws);
 	return TRUE;
 }
@@ -239,7 +239,7 @@ void CDb3Mmap::ToggleSettingsEncryption(MCONTACT contactID)
 					DBCONTACTWRITESETTING dbcws = { szModule, p->szVar };
 					dbcws.value.type = DBVT_ENCRYPTED;
 					dbcws.value.pbVal = pResult;
-					dbcws.value.cpbVal = (WORD)encodedLen;
+					dbcws.value.cpbVal = (uint16_t)encodedLen;
 					WriteContactSetting(contactID, &dbcws);
 
 					mir_free(pResult);
@@ -252,7 +252,7 @@ void CDb3Mmap::ToggleSettingsEncryption(MCONTACT contactID)
 					DBCONTACTWRITESETTING dbcws = { szModule, p->szVar };
 					dbcws.value.type = DBVT_UNENCRYPTED;
 					dbcws.value.pszVal = decoded;
-					dbcws.value.cchVal = (WORD)realLen;
+					dbcws.value.cchVal = (uint16_t)realLen;
 					WriteContactSetting(contactID, &dbcws);
 				}
 			}
diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h
index 4963ab95bf..10daa4517c 100644
--- a/plugins/Db3x_mmap/src/dbintf.h
+++ b/plugins/Db3x_mmap/src/dbintf.h
@@ -150,7 +150,7 @@ struct DBEvent_094         // previous event storage format
 	// the owner of this event
 	DWORD timestamp;        // seconds since 00:00:00 01/01/1970
 	DWORD flags;            // see m_database.h, db/event/add
-	WORD  wEventType;       // module-defined event type
+	uint16_t  wEventType;       // module-defined event type
 	DWORD cbBlob;           // number of bytes in the blob
 	uint8_t  blob[1];          // the blob. module-defined formatting
 };
@@ -165,7 +165,7 @@ struct DBEvent
 	// the owner of this event
 	DWORD timestamp;        // seconds since 00:00:00 01/01/1970
 	DWORD flags;            // see m_database.h, db/event/add
-	WORD  wEventType;       // module-defined event type
+	uint16_t  wEventType;       // module-defined event type
 	DWORD cbBlob;           // number of bytes in the blob
 	uint8_t  blob[1];          // the blob. module-defined formatting
 
diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp
index e4fa495431..26c2361b5b 100644
--- a/plugins/Db3x_mmap/src/dbsettings.cpp
+++ b/plugins/Db3x_mmap/src/dbsettings.cpp
@@ -167,7 +167,7 @@ LBL_Seek:
 						if (decoded == nullptr)
 							return 1;
 
-						varLen = (WORD)realLen;
+						varLen = (uint16_t)realLen;
 						dbv->type = DBVT_UTF8;
 						if (isStatic) {
 							dbv->cchVal--;
diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp
index 3ad32a0b21..fcd3b9d226 100644
--- a/plugins/DbEditorPP/src/exportimport.cpp
+++ b/plugins/DbEditorPP/src/exportimport.cpp
@@ -359,7 +359,7 @@ void importSettings(MCONTACT hContact, char *utf8)
 				case 'w':
 				case 'W':
 					if (sscanf(end + 2, "%u", &value) == 1)
-						db_set_w(hContact, module, setting, (WORD)value);
+						db_set_w(hContact, module, setting, (uint16_t)value);
 					break;
 				case 'd':
 				case 'D':
diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp
index 04bb232ad7..78d74c1f6e 100644
--- a/plugins/DbEditorPP/src/main_window.cpp
+++ b/plugins/DbEditorPP/src/main_window.cpp
@@ -370,7 +370,7 @@ void CMainDlg::onChange_Splitter(CSplitter *)
 	if (m_splitterPos > rc2.right - rc2.left - 150)
 		m_splitterPos = rc2.right - rc2.left - 150;
 	SetWindowLongPtr(GetDlgItem(m_hwnd, IDC_SPLITTER), GWLP_USERDATA, m_splitterPos);
-	g_plugin.setWord("Splitter", (WORD)m_splitterPos);
+	g_plugin.setWord("Splitter", (uint16_t)m_splitterPos);
 
 	PostMessage(m_hwnd, WM_SIZE, 0, 0);
 }
diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp
index 1ac1c76d98..27676f45e7 100644
--- a/plugins/DbEditorPP/src/settinglist.cpp
+++ b/plugins/DbEditorPP/src/settinglist.cpp
@@ -503,7 +503,7 @@ bool CMainDlg::EditLabelWndProc(HWND hwnd, UINT uMsg, WPARAM wParam)
 					case 'W':
 						val = wcstoul(&value[1], nullptr, 0);
 						if (!val || value[1] == '0')
-							res = !db_set_w(m_hContact, m_module, m_setting, (WORD)val);
+							res = !db_set_w(m_hContact, m_module, m_setting, (uint16_t)val);
 						else
 							res = setTextValue(m_hContact, m_module, m_setting, value, dbv.type);
 						break;
diff --git a/plugins/DbEditorPP/src/stdafx.h b/plugins/DbEditorPP/src/stdafx.h
index eb60394086..f7c621ce44 100644
--- a/plugins/DbEditorPP/src/stdafx.h
+++ b/plugins/DbEditorPP/src/stdafx.h
@@ -49,7 +49,7 @@
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
 	CMOption<bool> bExpandSettingsOnOpen, bRestoreOnOpen, bWarnOnDelete;
-	CMOption<WORD> iPopupDelay;
+	CMOption<uint16_t> iPopupDelay;
 	CMOption<DWORD> iPopupBkColor, iPopupTxtColor;
 
 	CMPlugin();
@@ -175,7 +175,7 @@ extern bool g_bUsePopups;
 #define HEX_DWORD		4
 
 // main
-char *StringFromBlob(uint8_t *blob, WORD len);
+char *StringFromBlob(uint8_t *blob, uint16_t len);
 int WriteBlobFromString(MCONTACT hContact, const char *module, const char *setting, const char *value, int len);
 wchar_t *DBVType(uint8_t type);
 DWORD getNumericValue(DBVARIANT *dbv);
diff --git a/plugins/DbEditorPP/src/utils.cpp b/plugins/DbEditorPP/src/utils.cpp
index 1979392d12..d38a5e873a 100644
--- a/plugins/DbEditorPP/src/utils.cpp
+++ b/plugins/DbEditorPP/src/utils.cpp
@@ -40,7 +40,7 @@ int ListView_SetItemTextA(HWND hwndLV, int i, int iSubItem, const char *pszText)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-char* StringFromBlob(uint8_t *blob, WORD len)
+char* StringFromBlob(uint8_t *blob, uint16_t len)
 {
 	int j;
 	char tmp[16];
@@ -81,7 +81,7 @@ int WriteBlobFromString(MCONTACT hContact, const char *szModule, const char *szS
 
 
 	if (i)
-		res = !db_set_blob(hContact, szModule, szSetting, data, (WORD)i);
+		res = !db_set_blob(hContact, szModule, szSetting, data, (uint16_t)i);
 
 	mir_free(data);
 	return res;
@@ -91,7 +91,7 @@ wchar_t* DBVType(uint8_t type)
 {
 	switch (type) {
 	case DBVT_BYTE:     return L"uint8_t";
-	case DBVT_WORD:     return L"WORD";
+	case DBVT_WORD:     return L"uint16_t";
 	case DBVT_DWORD:    return L"DWORD";
 	case DBVT_ASCIIZ:   return L"STRING";
 	case DBVT_WCHAR:
@@ -125,7 +125,7 @@ int setNumericValue(MCONTACT hContact, const char *module, const char *setting,
 
 	case DBVT_WORD:
 		if (value <= 0xFFFF)
-			return !db_set_w(hContact, module, setting, (WORD)value);
+			return !db_set_w(hContact, module, setting, (uint16_t)value);
 		break;
 
 	case DBVT_DWORD:
@@ -366,7 +366,7 @@ void saveListSettings(HWND hwnd, ColumnsSettings *cs)
 	while (cs[i].name) {
 		if (ListView_GetColumn(hwnd, cs[i].index, &sLC)) {
 			mir_snprintf(tmp, cs[i].dbname, i);
-			g_plugin.setWord(tmp, (WORD)sLC.cx);
+			g_plugin.setWord(tmp, (uint16_t)sLC.cx);
 		}
 		i++;
 	}
diff --git a/plugins/Db_autobackups/src/stdafx.h b/plugins/Db_autobackups/src/stdafx.h
index 452ea2b28a..c0679a5c34 100644
--- a/plugins/Db_autobackups/src/stdafx.h
+++ b/plugins/Db_autobackups/src/stdafx.h
@@ -41,10 +41,10 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	wchar_t folder[MAX_PATH];
 
 	CMOption<uint8_t>	    backup_types;
-	CMOption<WORD>	    period;
+	CMOption<uint16_t>	    period;
 	CMOption<uint8_t>	    period_type;
 	CMOption<wchar_t*> file_mask;
-	CMOption<WORD>	    num_backups;
+	CMOption<uint16_t>	    num_backups;
 	CMOption<uint8_t>	    disable_progress;
 	CMOption<uint8_t>	    disable_popups;
 	CMOption<uint8_t>	    use_zip;
diff --git a/plugins/Db_autobackups/src/zip.cpp b/plugins/Db_autobackups/src/zip.cpp
index ba7a95b342..b04824a516 100644
--- a/plugins/Db_autobackups/src/zip.cpp
+++ b/plugins/Db_autobackups/src/zip.cpp
@@ -16,7 +16,7 @@ int CreateZipFile(const wchar_t *szDestPath, OBJLIST<ZipFile> &lstFiles, const s
 			GetFileTime(hSrcFile, 0, &ft, 0);
 			FileTimeToLocalFileTime(&ft, &ft2);
 
-			WORD dosDate, dosTime;
+			uint16_t dosDate, dosTime;
 			FileTimeToDosDateTime(&ft2, &dosDate, &dosTime);
 			fi.dosDate = MAKELONG(dosTime, dosDate);
 
diff --git a/plugins/Dbx_mdbx/src/dbintf.h b/plugins/Dbx_mdbx/src/dbintf.h
index 47be0cc7c2..b85559e33d 100644
--- a/plugins/Dbx_mdbx/src/dbintf.h
+++ b/plugins/Dbx_mdbx/src/dbintf.h
@@ -98,7 +98,7 @@ struct DBSettingValue
 	union
 	{
 		uint8_t bVal;
-		WORD wVal;
+		uint16_t wVal;
 		DWORD dwVal;
 		char szVal[];
 
diff --git a/plugins/Dbx_mdbx/src/dbsettings.cpp b/plugins/Dbx_mdbx/src/dbsettings.cpp
index 103bcfb636..737a2d607b 100644
--- a/plugins/Dbx_mdbx/src/dbsettings.cpp
+++ b/plugins/Dbx_mdbx/src/dbsettings.cpp
@@ -49,17 +49,17 @@ void CDbxMDBX::FillSettings()
 		if (dbv == nullptr) // garbage! a setting for removed/non-existent contact
 			continue;
 
-		WORD varLen;
+		uint16_t varLen;
 
 		uint8_t iType = dbv->type = pBlob[0]; pBlob++;
 		switch (iType) {
 		case DBVT_BYTE:  dbv->bVal = *pBlob; break;
-		case DBVT_WORD:  dbv->wVal = *(WORD*)pBlob; break;
+		case DBVT_WORD:  dbv->wVal = *(uint16_t*)pBlob; break;
 		case DBVT_DWORD: dbv->dVal = *(DWORD*)pBlob; break;
 
 		case DBVT_UTF8:
 		case DBVT_ASCIIZ:
-			varLen = *(WORD*)pBlob;
+			varLen = *(uint16_t*)pBlob;
 			pBlob += 2;
 			dbv->pszVal = (char*)mir_alloc(1 + varLen);
 			memcpy(dbv->pszVal, pBlob, varLen);
@@ -68,7 +68,7 @@ void CDbxMDBX::FillSettings()
 
 		case DBVT_BLOB:
 		case DBVT_ENCRYPTED:
-			varLen = *(WORD*)pBlob;
+			varLen = *(uint16_t*)pBlob;
 			pBlob += 2;
 			dbv->pbVal = (uint8_t *)mir_alloc(varLen);
 			memcpy(dbv->pbVal, pBlob, varLen);
@@ -117,19 +117,19 @@ BOOL CDbxMDBX::WriteContactSettingWorker(MCONTACT contactID, DBCONTACTWRITESETTI
 	*pBlob++ = dbcws.value.type;
 	switch (dbcws.value.type) {
 	case DBVT_BYTE:  *pBlob = dbcws.value.bVal; break;
-	case DBVT_WORD:  *(WORD*)pBlob = dbcws.value.wVal; break;
+	case DBVT_WORD:  *(uint16_t*)pBlob = dbcws.value.wVal; break;
 	case DBVT_DWORD: *(DWORD*)pBlob = dbcws.value.dVal; break;
 
 	case DBVT_ASCIIZ:
 	case DBVT_UTF8:
-		*(WORD*)pBlob = dbcws.value.cchVal;
+		*(uint16_t*)pBlob = dbcws.value.cchVal;
 		pBlob += 2;
 		memcpy(pBlob, dbcws.value.pszVal, dbcws.value.cchVal);
 		break;
 
 	case DBVT_BLOB:
 	case DBVT_ENCRYPTED:
-		*(WORD*)pBlob = dbcws.value.cpbVal;
+		*(uint16_t*)pBlob = dbcws.value.cpbVal;
 		pBlob += 2;
 		memcpy(pBlob, dbcws.value.pbVal, dbcws.value.cpbVal);
 	}
diff --git a/plugins/FavContacts/src/cserver.cpp b/plugins/FavContacts/src/cserver.cpp
index 42f35cd687..b2577c8ecf 100644
--- a/plugins/FavContacts/src/cserver.cpp
+++ b/plugins/FavContacts/src/cserver.cpp
@@ -11,7 +11,7 @@ void CServer::Start(int port, IConnectionProcessorFactory *connectionProcessorFa
 	sockaddr_in addr = { 0 };
 	addr.sin_family = AF_INET;
 	addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	addr.sin_port = htons((WORD)port);
+	addr.sin_port = htons((uint16_t)port);
 	if (bind(m_socket, (sockaddr *)&addr, sizeof(addr)) == SOCKET_ERROR) {
 		closesocket(m_socket);
 		m_socket = INVALID_SOCKET;
diff --git a/plugins/FavContacts/src/stdafx.h b/plugins/FavContacts/src/stdafx.h
index ad34fea12b..afe031f56b 100644
--- a/plugins/FavContacts/src/stdafx.h
+++ b/plugins/FavContacts/src/stdafx.h
@@ -73,7 +73,7 @@ struct Options
 	uint8_t bSecondLine;
 	uint8_t bAvatars;
 	uint8_t bAvatarBorder;
-	WORD wAvatarRadius;
+	uint16_t wAvatarRadius;
 	uint8_t bNoTransparentBorder;
 	uint8_t bSysColors;
 	uint8_t bCenterHotkey;
@@ -81,7 +81,7 @@ struct Options
 	uint8_t bUseColumns;
 	uint8_t bRightAvatars;
 	uint8_t bDimIdle;
-	WORD wMaxRecent;
+	uint16_t wMaxRecent;
 
 	COLORREF clLine1, clLine2, clBack;
 	COLORREF clLine1Sel, clLine2Sel, clBackSel;
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp
index 4302d48ab2..762b15b880 100644
--- a/plugins/FingerprintNG/src/fingerprint.cpp
+++ b/plugins/FingerprintNG/src/fingerprint.cpp
@@ -479,9 +479,9 @@ DWORD __fastcall blend(DWORD X1, DWORD X2)
 	RGBA* q2 = (RGBA*)&X2;
 	uint8_t a_1 = ~q1->a;
 	uint8_t a_2 = ~q2->a;
-	WORD am = q1->a * a_2;
+	uint16_t am = q1->a * a_2;
 
-	WORD ar = q1->a + ((a_1 * q2->a) / 255);
+	uint16_t ar = q1->a + ((a_1 * q2->a) / 255);
 	// if a2 more than 0 than result should be more
 	// or equal (if a1==0) to a2, else in combination
 	// with mask we can get here black points
@@ -491,10 +491,10 @@ DWORD __fastcall blend(DWORD X1, DWORD X2)
 	if (ar == 0) return 0;
 
 	{
-		WORD arm = ar * 255;
-		WORD rr = ((q1->r * am + q2->r * q2->a * 255)) / arm;
-		WORD gr = ((q1->g * am + q2->g * q2->a * 255)) / arm;
-		WORD br = ((q1->b * am + q2->b * q2->a * 255)) / arm;
+		uint16_t arm = ar * 255;
+		uint16_t rr = ((q1->r * am + q2->r * q2->a * 255)) / arm;
+		uint16_t gr = ((q1->g * am + q2->g * q2->a * 255)) / arm;
+		uint16_t br = ((q1->b * am + q2->b * q2->a * 255)) / arm;
 		return (ar << 24) | (rr << 16) | (gr << 8) | br;
 	}
 }
diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp
index c6ed9cfc34..05223da683 100644
--- a/plugins/FloatingContacts/src/bitmap_funcs.cpp
+++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp
@@ -768,9 +768,9 @@ void MyBitmap::DrawText(wchar_t *str, int x, int y, int blur, int strength)
 			mx = (uint8_t)(max(max(bx, rx), gx));
 
 			if (1) {
-				bx = (bx < mx) ? (uint8_t)(((WORD)bx * 7 + (WORD)mx) >> 3) : bx;
-				rx = (rx < mx) ? (uint8_t)(((WORD)rx * 7 + (WORD)mx) >> 3) : rx;
-				gx = (gx < mx) ? (uint8_t)(((WORD)gx * 7 + (WORD)mx) >> 3) : gx;
+				bx = (bx < mx) ? (uint8_t)(((uint16_t)bx * 7 + (uint16_t)mx) >> 3) : bx;
+				rx = (rx < mx) ? (uint8_t)(((uint16_t)rx * 7 + (uint16_t)mx) >> 3) : rx;
+				gx = (gx < mx) ? (uint8_t)(((uint16_t)gx * 7 + (uint16_t)mx) >> 3) : gx;
 				// reduce boldeness at white fonts
 			}
 			COLOR32 cl = row_dst[j];
diff --git a/plugins/FloatingContacts/src/fltcont.h b/plugins/FloatingContacts/src/fltcont.h
index 4d2724cf8b..0530c7d78f 100644
--- a/plugins/FloatingContacts/src/fltcont.h
+++ b/plugins/FloatingContacts/src/fltcont.h
@@ -75,9 +75,9 @@ enum
 //extern uint8_t			thumbAlpha;
 //extern BOOL			bShowTip;
 extern BOOL			bEnableTip;
-//extern WORD			TimeIn;
+//extern uint16_t			TimeIn;
 //extern BOOL			bToTop;
-//extern WORD			ToTopTime;
+//extern uint16_t			ToTopTime;
 //extern BOOL			bHideWhenCListShow;
 
 extern BOOL			bIsCListShow;
@@ -93,7 +93,7 @@ extern HPEN			hRBEdgesPen;
 extern HBRUSH		hBkBrush;
 extern DWORD		bkColor;
 extern HBITMAP		hBmpBackground;
-extern WORD			nBackgroundBmpUse;
+extern uint16_t			nBackgroundBmpUse;
 
 
 
@@ -107,9 +107,9 @@ typedef struct _FCOptions
 	BOOL	bFixedWidth;
 	int		nThumbWidth;
 	BOOL	bShowTip;
-	WORD	TimeIn;
+	uint16_t	TimeIn;
 	BOOL	bToTop;
-	WORD	ToTopTime;
+	uint16_t	ToTopTime;
 	BOOL	bHideWhenCListShow;
 	BOOL	bUseSingleClick;
 	BOOL	bShowIdle;
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index 57894b3426..cf6a506dce 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -49,7 +49,7 @@ HPEN       hRBEdgesPen;
 HBRUSH     hBkBrush;
 DWORD      bkColor;
 HBITMAP    hBmpBackground;
-WORD       nBackgroundBmpUse = CLB_STRETCH;
+uint16_t       nBackgroundBmpUse = CLB_STRETCH;
 
 HWND       hwndMiranda;
 BOOL       bVersionOK;
@@ -564,7 +564,7 @@ static void CreateBackgroundBrush()
 		if (tszBitmapName != NULL)
 			hBmpBackground = Bitmap_Load(tszBitmapName);
 	}
-	nBackgroundBmpUse = (WORD)g_plugin.getWord("BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT);
+	nBackgroundBmpUse = (uint16_t)g_plugin.getWord("BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT);
 
 	// Create brush
 	hBkBrush = CreateSolidBrush(bkColor);
@@ -827,7 +827,7 @@ static LRESULT __stdcall newMirandaWndProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 		else if (!(wp->flags & SWP_NOMOVE)) {
 			uint8_t method = db_get_b(0, "ModernData", "HideBehind", 0);
 			if (method) {
-				WORD wBehindEdgeBorderSize = db_get_w(0, "ModernData", "HideBehindBorderSize", 0);
+				uint16_t wBehindEdgeBorderSize = db_get_w(0, "ModernData", "HideBehindBorderSize", 0);
 				RECT rc = { wp->x, wp->y, wp->x + wp->cx, wp->y + wp->cy };
 				RECT rcScr = { wBehindEdgeBorderSize*(2 - method), 0, GetSystemMetrics(SM_CXSCREEN) - wBehindEdgeBorderSize * (method - 1), GetSystemMetrics(SM_CYSCREEN) };
 				RECT rcOverlap;
diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp
index 5e9406527f..aae6c0c2e3 100644
--- a/plugins/FloatingContacts/src/options.cpp
+++ b/plugins/FloatingContacts/src/options.cpp
@@ -183,7 +183,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
 			if (wszBitmap)
 				SetDlgItemText(hwndDlg, IDC_FILENAME, wszBitmap);
 
-			WORD bmpUse = (WORD)g_plugin.getWord("BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT);
+			uint16_t bmpUse = (uint16_t)g_plugin.getWord("BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT);
 			CheckDlgButton(hwndDlg, IDC_STRETCHH, ((bmpUse & CLB_STRETCHH) ? BST_CHECKED : BST_UNCHECKED));
 			CheckDlgButton(hwndDlg, IDC_STRETCHV, ((bmpUse & CLB_STRETCHV) ? BST_CHECKED : BST_UNCHECKED));
 			CheckDlgButton(hwndDlg, IDC_TILEH, ((bmpUse & CLBF_TILEH) ? BST_CHECKED : BST_UNCHECKED));
@@ -303,7 +303,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
 				GetDlgItemText(hwndDlg, IDC_FILENAME, str, _countof(str));
 				g_plugin.setWString("BkBitmap", str);
 
-				WORD flags = 0;
+				uint16_t flags = 0;
 				if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHH))
 					flags |= CLB_STRETCHH;
 				if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHV))
diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp
index 91a34c1212..4f529ce056 100644
--- a/plugins/FloatingContacts/src/thumbs.cpp
+++ b/plugins/FloatingContacts/src/thumbs.cpp
@@ -400,7 +400,7 @@ void ThumbInfo::OnMouseMove(int nX, int nY)
 	}
 
 	if (bEnableTip && fcOpt.bShowTip && !bMouseDown) {
-		WORD tmpTimeIn;
+		uint16_t tmpTimeIn;
 		POINT pt;
 		RECT rc;
 
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp
index f554f3f37b..be8df43712 100644
--- a/plugins/HTTPServer/src/GuiElements.cpp
+++ b/plugins/HTTPServer/src/GuiElements.cpp
@@ -927,16 +927,16 @@ static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wPara
 		HWND hShareList = GetDlgItem(hwndDlg, IDC_CURRENT_SHARES);
 		HWND hUserList = GetDlgItem(hwndDlg, IDC_CURRENT_USERS);
 
-		g_plugin.setWord("StatWnd_cx1", (WORD)ListView_GetColumnWidth(hShareList, 0));
-		g_plugin.setWord("StatWnd_cx2", (WORD)ListView_GetColumnWidth(hShareList, 1));
-		g_plugin.setWord("StatWnd_cx3", (WORD)ListView_GetColumnWidth(hShareList, 2));
-		g_plugin.setWord("StatWnd_cx4", (WORD)ListView_GetColumnWidth(hShareList, 3));
-		g_plugin.setWord("StatWnd_cx5", (WORD)ListView_GetColumnWidth(hShareList, 4));
-		g_plugin.setWord("StatWnd_cx6", (WORD)ListView_GetColumnWidth(hUserList, 0));
-		g_plugin.setWord("StatWnd_cx7", (WORD)ListView_GetColumnWidth(hUserList, 1));
-		g_plugin.setWord("StatWnd_cx8", (WORD)ListView_GetColumnWidth(hUserList, 2));
-		g_plugin.setWord("StatWnd_cx9", (WORD)ListView_GetColumnWidth(hUserList, 3));
-		g_plugin.setWord("StatWnd_cx10", (WORD)ListView_GetColumnWidth(hUserList, 4));
+		g_plugin.setWord("StatWnd_cx1", (uint16_t)ListView_GetColumnWidth(hShareList, 0));
+		g_plugin.setWord("StatWnd_cx2", (uint16_t)ListView_GetColumnWidth(hShareList, 1));
+		g_plugin.setWord("StatWnd_cx3", (uint16_t)ListView_GetColumnWidth(hShareList, 2));
+		g_plugin.setWord("StatWnd_cx4", (uint16_t)ListView_GetColumnWidth(hShareList, 3));
+		g_plugin.setWord("StatWnd_cx5", (uint16_t)ListView_GetColumnWidth(hShareList, 4));
+		g_plugin.setWord("StatWnd_cx6", (uint16_t)ListView_GetColumnWidth(hUserList, 0));
+		g_plugin.setWord("StatWnd_cx7", (uint16_t)ListView_GetColumnWidth(hUserList, 1));
+		g_plugin.setWord("StatWnd_cx8", (uint16_t)ListView_GetColumnWidth(hUserList, 2));
+		g_plugin.setWord("StatWnd_cx9", (uint16_t)ListView_GetColumnWidth(hUserList, 3));
+		g_plugin.setWord("StatWnd_cx10", (uint16_t)ListView_GetColumnWidth(hUserList, 4));
 
 		bool b = IsDlgButtonChecked(hwndDlg, IDC_SHOWHIDDENSHARES) == BST_CHECKED;
 		g_plugin.setByte("StatWnd_ShowHidden", b);
diff --git a/plugins/HTTPServer/src/IndexHTML.cpp b/plugins/HTTPServer/src/IndexHTML.cpp
index b46ce7bb6b..7b85a20d4e 100644
--- a/plugins/HTTPServer/src/IndexHTML.cpp
+++ b/plugins/HTTPServer/src/IndexHTML.cpp
@@ -127,7 +127,7 @@ bool LoadIndexHTMLTemplate()
 				case SY_IS_ODD:
 				case SY_IS_FILE_TYPE:
 					{
-						*((WORD*)(pszDestBuf)) = 0x7070;
+						*((uint16_t*)(pszDestBuf)) = 0x7070;
 						pszDestBuf += 2;
 					}
 				}
@@ -227,7 +227,7 @@ bool LoadIndexHTMLTemplate()
 				}
 
 				// write jump address
-				*((WORD*)(pszBuf)) = (WORD)((pszLevelEnd - pszBuf - 1) | 0x8000);
+				*((uint16_t*)(pszBuf)) = (uint16_t)((pszLevelEnd - pszBuf - 1) | 0x8000);
 				pszBuf += 2;
 			}
 		}
@@ -281,7 +281,7 @@ void FreeIndexHTMLTemplate()
 bool bCreateIndexHTML(const char * pszRealPath, const char * pszIndexPath,
 	const char * pszSrvPath, DWORD /* dwRemoteIP */)
 {
-	#define RelativeJump(begin) { pszPos += *((WORD*)(begin+1)) & 0x7FFF; }
+	#define RelativeJump(begin) { pszPos += *((uint16_t*)(begin+1)) & 0x7FFF; }
 
 	if (szIndexHTMLTemplate == nullptr)
 		return false;
diff --git a/plugins/HistoryStats/src/contact.cpp b/plugins/HistoryStats/src/contact.cpp
index 433ec64da9..35d4f4dfd6 100644
--- a/plugins/HistoryStats/src/contact.cpp
+++ b/plugins/HistoryStats/src/contact.cpp
@@ -83,7 +83,7 @@ void Contact::addChat(bool bOutgoing, DWORD, DWORD duration)
 	updateChatDur(duration);
 }
 
-void Contact::addEvent(WORD eventType, bool bOutgoing)
+void Contact::addEvent(uint16_t eventType, bool bOutgoing)
 {
 	InOut* pIO = nullptr;
 
diff --git a/plugins/HistoryStats/src/contact.h b/plugins/HistoryStats/src/contact.h
index 719a2b4a21..592b739969 100644
--- a/plugins/HistoryStats/src/contact.h
+++ b/plugins/HistoryStats/src/contact.h
@@ -106,7 +106,7 @@ public:
 	void endMessages() { }
 	void addMessage(Message& msg);
 	void addChat(bool bOutgoing, DWORD localTimestampStarted, DWORD duration);
-	void addEvent(WORD eventType, bool bOutgoing);
+	void addEvent(uint16_t eventType, bool bOutgoing);
 	void merge(const Contact& other);
 
 	// slot stuff
diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp
index 954b277688..0b3ca5fdde 100644
--- a/plugins/HistoryStats/src/dlgfilterwords.cpp
+++ b/plugins/HistoryStats/src/dlgfilterwords.cpp
@@ -77,7 +77,7 @@ void DlgFilterWords::onWMInitDialog()
 
 	static const struct
 	{
-		WORD iconId;
+		uint16_t iconId;
 		wchar_t* szTooltip;
 		bool bDisabled;
 	} columnBand[] = {
diff --git a/plugins/HistoryStats/src/dlgoption.cpp b/plugins/HistoryStats/src/dlgoption.cpp
index 1c9de1fae4..2d16102d54 100644
--- a/plugins/HistoryStats/src/dlgoption.cpp
+++ b/plugins/HistoryStats/src/dlgoption.cpp
@@ -89,11 +89,11 @@ void DlgOption::onWMInitDialog()
 
 		static const struct
 		{
-			WORD iconId;
+			uint16_t iconId;
 			wchar_t* szText;
 			wchar_t* szTooltip;
 			bool bRight;
-			WORD dlgId;
+			uint16_t dlgId;
 			bool bVisible;
 			bool bDropDown;
 		}
diff --git a/plugins/HistoryStats/src/dlgoption.h b/plugins/HistoryStats/src/dlgoption.h
index 2621b48ea0..b41830e064 100644
--- a/plugins/HistoryStats/src/dlgoption.h
+++ b/plugins/HistoryStats/src/dlgoption.h
@@ -63,7 +63,7 @@ private:
 		DlgOption* getParent() { return m_pParent; }
 
 	public:
-		void createWindow(DlgOption* pParent, WORD nDlgResource, const RECT& rect);
+		void createWindow(DlgOption* pParent, uint16_t nDlgResource, const RECT& rect);
 		void destroyWindow();
 		void moveWindow(const RECT& rWnd);
 		void show() { ShowWindow(m_hWnd, SW_SHOW); }
diff --git a/plugins/HistoryStats/src/dlgoption_subbase.cpp b/plugins/HistoryStats/src/dlgoption_subbase.cpp
index 813f01a8c6..624e7a6763 100644
--- a/plugins/HistoryStats/src/dlgoption_subbase.cpp
+++ b/plugins/HistoryStats/src/dlgoption_subbase.cpp
@@ -39,7 +39,7 @@ DlgOption::SubBase::~SubBase()
 {
 }
 
-void DlgOption::SubBase::createWindow(DlgOption* pParent, WORD nDlgResource, const RECT& rect)
+void DlgOption::SubBase::createWindow(DlgOption* pParent, uint16_t nDlgResource, const RECT& rect)
 {
 	m_pParent = pParent;
 
diff --git a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp
index 6d6a28f9db..0e0e1cfe1c 100644
--- a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp
+++ b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp
@@ -162,7 +162,7 @@ void DlgOption::SubColumns::onWMInitDialog()
 
 	static const struct
 	{
-		WORD iconId;
+		uint16_t iconId;
 		wchar_t* szTooltip;
 		bool bRight;
 		bool bDropDown;
diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp
index 0b3d16c9e3..ec47eccc58 100644
--- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp
+++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp
@@ -25,7 +25,7 @@ INT_PTR CALLBACK DlgOption::SubGlobal::staticInfoProc(HWND hDlg, UINT msg, WPARA
 			SetDlgItemText(hDlg, IDC_FEATURES, TranslateW(info.szTeaser));
 			SetDlgItemText(hDlg, IDC_DESCRIPTION, TranslateW(info.szDescription));
 
-			static const WORD LinkIDs[] = { IDC_LINK2, IDC_LINK1 };
+			static const uint16_t LinkIDs[] = { IDC_LINK2, IDC_LINK1 };
 
 			ext::string linkTexts = TranslateW(info.szLinkTexts);
 			ext::string linkURLs = info.szLinkURLs;
diff --git a/plugins/HistoryStats/src/iconlib.h b/plugins/HistoryStats/src/iconlib.h
index 5ac891850c..31154df525 100644
--- a/plugins/HistoryStats/src/iconlib.h
+++ b/plugins/HistoryStats/src/iconlib.h
@@ -42,7 +42,7 @@ public:
 private:
 	struct IconInfo
 	{
-		WORD wID;
+		uint16_t wID;
 		char* szIconName;
 		wchar_t* szSection;
 		wchar_t* szDescription;
diff --git a/plugins/HistorySweeperLight/src/historysweeperlight.cpp b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
index 028e92a757..71017f9817 100644
--- a/plugins/HistorySweeperLight/src/historysweeperlight.cpp
+++ b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
@@ -98,15 +98,15 @@ static void GetBookmarks(MCONTACT hContact, BEventData** books, size_t* bookcnt)
 
 	DBVARIANT dbv;
 	if (db_get(hContact, "HistoryPlusPlus", "Bookmarks", &dbv) == 0) {
-		if (dbv.cpbVal > 2 && *(WORD*)dbv.pbVal >= sizeof(BEventData)) {
-			size_t recSize = *(WORD*)dbv.pbVal;
-			size_t numb = (dbv.cpbVal - sizeof(WORD)) / recSize;
+		if (dbv.cpbVal > 2 && *(uint16_t*)dbv.pbVal >= sizeof(BEventData)) {
+			size_t recSize = *(uint16_t*)dbv.pbVal;
+			size_t numb = (dbv.cpbVal - sizeof(uint16_t)) / recSize;
 
 			BEventData* tbooks = (BEventData*)mir_alloc(sizeof(BEventData)*numb);
 			size_t tbookcnt = 0;
 
 			size_t i;
-			uint8_t* evs = dbv.pbVal + sizeof(WORD);
+			uint8_t* evs = dbv.pbVal + sizeof(uint16_t);
 
 			for (i = 0; i < numb; ++i) {
 				tbooks[tbookcnt++] = *(BEventData*)evs;
diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp
index 307106cb2c..02478c5738 100644
--- a/plugins/IEView/src/IEView.cpp
+++ b/plugins/IEView/src/IEView.cpp
@@ -140,7 +140,7 @@ STDMETHODIMP IEViewSink::GetTypeInfoCount(UINT *) { return E_NOTIMPL; }
 STDMETHODIMP IEViewSink::GetTypeInfo(UINT, LCID, LPTYPEINFO*) { return S_OK; }
 STDMETHODIMP IEViewSink::GetIDsOfNames(REFIID, LPOLESTR*, UINT, LCID, DISPID*) { return S_OK; }
 
-STDMETHODIMP IEViewSink::Invoke(DISPID dispIdMember, REFIID, LCID, WORD, DISPPARAMS* pDispParams, VARIANT*, EXCEPINFO*, UINT*)
+STDMETHODIMP IEViewSink::Invoke(DISPID dispIdMember, REFIID, LCID, uint16_t, DISPPARAMS* pDispParams, VARIANT*, EXCEPINFO*, UINT*)
 {
 	if (!pDispParams) return E_INVALIDARG;
 	switch (dispIdMember) {
@@ -432,7 +432,7 @@ STDMETHODIMP IEView::GetIDsOfNames(REFIID /*riid*/, LPOLESTR *rgszNames, UINT cN
 STDMETHODIMP IEView::Invoke(DISPID dispIdMember,
 	REFIID /*riid*/,
 	LCID /*lcid*/,
-	WORD /*wFlags*/,
+	uint16_t /*wFlags*/,
 	DISPPARAMS *pDispParams,
 	VARIANT *pVarResult,
 	EXCEPINFO * /*pExcepInfo*/,
diff --git a/plugins/IEView/src/IEView.h b/plugins/IEView/src/IEView.h
index 4211b2d4de..d3e4677ed2 100644
--- a/plugins/IEView/src/IEView.h
+++ b/plugins/IEView/src/IEView.h
@@ -389,7 +389,7 @@ public:
 	STDMETHOD(GetTypeInfoCount)(UINT*);
 	STDMETHOD(GetTypeInfo)(UINT, LCID, LPTYPEINFO*);
 	STDMETHOD(GetIDsOfNames)(REFIID, LPOLESTR*, UINT, LCID, DISPID*);
-	STDMETHOD(Invoke)(DISPID, REFIID, LCID, WORD, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*);
+	STDMETHOD(Invoke)(DISPID, REFIID, LCID, uint16_t, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*);
 	// DWebBrowserEvents2
 	STDMETHODIMP_(void)StatusTextChange(BSTR);
 	STDMETHODIMP_(void)ProgressChange(long, long);
@@ -453,7 +453,7 @@ class IEView :public IDispatch, public IOleClientSite, public IOleInPlaceSite, p
 	STDMETHOD(GetTypeInfoCount)(UINT*);
 	STDMETHOD(GetTypeInfo)(UINT, LCID, LPTYPEINFO*);
 	STDMETHOD(GetIDsOfNames)(REFIID, LPOLESTR*, UINT, LCID, DISPID*);
-	STDMETHOD(Invoke)(DISPID, REFIID, LCID, WORD, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*);
+	STDMETHOD(Invoke)(DISPID, REFIID, LCID, uint16_t, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*);
 	// IOleWindow
 	STDMETHOD(GetWindow)(HWND *phwnd);
 	STDMETHOD(ContextSensitiveHelp)(BOOL fEnterMode);
diff --git a/plugins/Import/src/dbrw/dbevents.cpp b/plugins/Import/src/dbrw/dbevents.cpp
index fb7f3c66bd..59dccc99ce 100644
--- a/plugins/Import/src/dbrw/dbevents.cpp
+++ b/plugins/Import/src/dbrw/dbevents.cpp
@@ -82,7 +82,7 @@ STDMETHODIMP_(BOOL) CDbxSQLite::GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbei)
 
 		dbei->timestamp = (DWORD)sqlite3_column_int(stmt, 1);
 		dbei->flags = (DWORD)sqlite3_column_int(stmt, 2);
-		dbei->eventType = (WORD)sqlite3_column_int(stmt, 3);
+		dbei->eventType = (uint16_t)sqlite3_column_int(stmt, 3);
 		dbei->szModule = mir_strdup((char*)sqlite3_column_text(stmt, 7));
 
 		DWORD cbBlob = sqlite3_column_int(stmt, 5);
diff --git a/plugins/Import/src/dbrw/dbsettings.cpp b/plugins/Import/src/dbrw/dbsettings.cpp
index ba9703b127..1002a8ff60 100644
--- a/plugins/Import/src/dbrw/dbsettings.cpp
+++ b/plugins/Import/src/dbrw/dbsettings.cpp
@@ -100,7 +100,7 @@ STDMETHODIMP_(BOOL) CDbxSQLite::GetContactSettingWorker(MCONTACT contactID, LPCS
 		dbv->bVal = (uint8_t)sqlite3_column_int(set_stmts_prep[SQL_SET_STMT_READ], 1);
 		break;
 	case DBVT_WORD:
-		dbv->wVal = (WORD)sqlite3_column_int(set_stmts_prep[SQL_SET_STMT_READ], 1);
+		dbv->wVal = (uint16_t)sqlite3_column_int(set_stmts_prep[SQL_SET_STMT_READ], 1);
 		break;
 	case DBVT_DWORD:
 		dbv->dVal = (DWORD)sqlite3_column_int(set_stmts_prep[SQL_SET_STMT_READ], 1);
@@ -130,7 +130,7 @@ STDMETHODIMP_(BOOL) CDbxSQLite::GetContactSettingWorker(MCONTACT contactID, LPCS
 			if (!isStatic)
 				dbv->pbVal = (uint8_t*)mir_alloc(copylen);
 			memcpy(dbv->pbVal, sqlite3_column_blob(set_stmts_prep[SQL_SET_STMT_READ], 1), copylen);
-			dbv->cpbVal = (WORD)copylen;
+			dbv->cpbVal = (uint16_t)copylen;
 		}
 		else {
 			dbv = 0;
diff --git a/plugins/Import/src/patterns.cpp b/plugins/Import/src/patterns.cpp
index eda1d988c8..0d6a40938d 100644
--- a/plugins/Import/src/patterns.cpp
+++ b/plugins/Import/src/patterns.cpp
@@ -532,7 +532,7 @@ public:
 			T2Utf value(dbcwWork.value.pwszVal);
 			dbcwWork.value.pszVal = NEWSTR_ALLOCA(value);
 			dbcwWork.value.type = DBVT_UTF8;
-			dbcwWork.value.cchVal = (WORD)strlen(dbcwWork.value.pszVal);
+			dbcwWork.value.cchVal = (uint16_t)strlen(dbcwWork.value.pszVal);
 		}
 
 		char* cachedSettingName = m_cache->GetCachedSetting(dbcwWork.szModule, dbcwWork.szSetting, mir_strlen(dbcwWork.szModule), mir_strlen(dbcwWork.szSetting));
diff --git a/plugins/KeyboardNotify/src/flash.cpp b/plugins/KeyboardNotify/src/flash.cpp
index c56d3b6742..cbc51480ee 100644
--- a/plugins/KeyboardNotify/src/flash.cpp
+++ b/plugins/KeyboardNotify/src/flash.cpp
@@ -44,12 +44,12 @@ FLASHING_SEQUENCE *pFS;
 BOOL bTemporarilyUseExtern;
 extern uint8_t bFlashLed[3];
 extern uint8_t bFlashEffect; extern uint8_t bSequenceOrder;
-extern WORD wCustomTheme;
+extern uint16_t wCustomTheme;
 extern uint8_t bTrillianLedsMsg, bTrillianLedsFile, bTrillianLedsOther;
 extern uint8_t bEmulateKeypresses;
 
 // TestThread/PreviewThread globals
-extern int nWaitDelay; extern WORD wStartDelay;
+extern int nWaitDelay; extern uint16_t wStartDelay;
 BOOL bTestSemaphore, bPreviewSemaphore, bPreview;
 
 void RestoreLEDState(void)
diff --git a/plugins/KeyboardNotify/src/ignore.cpp b/plugins/KeyboardNotify/src/ignore.cpp
index b37b664763..847c8288b4 100644
--- a/plugins/KeyboardNotify/src/ignore.cpp
+++ b/plugins/KeyboardNotify/src/ignore.cpp
@@ -318,9 +318,9 @@ INT_PTR CALLBACK DlgProcIgnoreOptions(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPa
 	return FALSE;
 }
 
-BOOL IsIgnored(MCONTACT hContact, WORD eventType)
+BOOL IsIgnored(MCONTACT hContact, uint16_t eventType)
 {
-	WORD ignoreID = 0;
+	uint16_t ignoreID = 0;
 	DWORD mask = GetMask(hContact);
 
 	switch(eventType) {
diff --git a/plugins/KeyboardNotify/src/ignore.h b/plugins/KeyboardNotify/src/ignore.h
index 0748c5c2ba..349a72575a 100644
--- a/plugins/KeyboardNotify/src/ignore.h
+++ b/plugins/KeyboardNotify/src/ignore.h
@@ -18,5 +18,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #pragma once
 
-BOOL IsIgnored(MCONTACT, WORD);
+BOOL IsIgnored(MCONTACT, uint16_t);
 INT_PTR CALLBACK DlgProcIgnoreOptions(HWND, UINT, WPARAM, LPARAM);
diff --git a/plugins/KeyboardNotify/src/keypresses.cpp b/plugins/KeyboardNotify/src/keypresses.cpp
index 85e521925e..3d103f21a4 100644
--- a/plugins/KeyboardNotify/src/keypresses.cpp
+++ b/plugins/KeyboardNotify/src/keypresses.cpp
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"
 
 // Prototypes
-void SetLock(WORD, uint8_t, unsigned int *, INPUT *);
+void SetLock(uint16_t, uint8_t, unsigned int *, INPUT *);
 
 // Globals
 BOOL LEDstateSaved = FALSE;
@@ -51,7 +51,7 @@ BOOL keypresses_ToggleKeyboardLights(uint8_t byte)
 	return TRUE;
 }
 
-void SetLock(WORD keyCode, uint8_t value, unsigned int *n, INPUT *keystrokes)
+void SetLock(uint16_t keyCode, uint8_t value, unsigned int *n, INPUT *keystrokes)
 {
 	uint8_t status;
 
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp
index 88a31dbdde..ddac9e72a9 100644
--- a/plugins/KeyboardNotify/src/main.cpp
+++ b/plugins/KeyboardNotify/src/main.cpp
@@ -56,17 +56,17 @@ uint8_t bWorkstationActive;
 uint8_t bFlashIfMsgOpen;
 uint8_t bFlashIfMsgWinNotTop;
 uint8_t bFlashIfMsgOlder;
-WORD wSecondsOlder;
+uint16_t wSecondsOlder;
 uint8_t bFlashUntil;
-WORD wBlinksNumber;
+uint16_t wBlinksNumber;
 uint8_t bMirandaOrWindows;
-WORD wStatusMap;
-WORD wReminderCheck;
+uint16_t wStatusMap;
+uint16_t wReminderCheck;
 uint8_t bFlashLed[3];
 uint8_t bFlashEffect;
 uint8_t bSequenceOrder;
-WORD wCustomTheme;
-WORD wStartDelay;
+uint16_t wCustomTheme;
+uint16_t wStartDelay;
 uint8_t bFlashSpeed;
 uint8_t bOverride;
 uint8_t bTrillianLedsMsg;
@@ -208,7 +208,7 @@ DBEVENTINFO readEventInfo(MEVENT hDbEvent, MCONTACT hContact)
 	return einfo;
 }
 
-BOOL checkIgnore(MCONTACT hContact, WORD eventType)
+BOOL checkIgnore(MCONTACT hContact, uint16_t eventType)
 {
 	return !IsIgnored(hContact, eventType);
 }
@@ -225,7 +225,7 @@ BOOL checkProtocol(const char *szProto)
 	return FALSE;
 }
 
-BOOL metaCheckProtocol(const char *szProto, MCONTACT hContact, WORD eventType)
+BOOL metaCheckProtocol(const char *szProto, MCONTACT hContact, uint16_t eventType)
 {
 	MCONTACT hSubContact = NULL;
 
@@ -346,7 +346,7 @@ BOOL checkMsgTimestamp(MCONTACT hContact, MEVENT hEventCurrent, DWORD timestampC
 }
 
 
-BOOL contactCheckProtocol(const char *szProto, MCONTACT hContact, WORD eventType)
+BOOL contactCheckProtocol(const char *szProto, MCONTACT hContact, uint16_t eventType)
 {
 	if (bMetaProtoEnabled && hContact) {
 		MCONTACT hMetaContact = (MCONTACT)db_get_dw(hContact, META_PROTO, "Handle", 0);
@@ -509,7 +509,7 @@ static void __cdecl ForceEventsWereOpenedThread(void *eventMaxSeconds)
 	CallService(MS_KBDNOTIFY_EVENTSOPENED, 1, 0);
 }
 
-void StartBlinkAction(char *flashSequence, WORD eventMaxSeconds)
+void StartBlinkAction(char *flashSequence, uint16_t eventMaxSeconds)
 {
 	if (eventMaxSeconds)
 		mir_forkthread(ForceEventsWereOpenedThread, (void *)eventMaxSeconds);
diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp
index 91439d716a..a607fe349a 100644
--- a/plugins/KeyboardNotify/src/options.cpp
+++ b/plugins/KeyboardNotify/src/options.cpp
@@ -27,7 +27,7 @@ extern uint8_t
 	bWorkstationActive, bFlashIfMsgOpen, bFlashIfMsgOlder, bFlashUntil, bMirandaOrWindows, bFlashLed[3], bFlashEffect, bSequenceOrder, bFlashSpeed,
 	bEmulateKeypresses, bOverride, bFlashIfMsgWinNotTop, bTrillianLedsMsg, bTrillianLedsURL, bTrillianLedsFile, bTrillianLedsOther;
 
-extern WORD wSecondsOlder, wBlinksNumber, wStatusMap, wReminderCheck, wCustomTheme, wStartDelay;
+extern uint16_t wSecondsOlder, wBlinksNumber, wStatusMap, wReminderCheck, wCustomTheme, wStartDelay;
 
 extern PROTOCOL_LIST ProtoList;
 extern PROCESS_LIST ProcessList;
@@ -732,7 +732,7 @@ static INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wPara
 	case WM_NOTIFY:
 		{
 			uint8_t untilMap = 0;
-			WORD statusMap = 0;
+			uint16_t statusMap = 0;
 			//Here we have pressed either the OK or the APPLY button.
 			switch (((LPNMHDR)lParam)->idFrom) {
 			case 0:
@@ -752,7 +752,7 @@ static INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wPara
 					g_plugin.setByte("ifmsgopen", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_IFOPEN) == BST_CHECKED ? 1 : 0));
 					g_plugin.setByte("ifmsgnottop", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_IFNOTTOP) == BST_CHECKED ? 1 : 0));
 					g_plugin.setByte("ifmsgolder", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_IFOLDER) == BST_CHECKED ? 1 : 0));
-					g_plugin.setWord("secsolder", (WORD)SendDlgItemMessage(hwndDlg, IDC_OLDERSPIN, UDM_GETPOS, 0, 0));
+					g_plugin.setWord("secsolder", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_OLDERSPIN, UDM_GETPOS, 0, 0));
 
 					if (IsDlgButtonChecked(hwndDlg, IDC_UNTILBLK) == BST_CHECKED)
 						untilMap |= UNTIL_NBLINKS;
@@ -763,7 +763,7 @@ static INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wPara
 					if (IsDlgButtonChecked(hwndDlg, IDC_UNTILCOND) == BST_CHECKED)
 						untilMap |= UNTIL_CONDITIONS;
 					g_plugin.setByte("funtil", untilMap);
-					g_plugin.setWord("nblinks", (WORD)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
+					g_plugin.setWord("nblinks", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
 					g_plugin.setByte("mirorwin", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_MIRORWIN, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_MIRORWIN, CB_GETCURSEL, 0, 0), 0));
 
 					if (IsDlgButtonChecked(hwndDlg, IDC_ONLINE) == BST_CHECKED)
@@ -784,13 +784,13 @@ static INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wPara
 						statusMap |= MAP_OFFLINE;
 					g_plugin.setWord("status", statusMap);
 
-					g_plugin.setWord("remcheck", (WORD)SendDlgItemMessage(hwndDlg, IDC_REMCHECK, UDM_GETPOS, 0, 0));
+					g_plugin.setWord("remcheck", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_REMCHECK, UDM_GETPOS, 0, 0));
 
 					int i = 0;
 					for (int j = 0; j < ProcessListAux.count; j++)
 						if (ProcessListAux.szFileName[j])
 							g_plugin.setWString(fmtDBSettingName("process%d", i++), ProcessListAux.szFileName[j]);
-					g_plugin.setWord("processcount", (WORD)i);
+					g_plugin.setWord("processcount", (uint16_t)i);
 					while (!g_plugin.delSetting(fmtDBSettingName("process%d", i++)));
 
 					if (XstatusListAux)
@@ -939,14 +939,14 @@ static INT_PTR CALLBACK DlgProcEffectOptions(HWND hwndDlg, UINT msg, WPARAM wPar
 					else
 						g_plugin.setByte("feffect", FLASH_SAMETIME);
 					g_plugin.setByte("order", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_SEQORDER, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_SEQORDER, CB_GETCURSEL, 0, 0), 0));
-					g_plugin.setWord("custom", (WORD)SendDlgItemMessage(hwndDlg, IDC_SCUSTOM, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_SCUSTOM, CB_GETCURSEL, 0, 0), 0));
+					g_plugin.setWord("custom", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_SCUSTOM, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_SCUSTOM, CB_GETCURSEL, 0, 0), 0));
 
 					g_plugin.setByte("ledsmsg", trillianLedsMsg);
 					g_plugin.setByte("ledsfile", trillianLedsFile);
 					g_plugin.setByte("ledsurl", trillianLedsURL);
 					g_plugin.setByte("ledsother", trillianLedsOther);
 
-					g_plugin.setWord("sdelay", (WORD)SendDlgItemMessage(hwndDlg, IDC_DELAYSPIN, UDM_GETPOS, 0, 0));
+					g_plugin.setWord("sdelay", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_DELAYSPIN, UDM_GETPOS, 0, 0));
 
 					g_plugin.setByte("speed", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_SPEED, TBM_GETPOS, 0, 0));
 
diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp
index 3f6983e05d..36868a5bb9 100644
--- a/plugins/ListeningTo/src/options.cpp
+++ b/plugins/ListeningTo/src/options.cpp
@@ -56,7 +56,7 @@ static OptPageControl formatControls[] = {
 
 static OptPageControl playersControls[] = {
 	{ nullptr, CONTROL_CHECKBOX, IDC_WATRACK, "GetInfoFromWATrack", FALSE },
-	{ &opts.time_to_pool, CONTROL_SPIN, IDC_POLL_TIMER, "TimeToPool", (WORD)5, IDC_POLL_TIMER_SPIN, (WORD)1, (WORD)255 },
+	{ &opts.time_to_pool, CONTROL_SPIN, IDC_POLL_TIMER, "TimeToPool", (uint16_t)5, IDC_POLL_TIMER_SPIN, (uint16_t)1, (uint16_t)255 },
 	{ nullptr, CONTROL_CHECKBOX, IDC_WINAMP, "EnableWinamp", TRUE },
 	{ nullptr, CONTROL_CHECKBOX, IDC_ITUNES, "EnableITunes", TRUE },
 	{ nullptr, CONTROL_CHECKBOX, IDC_WMP, "EnableWMP", TRUE },
diff --git a/plugins/ListeningTo/src/options.h b/plugins/ListeningTo/src/options.h
index 27c00fde77..f747deeaf3 100644
--- a/plugins/ListeningTo/src/options.h
+++ b/plugins/ListeningTo/src/options.h
@@ -60,7 +60,7 @@ struct Options {
 	bool enable_code_injection;
 	int time_to_pool;
 
-	WORD xstatus_set;
+	uint16_t xstatus_set;
 	wchar_t xstatus_name[1024];
 	wchar_t xstatus_message[1024];
 	wchar_t nothing[128];
diff --git a/plugins/ListeningTo/src/players/mradio.cpp b/plugins/ListeningTo/src/players/mradio.cpp
index 5b837e4aa9..f971191156 100644
--- a/plugins/ListeningTo/src/players/mradio.cpp
+++ b/plugins/ListeningTo/src/players/mradio.cpp
@@ -35,7 +35,7 @@ void MRadio::EnableDisable()
 int MRadio::GetData()
 {
 	for (auto &hContact : Contacts("mRadio")) {
-		WORD status = db_get_w(hContact, "mRadio", "Status", ID_STATUS_OFFLINE);
+		uint16_t status = db_get_w(hContact, "mRadio", "Status", ID_STATUS_OFFLINE);
 		if (status != ID_STATUS_ONLINE)
 			continue;
 
diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp
index ea3ba9e8ec..a7078cde8c 100644
--- a/plugins/MirFox/src/MirandaOptions.cpp
+++ b/plugins/MirFox/src/MirandaOptions.cpp
@@ -101,13 +101,13 @@ INT_PTR CALLBACK DlgProcOpts_Tab1(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 		if (((LPNMHDR)lParam)->idFrom == 0 && ((LPNMHDR)lParam)->code == PSN_APPLY){
 			//SaveOptions from tab1 mirfoxData to miranda database
-			mirfoxMiranda.getMirfoxData().leftClickSendMode = (MFENUM_SEND_MESSAGE_MODE)( 1 + (WORD)SendDlgItemMessage(hwndDlg, IDC1_COMBO1, CB_GETCURSEL, 0, 0));
+			mirfoxMiranda.getMirfoxData().leftClickSendMode = (MFENUM_SEND_MESSAGE_MODE)( 1 + (uint16_t)SendDlgItemMessage(hwndDlg, IDC1_COMBO1, CB_GETCURSEL, 0, 0));
 			g_plugin.setByte("leftClickSendMode", (int)mirfoxMiranda.getMirfoxData().leftClickSendMode);
 
-			mirfoxMiranda.getMirfoxData().rightClickSendMode = (MFENUM_SEND_MESSAGE_MODE)( 1 + (WORD)SendDlgItemMessage(hwndDlg, IDC1_COMBO2, CB_GETCURSEL, 0, 0));
+			mirfoxMiranda.getMirfoxData().rightClickSendMode = (MFENUM_SEND_MESSAGE_MODE)( 1 + (uint16_t)SendDlgItemMessage(hwndDlg, IDC1_COMBO2, CB_GETCURSEL, 0, 0));
 			g_plugin.setByte("rightClickSendMode", (int)mirfoxMiranda.getMirfoxData().rightClickSendMode);
 
-			mirfoxMiranda.getMirfoxData().middleClickSendMode = (MFENUM_SEND_MESSAGE_MODE)( 1 + (WORD)SendDlgItemMessage(hwndDlg, IDC1_COMBO3, CB_GETCURSEL, 0, 0));
+			mirfoxMiranda.getMirfoxData().middleClickSendMode = (MFENUM_SEND_MESSAGE_MODE)( 1 + (uint16_t)SendDlgItemMessage(hwndDlg, IDC1_COMBO3, CB_GETCURSEL, 0, 0));
 			g_plugin.setByte("middleClickSendMode", (int)mirfoxMiranda.getMirfoxData().middleClickSendMode);
 
 			if (IsDlgButtonChecked(hwndDlg, IDC1_CHECK1) == BST_CHECKED){
diff --git a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
index 9078149efe..cd7a031286 100755
--- a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
+++ b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
@@ -15,7 +15,7 @@ static HWND luaM_checkhwnd(lua_State *L, int idx)
 
 /***********************************************/
 
-EXTERN_C WINUSERAPI int WINAPI MessageBoxTimeoutA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType, WORD wLanguageId, DWORD dwMilliseconds);
+EXTERN_C WINUSERAPI int WINAPI MessageBoxTimeoutA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType, uint16_t wLanguageId, DWORD dwMilliseconds);
 
 #define MB_TIMEDOUT 32000
 
@@ -815,7 +815,7 @@ static int global_CreateProcess(lua_State *L)
 				si.dwFlags = (DWORD)luaL_checknumber(L, -1);
 			}
 			else if (!mir_strcmp(key, "wShowWindow")) {
-				si.wShowWindow = (WORD)luaL_checknumber(L, -1);
+				si.wShowWindow = (uint16_t)luaL_checknumber(L, -1);
 			}
 			else if (!mir_strcmp(key, "hStdInput")) {
 				long h = (long)luaL_checknumber(L, -1);
diff --git a/plugins/MirLua/src/Modules/m_database.cpp b/plugins/MirLua/src/Modules/m_database.cpp
index 9708a3caea..d758475f86 100644
--- a/plugins/MirLua/src/Modules/m_database.cpp
+++ b/plugins/MirLua/src/Modules/m_database.cpp
@@ -538,7 +538,7 @@ static int db_WriteSetting(lua_State *L)
 		break;
 	case DBVT_BLOB:
 	{
-		dbv.cpbVal = (WORD)lua_rawlen(L, 4);
+		dbv.cpbVal = (uint16_t)lua_rawlen(L, 4);
 		dbv.pbVal = (uint8_t*)mir_calloc(dbv.cpbVal);
 		for (int i = 0; i < dbv.cpbVal; i++) {
 			lua_geti(L, 4, i + 1);
diff --git a/plugins/MirLua/src/Modules/m_hotkeys.cpp b/plugins/MirLua/src/Modules/m_hotkeys.cpp
index a6c35fdefb..0de4ffd94a 100644
--- a/plugins/MirLua/src/Modules/m_hotkeys.cpp
+++ b/plugins/MirLua/src/Modules/m_hotkeys.cpp
@@ -78,7 +78,7 @@ static int hotkeys_MakeHotkey(lua_State *L)
 	}
 	int vk = luaL_checknumber(L, 2);
 
-	WORD res = HOTKEYCODE(mod, vk);
+	uint16_t res = HOTKEYCODE(mod, vk);
 	lua_pushinteger(L, res);
 
 	return 1;
diff --git a/plugins/MirOTR/src/otr.cpp b/plugins/MirOTR/src/otr.cpp
index 1c14043963..eed207e7ae 100644
--- a/plugins/MirOTR/src/otr.cpp
+++ b/plugins/MirOTR/src/otr.cpp
@@ -122,7 +122,7 @@ extern "C" {
 		DEBUGOUTA("OTR_GUI_IS_LOGGED_IN\n");
 		MCONTACT hContact = (UINT_PTR)opdata;
 		if (hContact) {
-			WORD status = db_get_w(hContact, Proto_GetBaseAccountName(hContact), "Status", ID_STATUS_OFFLINE);
+			uint16_t status = db_get_w(hContact, Proto_GetBaseAccountName(hContact), "Status", ID_STATUS_OFFLINE);
 			if (status == ID_STATUS_OFFLINE) return 0;
 			else return 1;
 		}
diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp
index c2dfdc04b6..1bf3a53667 100644
--- a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp
+++ b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp
@@ -380,7 +380,7 @@ LRESULT CLCDInput::ProcessKeyEvent(int Code, WPARAM wParam, LPARAM lParam)
 							#ifdef _UNICODE
 								res = ToUnicode(key->vkCode, key->scanCode, m_acKeyboardState, output, 4, 0);
 							#else
-								res = ToAscii(key->vkCode, key->scanCode, m_acKeyboardState, (WORD*)output, 0);
+								res = ToAscii(key->vkCode, key->scanCode, m_acKeyboardState, (uint16_t*)output, 0);
 							#endif
 							}
 
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index b4707a0920..32b9607dfc 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -285,7 +285,7 @@ public:
 			return false;
 		}
 		else nMaxLineWidth = nTmp;
-		g_plugin.setWord("MaxLineWidth", (WORD)nMaxLineWidth);
+		g_plugin.setWord("MaxLineWidth", (uint16_t)nMaxLineWidth);
 
 		cmbTimeFormat.GetText(szTemp, _countof(szTemp));
 		g_sTimeFormat = szTemp;
diff --git a/plugins/MyDetails/src/options.cpp b/plugins/MyDetails/src/options.cpp
index ef10efc834..308dcc8053 100644
--- a/plugins/MyDetails/src/options.cpp
+++ b/plugins/MyDetails/src/options.cpp
@@ -28,7 +28,7 @@ Options opts;
 
 static OptPageControl pageControls[] = {
 	{ &opts.cycle_through_protocols, CONTROL_CHECKBOX, IDC_CYCLE_THROUGH_PROTOS, "CicleThroughtProtocols", (uint8_t)1 },
-	{ &opts.seconds_to_show_protocol, CONTROL_SPIN, IDC_CYCLE_TIME, "CicleTime", (WORD)5, IDC_CYCLE_TIME_SPIN, (WORD)1, (WORD)255 },
+	{ &opts.seconds_to_show_protocol, CONTROL_SPIN, IDC_CYCLE_TIME, "CicleTime", (uint16_t)5, IDC_CYCLE_TIME_SPIN, (uint16_t)1, (uint16_t)255 },
 	{ &opts.draw_show_protocol_name, CONTROL_CHECKBOX, IDC_SHOW_PROTO_NAME, "ShowProtocolName", (uint8_t)1 },
 	{ &opts.show_protocol_cycle_button, CONTROL_CHECKBOX, IDC_SHOW_CYCLE_PROTO_BUTTON, "ShowProtocolCycleButton", (uint8_t)0 },
 	{ &opts.draw_text_rtl, CONTROL_CHECKBOX, IDC_TEXT_RTL, "TextRTL", (uint8_t)0 },
@@ -42,18 +42,18 @@ static OptPageControl pageControls[] = {
 	{ &opts.global_on_status_message, CONTROL_CHECKBOX, IDC_GLOBAL_ON_STATUS_MESSAGE, "GlobalOnStatusMessage", (uint8_t)0 },
 	{ &opts.draw_avatar_allow_to_grow, CONTROL_CHECKBOX, IDC_AVATAR_ALLOW_TO_GROW, "AvatarAllowToGrow", (uint8_t)0 },
 	{ &opts.draw_avatar_custom_size, CONTROL_CHECKBOX, IDC_AVATAR_CUSTOM_SIZE_CHK, "AvatarCustomSize", (uint8_t)0 },
-	{ &opts.draw_avatar_custom_size_pixels, CONTROL_SPIN, IDC_AVATAR_CUSTOM_SIZE, "AvatarCustomSizePixels", (WORD)30, IDC_AVATAR_CUSTOM_SIZE_SPIN, (WORD)1, (WORD)255 },
+	{ &opts.draw_avatar_custom_size_pixels, CONTROL_SPIN, IDC_AVATAR_CUSTOM_SIZE, "AvatarCustomSizePixels", (uint16_t)30, IDC_AVATAR_CUSTOM_SIZE_SPIN, (uint16_t)1, (uint16_t)255 },
 	{ &opts.draw_avatar_border, CONTROL_CHECKBOX, IDC_AVATAR_DRAW_BORDER, "AvatarDrawBorders", (uint8_t)0 },
 	{ &opts.draw_avatar_round_corner, CONTROL_CHECKBOX, IDC_AVATAR_ROUND_CORNERS, "AvatarRoundCorners", (uint8_t)1 },
 	{ &opts.draw_avatar_use_custom_corner_size, CONTROL_CHECKBOX, IDC_AVATAR_CUSTOM_CORNER_SIZE_CHECK, "AvatarUseCustomCornerSize", (uint8_t)0 },
-	{ &opts.draw_avatar_custom_corner_size, CONTROL_SPIN, IDC_AVATAR_CUSTOM_CORNER_SIZE, "AvatarCustomCornerSize", (WORD)4, IDC_AVATAR_CUSTOM_CORNER_SIZE_SPIN, (WORD)1, (WORD)255 },
+	{ &opts.draw_avatar_custom_corner_size, CONTROL_SPIN, IDC_AVATAR_CUSTOM_CORNER_SIZE, "AvatarCustomCornerSize", (uint16_t)4, IDC_AVATAR_CUSTOM_CORNER_SIZE_SPIN, (uint16_t)1, (uint16_t)255 },
 	{ &opts.use_avatar_space_to_draw_text, CONTROL_CHECKBOX, IDC_AVATAR_USE_FREE_SPACE, "AvatarUseFreeSpaceToDrawText", (uint8_t)1 },
 	{ &opts.resize_frame, CONTROL_CHECKBOX, IDC_RESIZE_FRAME, "ResizeFrame", (uint8_t)0 },
 	{ &opts.use_skinning, CONTROL_CHECKBOX, IDC_USE_SKINNING, "UseSkinning", (uint8_t)0 },
-	{ &opts.borders[RIGHT], CONTROL_SPIN, IDC_BORDER_RIGHT, "BorderRight", (WORD)8, IDC_BORDER_RIGHT_SPIN, (WORD)0, (WORD)255 },
-	{ &opts.borders[LEFT], CONTROL_SPIN, IDC_BORDER_LEFT, "BorderLeft", (WORD)8, IDC_BORDER_LEFT_SPIN, (WORD)0, (WORD)255 },
-	{ &opts.borders[TOP], CONTROL_SPIN, IDC_BORDER_TOP, "BorderTop", (WORD)8, IDC_BORDER_TOP_SPIN, (WORD)0, (WORD)255 },
-	{ &opts.borders[BOTTOM], CONTROL_SPIN, IDC_BORDER_BOTTOM, "BorderBottom", (WORD)8, IDC_BORDER_BOTTOM_SPIN, (WORD)0, (WORD)255 },
+	{ &opts.borders[RIGHT], CONTROL_SPIN, IDC_BORDER_RIGHT, "BorderRight", (uint16_t)8, IDC_BORDER_RIGHT_SPIN, (uint16_t)0, (uint16_t)255 },
+	{ &opts.borders[LEFT], CONTROL_SPIN, IDC_BORDER_LEFT, "BorderLeft", (uint16_t)8, IDC_BORDER_LEFT_SPIN, (uint16_t)0, (uint16_t)255 },
+	{ &opts.borders[TOP], CONTROL_SPIN, IDC_BORDER_TOP, "BorderTop", (uint16_t)8, IDC_BORDER_TOP_SPIN, (uint16_t)0, (uint16_t)255 },
+	{ &opts.borders[BOTTOM], CONTROL_SPIN, IDC_BORDER_BOTTOM, "BorderBottom", (uint16_t)8, IDC_BORDER_BOTTOM_SPIN, (uint16_t)0, (uint16_t)255 },
 };
 
 
diff --git a/plugins/NewAwaySysMod/src/MsgEventAdded.cpp b/plugins/NewAwaySysMod/src/MsgEventAdded.cpp
index fcb7197e0c..4338e1f4b6 100644
--- a/plugins/NewAwaySysMod/src/MsgEventAdded.cpp
+++ b/plugins/NewAwaySysMod/src/MsgEventAdded.cpp
@@ -188,7 +188,7 @@ int MsgEventAdded(WPARAM hContact, LPARAM lParam)
 		return 0;
 
 	if (AutoreplyOptData.GetValue(IDC_REPLYDLG_DONTREPLYINVISIBLE)) {
-		WORD ApparentMode = db_get_w(hContact, szProto, "ApparentMode", 0);
+		uint16_t ApparentMode = db_get_w(hContact, szProto, "ApparentMode", 0);
 		if ((iMode == ID_STATUS_INVISIBLE && (!(Flags1 & PF1_INVISLIST) || ApparentMode != ID_STATUS_ONLINE)) || (Flags1 & PF1_VISLIST && ApparentMode == ID_STATUS_OFFLINE))
 			return 0;
 	}
diff --git a/plugins/NewAwaySysMod/src/Services.cpp b/plugins/NewAwaySysMod/src/Services.cpp
index 32411224e4..b540d5f792 100644
--- a/plugins/NewAwaySysMod/src/Services.cpp
+++ b/plugins/NewAwaySysMod/src/Services.cpp
@@ -31,10 +31,10 @@ struct NAS_PROTOINFOv1
 		wchar_t *wszMsg;
 		wchar_t *tszMsg;
 	};
-	WORD status;
+	uint16_t status;
 };
 
-__inline void PSSetStatus(char *szProto, WORD Status, int bNoClistSetStatusMode = false) // just a helper function that sets the status and handles szProto==NULL correctly
+__inline void PSSetStatus(char *szProto, uint16_t Status, int bNoClistSetStatusMode = false) // just a helper function that sets the status and handles szProto==NULL correctly
 {
 	g_ProtoStates[szProto].m_status = Status;
 	if (szProto)
diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h
index 949de5f317..c7cab6df0d 100644
--- a/plugins/NewAwaySysMod/src/stdafx.h
+++ b/plugins/NewAwaySysMod/src/stdafx.h
@@ -254,7 +254,7 @@ struct NAS_ISWINFOv1
 	char *szProto;
 	MCONTACT hContact;
 	char *szMsg;
-	WORD status;
+	uint16_t status;
 };
 
 #define MTYPE_AUTOONLINE 0xE7 // required to support ICQ Plus online status messages
diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp
index 78001166de..96357f5366 100644
--- a/plugins/NewStory/src/history.cpp
+++ b/plugins/NewStory/src/history.cpp
@@ -120,7 +120,7 @@ const char* pSettings[] =
 class CHistoryDlg : public CDlgBase
 {
 	HMENU m_hMenu;
-	WORD showFlags;
+	uint16_t showFlags;
 	bool gonnaRedraw;
 	bool isContactHistory;
 	MCONTACT m_hContact;
diff --git a/plugins/NewStory/src/history_array.h b/plugins/NewStory/src/history_array.h
index 166dd48160..a6ec9b6503 100644
--- a/plugins/NewStory/src/history_array.h
+++ b/plugins/NewStory/src/history_array.h
@@ -39,7 +39,7 @@ struct ItemData
 
 class Filter
 {
-	WORD flags;
+	uint16_t flags;
 	int *refCount;
 	wchar_t *text;
 
@@ -56,7 +56,7 @@ public:
 		EVENTONLY = 0x100,
 	};
 
-	Filter(WORD aFlags, wchar_t *wText)
+	Filter(uint16_t aFlags, wchar_t *wText)
 	{
 		refCount = new int(0);
 		flags = aFlags;
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index 461d1477ca..27bee1fdd9 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -34,7 +34,7 @@ STATUS StatusList[STATUS_COUNT];
 STATUS StatusListEx[STATUSEX_COUNT];
 HWND SecretWnd;
 
-int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus);
+int ContactStatusChanged(MCONTACT hContact, uint16_t oldStatus, uint16_t newStatus);
 
 IconItem iconList[ICO_MAXID] =
 {
@@ -287,7 +287,7 @@ void LogSMsgToDB(STATUSMSGINFO *smi, const wchar_t *tmplt)
 	}
 }
 
-void GetStatusText(MCONTACT hContact, WORD newStatus, WORD oldStatus, wchar_t *stzStatusText)
+void GetStatusText(MCONTACT hContact, uint16_t newStatus, uint16_t oldStatus, wchar_t *stzStatusText)
 {
 	if (opt.UseAlternativeText) {
 		switch (GetGender(hContact)) {
@@ -347,7 +347,7 @@ void PlayChangeSound(MCONTACT hContact, const char *name)
 		Skin_PlaySound(name);
 }
 
-int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
+int ContactStatusChanged(MCONTACT hContact, uint16_t oldStatus, uint16_t newStatus)
 {
 	if (opt.LogToDB && (!opt.LogToDB_WinOpen || CheckMsgWnd(hContact))) {
 		wchar_t stzStatusText[MAX_SECONDLINE] = { 0 };
@@ -469,7 +469,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 
 int ProcessStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 {
-	WORD newStatus = cws->value.wVal;
+	uint16_t newStatus = cws->value.wVal;
 	if (newStatus < ID_STATUS_MIN || newStatus > ID_STATUS_MAX)
 		return 0;
 
@@ -481,7 +481,7 @@ int ProcessStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 	if (db_get_b(hContact, szProto, "ChatRoom", 0) == 1)
 		return 0;
 
-	WORD oldStatus = DBGetContactSettingRangedWord(hContact, "UserOnline", "LastStatus", ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX);
+	uint16_t oldStatus = DBGetContactSettingRangedWord(hContact, "UserOnline", "LastStatus", ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX);
 	if (oldStatus == newStatus)
 		return 0;
 
@@ -1004,8 +1004,8 @@ int ProtoAck(WPARAM, LPARAM lParam)
 	ACKDATA *ack = (ACKDATA *)lParam;
 
 	if (ack->type == ACKTYPE_STATUS) {
-		WORD newStatus = (WORD)ack->lParam;
-		WORD oldStatus = (DWORD_PTR)ack->hProcess;
+		uint16_t newStatus = (uint16_t)ack->lParam;
+		uint16_t oldStatus = (DWORD_PTR)ack->hProcess;
 		if (oldStatus == newStatus)
 			return 0;
 
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index c3339b35f9..6712414044 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -342,7 +342,7 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 	case WM_COMMAND:
 		{
-			WORD idCtrl = LOWORD(wParam);
+			uint16_t idCtrl = LOWORD(wParam);
 			if (HIWORD(wParam) == CPN_COLOURCHANGED) {
 				if (idCtrl >= IDC_CHK_OFFLINE) {
 					COLORREF colour = SendDlgItemMessage(hwndDlg, idCtrl, CPM_GETCOLOUR, 0, 0);
diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index d9f651bc13..6c43a08686 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 
-void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const wchar_t *stzText, PLUGINDATA *pdp)
+void ShowChangePopup(MCONTACT hContact, HICON hIcon, uint16_t newStatus, const wchar_t *stzText, PLUGINDATA *pdp)
 {
 	POPUPDATAW ppd;
 	ppd.lchContact = hContact;
diff --git a/plugins/NewXstatusNotify/src/popup.h b/plugins/NewXstatusNotify/src/popup.h
index 5e0c70d00e..aa067c80b0 100644
--- a/plugins/NewXstatusNotify/src/popup.h
+++ b/plugins/NewXstatusNotify/src/popup.h
@@ -39,8 +39,8 @@
 
 typedef struct tagPLUGINDATA
 {
-	WORD newStatus;
-	WORD oldStatus;
+	uint16_t newStatus;
+	uint16_t oldStatus;
 	HWND hWnd;
 	HANDLE hAwayMsgProcess;
 	HANDLE hAwayMsgHook;
@@ -58,7 +58,7 @@ static struct {
 	LPGENW("Do nothing"), PCA_DONOTHING
 };
 
-void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const wchar_t *stzText, PLUGINDATA *pdp = nullptr);
+void ShowChangePopup(MCONTACT hContact, HICON hIcon, uint16_t newStatus, const wchar_t *stzText, PLUGINDATA *pdp = nullptr);
 LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 #endif
 \ No newline at end of file
diff --git a/plugins/NewXstatusNotify/src/stdafx.h b/plugins/NewXstatusNotify/src/stdafx.h
index 270cb562d0..d4fde75939 100644
--- a/plugins/NewXstatusNotify/src/stdafx.h
+++ b/plugins/NewXstatusNotify/src/stdafx.h
@@ -149,8 +149,8 @@ typedef struct {
 
 /*
 MCONTACT hContact = wParam;
-WORD oldStatus = LOWORD(lParam);
-WORD newStatus = HIWORD(lParam);
+uint16_t oldStatus = LOWORD(lParam);
+uint16_t newStatus = HIWORD(lParam);
 oldStatus is the status the contact was before the change.
 newStatus is the status the contact is now.
 Cast them to (int) if you need them that way.
diff --git a/plugins/NotesAndReminders/src/miscutils.cpp b/plugins/NotesAndReminders/src/miscutils.cpp
index 058b93e263..c03ae641d0 100644
--- a/plugins/NotesAndReminders/src/miscutils.cpp
+++ b/plugins/NotesAndReminders/src/miscutils.cpp
@@ -10,7 +10,7 @@ int WS_Send(SOCKET s, const char *data, int datalen)
 	return TRUE;
 }
 
-unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort)
+unsigned long WS_ResolveName(char *name, uint16_t *port, int defaultPort)
 {
 	char *nameCopy = _strdup(name);
 	if (port != nullptr)
@@ -39,7 +39,7 @@ void Send(char *user, char *host, const char *Msg, char *server)
 	if (!server)
 		server = host;
 
-	WORD port;
+	uint16_t port;
 	SOCKADDR_IN sockaddr;
 	if ((sockaddr.sin_addr.S_un.S_addr = WS_ResolveName(server, &port, 25)) == SOCKET_ERROR)
 		return;
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 8ce6e253a5..36eb94843a 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -58,7 +58,7 @@ static bool bNewReminderVisible = false;
 static UINT QueuedReminderCount = 0;
 
 int WS_Send(SOCKET s, char *data, int datalen);
-unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort);
+unsigned long WS_ResolveName(char *name, uint16_t *port, int defaultPort);
 
 void Send(char *user, char *host, const char *Msg, char* server);
 wchar_t* GetPreviewString(const wchar_t *lpsz);
@@ -800,8 +800,8 @@ protected:
 
 			// cur time
 			FileTimeToTzLocalST((FILETIME *)&li, &tm2);
-			WORD wCurHour = tm2.wHour;
-			WORD wCurMinute = tm2.wMinute;
+			uint16_t wCurHour = tm2.wHour;
+			uint16_t wCurMinute = tm2.wMinute;
 			mir_snwprintf(s, L"%02d:%02d", (UINT)tm2.wHour, (UINT)tm2.wMinute);
 			cmbTime.AddString(s, (li - ref) / FILETIME_TICKS_PER_SEC);
 
@@ -938,8 +938,8 @@ protected:
 
 			SYSTEMTIME tmTriggerLocal, tmTriggerLocal2;
 			tmTriggerLocal = tmRefLocal;
-			tmTriggerLocal.wHour = (WORD)h;
-			tmTriggerLocal.wMinute = (WORD)m;
+			tmTriggerLocal.wHour = (uint16_t)h;
+			tmTriggerLocal.wMinute = (uint16_t)m;
 			tmTriggerLocal.wSecond = 0;
 			tmTriggerLocal.wMilliseconds = 0;
 
diff --git a/plugins/PackUpdater/Src/Options.cpp b/plugins/PackUpdater/Src/Options.cpp
index 64635b6008..ab704e57b1 100644
--- a/plugins/PackUpdater/Src/Options.cpp
+++ b/plugins/PackUpdater/Src/Options.cpp
@@ -142,7 +142,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	int i;
-	WORD idCtrl;
+	uint16_t idCtrl;
 	char str[20] = { 0 }, str2[20] = { 0 };
 
 	switch (msg) {
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp
index cef01fc117..e1e32665fc 100644
--- a/plugins/Ping/src/pingthread.cpp
+++ b/plugins/Ping/src/pingthread.cpp
@@ -582,7 +582,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 		switch (LOWORD(wParam)) {
 		case ID_MENU_GRAPH:
 			if (context_point_valid) {
-				WORD x = LOWORD(context_point), y = HIWORD(context_point);
+				uint16_t x = LOWORD(context_point), y = HIWORD(context_point);
 				GetWindowRect(list_hwnd, &r);
 				DWORD item = SendMessage(list_hwnd, LB_ITEMFROMPOINT, 0, MAKELPARAM(x - r.left, y - r.top));
 				if (HIWORD(item) == 0) {
@@ -604,7 +604,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 
 		case ID_MENU_TOGGLE:
 			if (context_point_valid) {
-				WORD x = LOWORD(context_point), y = HIWORD(context_point);
+				uint16_t x = LOWORD(context_point), y = HIWORD(context_point);
 				GetWindowRect(list_hwnd, &r);
 				DWORD item = SendMessage(list_hwnd, LB_ITEMFROMPOINT, 0, MAKELPARAM(x - r.left, y - r.top));
 				if (HIWORD(item) == 0) {
@@ -621,7 +621,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 
 		case ID_MENU_EDIT:
 			if (context_point_valid) {
-				WORD x = LOWORD(context_point), y = HIWORD(context_point);
+				uint16_t x = LOWORD(context_point), y = HIWORD(context_point);
 				GetWindowRect(list_hwnd, &r);
 				DWORD item = SendMessage(list_hwnd, LB_ITEMFROMPOINT, 0, MAKELPARAM(x - r.left, y - r.top));
 				PINGADDRESS *temp = nullptr;
diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp
index 87e195a920..508cb82594 100644
--- a/plugins/PluginUpdater/src/Options.cpp
+++ b/plugins/PluginUpdater/src/Options.cpp
@@ -471,7 +471,7 @@ public:
 	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override
 	{
 		if (msg == WM_COMMAND) {
-			WORD idCtrl = LOWORD(wParam), wNotifyCode = HIWORD(wParam);
+			uint16_t idCtrl = LOWORD(wParam), wNotifyCode = HIWORD(wParam);
 			if (wNotifyCode == CPN_COLOURCHANGED) {
 				if (idCtrl > 40070) {
 					//It's a color picker change. idCtrl is the control id.
diff --git a/plugins/PluginUpdater/src/checksum.cpp b/plugins/PluginUpdater/src/checksum.cpp
index 3e98cc82a7..39beb73c49 100644
--- a/plugins/PluginUpdater/src/checksum.cpp
+++ b/plugins/PluginUpdater/src/checksum.cpp
@@ -109,7 +109,7 @@ LBL_NotPE:
 		if (pINTH->Signature != IMAGE_NT_SIGNATURE)
 			goto LBL_NotPE;
 
-		WORD  machine = pINTH->FileHeader.Machine;
+		uint16_t  machine = pINTH->FileHeader.Machine;
 		DWORD sections = pINTH->FileHeader.NumberOfSections;
 		if (!sections)
 			return RESULT_INVALID;
@@ -241,7 +241,7 @@ LBL_NotPE:
 								break;
 							}
 
-							len -= sizeof(WORD);
+							len -= sizeof(uint16_t);
 							pw++;
 						}
 					}
diff --git a/plugins/Popup/src/config.h b/plugins/Popup/src/config.h
index aef2844d67..74b10b996c 100644
--- a/plugins/Popup/src/config.h
+++ b/plugins/Popup/src/config.h
@@ -33,9 +33,9 @@ typedef struct tagPOPUPOPTIONS {
 	//Size&Position
 	uint8_t DynamicResize;
 	uint8_t UseMinimumWidth;
-	WORD MinimumWidth;
+	uint16_t MinimumWidth;
 	uint8_t UseMaximumWidth;
-	WORD MaximumWidth;
+	uint16_t MaximumWidth;
 	int Position;
 	int Spreading;
 	//position Popup
@@ -68,13 +68,13 @@ typedef struct tagPOPUPOPTIONS {
 	//==Page Advanced====
 	//History
 	uint8_t EnableHistory;
-	WORD HistorySize;
+	uint16_t HistorySize;
 	uint8_t UseHppHistoryLog;
 	//Avatars
 	uint8_t avatarBorders;
 	uint8_t avatarPNGBorders;
 	uint8_t avatarRadius;
-	WORD avatarSize;
+	uint16_t avatarSize;
 	uint8_t EnableAvatarUpdates;
 	//Monitor
 	uint8_t Monitor;
@@ -89,7 +89,7 @@ typedef struct tagPOPUPOPTIONS {
 	DWORD FadeIn;
 	DWORD FadeOut;
 	//Others
-	WORD MaxPopups;
+	uint16_t MaxPopups;
 } POPUPOPTIONS;
 
 //===== User wnd class =====
diff --git a/plugins/Popup/src/def_settings.h b/plugins/Popup/src/def_settings.h
index 73c2425e63..947b192374 100644
--- a/plugins/Popup/src/def_settings.h
+++ b/plugins/Popup/src/def_settings.h
@@ -151,6 +151,6 @@ enum
 	SETTING_SMILEPACKTYPE_DEFAULT = SPK_NONE
 };
 
-extern WORD SETTING_MAXIMUMWIDTH_MAX;
+extern uint16_t SETTING_MAXIMUMWIDTH_MAX;
 
 #endif
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 88d87f9df9..879018c8a1 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-WORD SETTING_MAXIMUMWIDTH_MAX = GetSystemMetrics(SM_CXSCREEN);
+uint16_t SETTING_MAXIMUMWIDTH_MAX = GetSystemMetrics(SM_CXSCREEN);
 
 #define MENUCOMMAND_HISTORY "Popup/ShowHistory"
 #define MENUCOMMAND_SVC "Popup/EnableDisableMenuCommand"
diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp
index d81747ae06..cf034a0e71 100644
--- a/plugins/Popup/src/opt_gen.cpp
+++ b/plugins/Popup/src/opt_gen.cpp
@@ -484,7 +484,7 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			case PSN_APPLY:
 				// Seconds
 				g_plugin.setByte("InfiniteDelay", PopupOptions.InfiniteDelay);
-				g_plugin.setWord("Seconds", (WORD)PopupOptions.Seconds);
+				g_plugin.setWord("Seconds", (uint16_t)PopupOptions.Seconds);
 				g_plugin.setByte("LeaveHovered", PopupOptions.LeaveHovered);
 
 				// Dynamic Resize
@@ -498,11 +498,11 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 				g_plugin.setByte("Position", (uint8_t)PopupOptions.Position);
 
 				// Configure popup area
-				g_plugin.setWord("gapTop", (WORD)PopupOptions.gapTop);
-				g_plugin.setWord("gapBottom", (WORD)PopupOptions.gapBottom);
-				g_plugin.setWord("gapLeft", (WORD)PopupOptions.gapLeft);
-				g_plugin.setWord("gapRight", (WORD)PopupOptions.gapRight);
-				g_plugin.setWord("spacing", (WORD)PopupOptions.spacing);
+				g_plugin.setWord("gapTop", (uint16_t)PopupOptions.gapTop);
+				g_plugin.setWord("gapBottom", (uint16_t)PopupOptions.gapBottom);
+				g_plugin.setWord("gapLeft", (uint16_t)PopupOptions.gapLeft);
+				g_plugin.setWord("gapRight", (uint16_t)PopupOptions.gapRight);
+				g_plugin.setWord("spacing", (uint16_t)PopupOptions.spacing);
 
 				// Spreading
 				g_plugin.setByte("Spreading", (uint8_t)PopupOptions.Spreading);
diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index bd0b9ad530..f0c2f3ede5 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -348,7 +348,7 @@ void PopupWnd2::show()
 					for (int row = 0; row < m_bmpAnimate->getHeight(); ++row) {
 						unsigned char *pixel = (unsigned char *)m_bmpAnimate->getRow(row);
 						for (int col = 0; col < m_bmpAnimate->getWidth(); ++col) {
-							WORD alphaLevel = effect->getPixelAlpha(col, row);
+							uint16_t alphaLevel = effect->getPixelAlpha(col, row);
 							pixel[0] = (pixel[0] * alphaLevel) >> 8;
 							pixel[1] = (pixel[1] * alphaLevel) >> 8;
 							pixel[2] = (pixel[2] * alphaLevel) >> 8;
@@ -429,7 +429,7 @@ void PopupWnd2::hide()
 					for (int row = 0; row < m_bmpAnimate->getHeight(); ++row) {
 						unsigned char *pixel = (unsigned char *)m_bmpAnimate->getRow(row);
 						for (int col = 0; col < m_bmpAnimate->getWidth(); ++col) {
-							WORD alphaLevel = effect->getPixelAlpha(col, row);
+							uint16_t alphaLevel = effect->getPixelAlpha(col, row);
 							pixel[0] = (pixel[0] * alphaLevel) >> 8;
 							pixel[1] = (pixel[1] * alphaLevel) >> 8;
 							pixel[2] = (pixel[2] * alphaLevel) >> 8;
diff --git a/plugins/QuickContacts/src/options.cpp b/plugins/QuickContacts/src/options.cpp
index a061f7e396..8a5e486d86 100644
--- a/plugins/QuickContacts/src/options.cpp
+++ b/plugins/QuickContacts/src/options.cpp
@@ -43,8 +43,8 @@ void LoadOptions()
 
 static OptPageControl controls[] = {
 	{ nullptr, CONTROL_CHECKBOX, IDC_LASTSENTTO, "EnableLastSentTo", (uint8_t)TRUE },
-	{ nullptr, CONTROL_RADIO, IDC_GLOBAL, "MsgTypeRec", (WORD)TYPE_GLOBAL, TYPE_GLOBAL },
-	{ nullptr, CONTROL_RADIO, IDC_LOCAL, "MsgTypeRec", (WORD)TYPE_GLOBAL, TYPE_LOCAL },
+	{ nullptr, CONTROL_RADIO, IDC_GLOBAL, "MsgTypeRec", (uint16_t)TYPE_GLOBAL, TYPE_GLOBAL },
+	{ nullptr, CONTROL_RADIO, IDC_LOCAL, "MsgTypeRec", (uint16_t)TYPE_GLOBAL, TYPE_LOCAL },
 	{ nullptr, CONTROL_PROTOCOL_LIST, IDC_PROTOCOLS, "ShowOffline%s", (uint8_t)FALSE },
 	{ nullptr, CONTROL_CHECKBOX, IDC_HIDE_OFFLINE, "HideOfflineFromOfflineProto", (uint8_t)TRUE },
 	{ nullptr, CONTROL_CHECKBOX, IDC_APPEND_GROUP, "AppendGroupName", (uint8_t)FALSE },
diff --git a/plugins/Scriver/src/chat_options.cpp b/plugins/Scriver/src/chat_options.cpp
index cfb17740ce..a195e40644 100644
--- a/plugins/Scriver/src/chat_options.cpp
+++ b/plugins/Scriver/src/chat_options.cpp
@@ -515,9 +515,9 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 				db_set_b(0, CHAT_MODULE, "LoggingEnabled", (uint8_t)g_Settings.bLoggingEnabled);
 
 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN2, UDM_GETPOS, 0, 0);
-				db_set_w(0, CHAT_MODULE, "LogLimit", (WORD)iLen);
+				db_set_w(0, CHAT_MODULE, "LogLimit", (uint16_t)iLen);
 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN3, UDM_GETPOS, 0, 0);
-				db_set_w(0, CHAT_MODULE, "LoggingLimit", (WORD)iLen);
+				db_set_w(0, CHAT_MODULE, "LoggingLimit", (uint16_t)iLen);
 
 				SaveBranch(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), branch2, _countof(branch2));
 
@@ -611,7 +611,7 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wPar
 
 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN1, UDM_GETPOS, 0, 0);
 				g_Settings.iPopupTimeout = iLen;
-				db_set_w(0, CHAT_MODULE, "PopupTimeout", (WORD)iLen);
+				db_set_w(0, CHAT_MODULE, "PopupTimeout", (uint16_t)iLen);
 
 				g_Settings.crPUBkgColour = SendDlgItemMessage(hwndDlg, IDC_CHAT_BKG, CPM_GETCOLOUR, 0, 0);
 				db_set_dw(0, CHAT_MODULE, "PopupColorBG", (DWORD)SendDlgItemMessage(hwndDlg, IDC_CHAT_BKG, CPM_GETCOLOUR, 0, 0));
diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp
index 1d1fda210b..08d80577bf 100644
--- a/plugins/Scriver/src/infobar.cpp
+++ b/plugins/Scriver/src/infobar.cpp
@@ -41,7 +41,7 @@ void CMsgDialog::SetupInfobar()
 	cf2.bCharSet = lf.lfCharSet;
 	wcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);
 	cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0);
-	cf2.wWeight = (WORD)lf.lfWeight;
+	cf2.wWeight = (uint16_t)lf.lfWeight;
 	cf2.bPitchAndFamily = lf.lfPitchAndFamily;
 	cf2.yHeight = abs(lf.lfHeight) * 1440 / g_dat.logPixelSY;
 	SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_NAME, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2);
@@ -55,7 +55,7 @@ void CMsgDialog::SetupInfobar()
 	cf2.bCharSet = lf.lfCharSet;
 	wcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);
 	cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0);
-	cf2.wWeight = (WORD)lf.lfWeight;
+	cf2.wWeight = (uint16_t)lf.lfWeight;
 	cf2.bPitchAndFamily = lf.lfPitchAndFamily;
 	cf2.yHeight = abs(lf.lfHeight) * 1440 / g_dat.logPixelSY;
 	SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_STATUS, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2);
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index b9a57e3f00..640060ee22 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1123,7 +1123,7 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 			cf2.bCharSet = lf.lfCharSet;
 			wcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);
 			cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0);
-			cf2.wWeight = (WORD)lf.lfWeight;
+			cf2.wWeight = (uint16_t)lf.lfWeight;
 			cf2.bPitchAndFamily = lf.lfPitchAndFamily;
 			cf2.yHeight = abs(lf.lfHeight) * 1440 / g_dat.logPixelSY;
 			m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf2);
diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 63130cbd56..06dbefe672 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -114,7 +114,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	MEVENT m_hDbEventFirst, m_hDbEventLast, m_hDbUnreadEventFirst;
 	int    m_minLogBoxHeight, m_minEditBoxHeight;
 	int    m_iShowUnread;
-	WORD   m_wStatus;
+	uint16_t   m_wStatus;
 	DWORD  m_lastMessage;
 	int    m_iMessagesInProgress;
 	int    m_iSendAllConfirm;
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index 93afc9f910..5868e94aa4 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -79,7 +79,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	CMOption<uint8_t> bUseTabs, bLimitTabs, bLimitChatTabs, bLimitNames, bSeparateChats, bTabCloseButton, bHideOneTab, bTabsAtBottom, bSwitchToActive;
 	CMOption<uint8_t> bShowTyping, bShowTypingWin, bShowTypingTray, bShowTypingClist, bShowTypingSwitch;
 	CMOption<uint8_t> iFlashCount, iHistoryMode;
-	CMOption<WORD> iLimitNames, iLimitTabs, iLimitChatTabs, iLoadCount, iLoadTime, iIndentSize, iAutoResizeLines;
+	CMOption<uint16_t> iLimitNames, iLimitTabs, iLimitChatTabs, iLoadCount, iLoadTime, iIndentSize, iAutoResizeLines;
 	CMOption<DWORD> iPopFlags, iMsgTimeout, iActiveAlpha, iInactiveAlpha;
 
 	CMPlugin();
diff --git a/plugins/SecureIM/src/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp
index bb63c0ffe9..e198532166 100644
--- a/plugins/SecureIM/src/splitmsg.cpp
+++ b/plugins/SecureIM/src/splitmsg.cpp
@@ -9,7 +9,7 @@ LPSTR splitMsg(LPSTR szMsg, size_t iLen)
 	LPSTR out = (LPSTR)mir_alloc(len * 2);
 	LPSTR buf = out;
 
-	WORD msg_id = g_plugin.getWord("msgid", 0) + 1;
+	uint16_t msg_id = g_plugin.getWord("msgid", 0) + 1;
 	g_plugin.setWord("msgid", msg_id);
 
 	size_t part_all = (len + iLen - 1) / iLen;
diff --git a/plugins/SeenPlugin/src/missed.cpp b/plugins/SeenPlugin/src/missed.cpp
index ed5858e88f..9e4b4efeaf 100644
--- a/plugins/SeenPlugin/src/missed.cpp
+++ b/plugins/SeenPlugin/src/missed.cpp
@@ -132,7 +132,7 @@ int Test(WPARAM wparam, LPARAM lparam)
 	switch (lparam) {
 	case ICON_OFFLINE:
 		if (g_plugin.getByte((MCONTACT)wparam, "Missed", 0) == 1) {
-			WORD missed = IsUserMissed(wparam);
+			uint16_t missed = IsUserMissed(wparam);
 			if (!LOWORD(missed)) {
 				mcs.times[mcs.count] = 1;
 				mcs.wpcontact[mcs.count++] = wparam;
diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp
index 4ba368a2df..01b8237256 100644
--- a/plugins/SeenPlugin/src/options.cpp
+++ b/plugins/SeenPlugin/src/options.cpp
@@ -152,7 +152,7 @@ public:
 	LRESULT OnCommand(UINT, WPARAM wParam, LPARAM)
 	{
 		if (HIWORD(wParam) == CPN_COLOURCHANGED) {
-			WORD idText, idBack;
+			uint16_t idText, idBack;
 			if (LOWORD(wParam) > ID_STATUS_MAX) // we have clicked a text color
 				idText = wParam, idBack = wParam - 20;
 			else
@@ -293,7 +293,7 @@ public:
 		GetDlgItemText(m_hwnd, IDC_HISTORYSTAMP, szstamp, _countof(szstamp));
 		g_plugin.setWString("HistoryStamp", szstamp);
 
-		g_plugin.setWord("HistoryMax", (WORD)(GetDlgItemInt(m_hwnd, IDC_HISTORYSIZE, nullptr, FALSE) + 1));
+		g_plugin.setWord("HistoryMax", (uint16_t)(GetDlgItemInt(m_hwnd, IDC_HISTORYSIZE, nullptr, FALSE) + 1));
 
 		if (chkMenuItem.IsChanged()) {
 			bool bchecked = chkMenuItem.GetState();
diff --git a/plugins/SeenPlugin/src/stdafx.h b/plugins/SeenPlugin/src/stdafx.h
index 5c48418d44..167289d503 100644
--- a/plugins/SeenPlugin/src/stdafx.h
+++ b/plugins/SeenPlugin/src/stdafx.h
@@ -126,7 +126,7 @@ struct logthread_info
 {
 	MCONTACT hContact;
 	char   sProtoName[MAXMODULELABELLENGTH];
-	WORD   currStatus;
+	uint16_t   currStatus;
 };
 
 extern DWORD StatusColors15bits[];
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index 53014d3ef1..45d47447ad 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -346,15 +346,15 @@ void DBWriteTimeTS(DWORD t, MCONTACT hcontact)
 
 void GetColorsFromDWord(LPCOLORREF First, LPCOLORREF Second, DWORD colDword)
 {
-	WORD temp;
+	uint16_t temp;
 	COLORREF res = 0;
-	temp = (WORD)(colDword >> 16);
+	temp = (uint16_t)(colDword >> 16);
 	res |= ((temp & 0x1F) << 3);
 	res |= ((temp & 0x3E0) << 6);
 	res |= ((temp & 0x7C00) << 9);
 	if (First) *First = res;
 	res = 0;
-	temp = (WORD)colDword;
+	temp = (uint16_t)colDword;
 	res |= ((temp & 0x1F) << 3);
 	res |= ((temp & 0x3E0) << 6);
 	res |= ((temp & 0x7C00) << 9);
@@ -426,7 +426,7 @@ void ShowPopup(MCONTACT hcontact, const char * lpzProto, int newStatus)
 	PUAddPopupW(&ppd);
 }
 
-void myPlaySound(MCONTACT hcontact, WORD newStatus, WORD oldStatus)
+void myPlaySound(MCONTACT hcontact, uint16_t newStatus, uint16_t oldStatus)
 {
 	if (Ignore_IsIgnored(hcontact, IGNOREEVENT_USERONLINE))
 		return;
@@ -446,7 +446,7 @@ static void waitThread(logthread_info* infoParam)
 {
 	Thread_SetName("SeenPlugin: waitThread");
 
-	WORD prevStatus = g_plugin.getWord(infoParam->hContact, "StatusTriger", ID_STATUS_OFFLINE);
+	uint16_t prevStatus = g_plugin.getWord(infoParam->hContact, "StatusTriger", ID_STATUS_OFFLINE);
 
 	// I hope in 1.5 second all the needed info will be set
 	if (WaitForSingleObject(g_hShutdownEvent, 1500) == WAIT_TIMEOUT) {
@@ -455,7 +455,7 @@ static void waitThread(logthread_info* infoParam)
 				infoParam->currStatus &= 0x7FFF;
 
 		if (infoParam->currStatus != prevStatus) {
-			g_plugin.setWord(infoParam->hContact, "OldStatus", (WORD)(prevStatus | 0x8000));
+			g_plugin.setWord(infoParam->hContact, "OldStatus", (uint16_t)(prevStatus | 0x8000));
 			if (includeIdle)
 				g_plugin.setByte(infoParam->hContact, "OldIdle", (uint8_t)((prevStatus & 0x8000) == 0));
 
@@ -493,7 +493,7 @@ int UpdateValues(WPARAM hContact, LPARAM lparam)
 	
 	if (!strcmp(cws->szModule, MODULENAME)) {
 		// here we will come when Settings/SeenModule/StatusTriger is changed
-		WORD prevStatus = g_plugin.getWord(hContact, "OldStatus", ID_STATUS_OFFLINE);
+		uint16_t prevStatus = g_plugin.getWord(hContact, "OldStatus", ID_STATUS_OFFLINE);
 		if (includeIdle) {
 			if (g_plugin.getByte(hContact, "OldIdle", 0))
 				prevStatus &= 0x7FFF;
@@ -583,10 +583,10 @@ static void cleanThread(logthread_info* infoParam)
 	// I hope in 10 secons all logged-in contacts will be listed
 	if (WaitForSingleObject(g_hShutdownEvent, 10000) == WAIT_TIMEOUT) {
 		for (auto &hContact : Contacts(szProto)) {
-			WORD oldStatus = g_plugin.getWord(hContact, "StatusTriger", ID_STATUS_OFFLINE) | 0x8000;
+			uint16_t oldStatus = g_plugin.getWord(hContact, "StatusTriger", ID_STATUS_OFFLINE) | 0x8000;
 			if (oldStatus > ID_STATUS_OFFLINE) {
 				if (db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE) {
-					g_plugin.setWord(hContact, "OldStatus", (WORD)(oldStatus | 0x8000));
+					g_plugin.setWord(hContact, "OldStatus", (uint16_t)(oldStatus | 0x8000));
 					if (includeIdle)
 						g_plugin.setByte(hContact, "OldIdle", (uint8_t)((oldStatus & 0x8000) ? 0 : 1));
 					g_plugin.setWord(hContact, "StatusTriger", ID_STATUS_OFFLINE);
@@ -612,7 +612,7 @@ int ModeChange(WPARAM, LPARAM lparam)
 
 	DBWriteTimeTS(time(0), NULL);
 
-	WORD isetting = (WORD)ack->lParam;
+	uint16_t isetting = (uint16_t)ack->lParam;
 	if (isetting < ID_STATUS_OFFLINE)
 		isetting = ID_STATUS_OFFLINE;
 	if ((isetting > ID_STATUS_OFFLINE) && ((UINT_PTR)ack->hProcess <= ID_STATUS_OFFLINE)) {
diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp
index b57405b173..bea4f55d33 100644
--- a/plugins/SendScreenshotPlus/src/CSend.cpp
+++ b/plugins/SendScreenshotPlus/src/CSend.cpp
@@ -329,12 +329,12 @@ int CSend::OnSend(void *obj, WPARAM, LPARAM lParam)
 		case ACKTYPE_CHAT:
 			break;
 		case ACKTYPE_MESSAGE:
-			self->DB_EventAdd((WORD)EVENTTYPE_MESSAGE);
+			self->DB_EventAdd((uint16_t)EVENTTYPE_MESSAGE);
 			break;
 		case ACKTYPE_FILE:
 			self->m_szEventMsg.Insert(0, "aaaa");
 			self->m_cbEventMsg += sizeof(DWORD);
-			self->DB_EventAdd((WORD)EVENTTYPE_FILE);
+			self->DB_EventAdd((uint16_t)EVENTTYPE_FILE);
 			break;
 		}
 		self->Exit(ack->result);
@@ -343,7 +343,7 @@ int CSend::OnSend(void *obj, WPARAM, LPARAM lParam)
 	return 0;
 }
 
-void CSend::DB_EventAdd(WORD EventType)
+void CSend::DB_EventAdd(uint16_t EventType)
 {
 	DBEVENTINFO dbei = {};
 	dbei.szModule = m_pszProto;
diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h
index 1f5d106bdd..3d45488836 100644
--- a/plugins/SendScreenshotPlus/src/CSend.h
+++ b/plugins/SendScreenshotPlus/src/CSend.h
@@ -99,7 +99,7 @@ protected:
 	wchar_t*    m_ErrorTitle;
       
 	void Unhook(){if(m_hOnSend) {UnhookEvent(m_hOnSend);m_hOnSend = nullptr;}}
-	void DB_EventAdd(WORD EventType);
+	void DB_EventAdd(uint16_t EventType);
       
 	static INT_PTR CALLBACK ResultDialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
       
diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.cpp b/plugins/SendScreenshotPlus/src/ctrl_button.cpp
index 3cfb3a14ec..1a32592248 100644
--- a/plugins/SendScreenshotPlus/src/ctrl_button.cpp
+++ b/plugins/SendScreenshotPlus/src/ctrl_button.cpp
@@ -160,7 +160,7 @@ static void __fastcall PaintThemeButton(BTNCTRL *ctl, HDC hdcMem, LPRECT rcClien
 {
 	RECT rcText = { 0, 0, 0, 0 };
 	wchar_t wszText[MAX_PATH] = { 0 };
-	WORD ccText;
+	uint16_t ccText;
 
 	// Draw the flat button
 	if ((ctl->dwStyle & MBS_FLAT) && ctl->hThemeToolbar) {
@@ -259,7 +259,7 @@ static void __fastcall PaintButton(BTNCTRL *ctl, HDC hdcMem, LPRECT rcClient)
 {
 	RECT rcText = { 0, 0, 0, 0 };
 	wchar_t szText[MAX_PATH] = { 0 };
-	WORD ccText;
+	uint16_t ccText;
 
 	// Draw the flat button
 	if (ctl->dwStyle & MBS_FLAT) {
diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp
index 1fb44c7f21..013c5eab61 100644
--- a/plugins/Sessions/Src/Options.cpp
+++ b/plugins/Sessions/Src/Options.cpp
@@ -253,7 +253,7 @@ public:
 	bool OnApply() override
 	{
 		int iDelay = GetDlgItemInt(m_hwnd, IDC_STARTDELAY, nullptr, FALSE);
-		g_plugin.setWord("StartupModeDelay", (WORD)iDelay);
+		g_plugin.setWord("StartupModeDelay", (uint16_t)iDelay);
 		g_plugin.setByte("TrackCount", (uint8_t)(g_ses_limit = GetDlgItemInt(m_hwnd, IDC_TRACK, nullptr, FALSE)));
 		if (chkExitSave.IsChecked())
 			g_plugin.setByte("ShutdownMode", 2);
diff --git a/plugins/ShellExt/src/shlcom.h b/plugins/ShellExt/src/shlcom.h
index 0f441cc372..a3ae5bf261 100644
--- a/plugins/ShellExt/src/shlcom.h
+++ b/plugins/ShellExt/src/shlcom.h
@@ -90,7 +90,7 @@ struct TSlotIPC
 	MCONTACT hContact;
 	UINT hProto; // hash of the protocol the user is on
 	UINT hGroup; // hash of the entire path (not defined for REQUEST_GROUPS slots)
-	WORD Status;
+	uint16_t Status;
 	// only used for contacts -- can be STATUS_PROFILENAME -- but that is because returning the profile name is optional
 	uint8_t MRU; // if set, contact has been recently used
 	int cbStrSection;
diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp
index 80a5ac6990..7e6002a7b1 100644
--- a/plugins/SimpleStatusMsg/src/awaymsg.cpp
+++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp
@@ -57,7 +57,7 @@ public:
 		wchar_t str[256], format[128];
 		wchar_t *contactName = Clist_GetContactDisplayName(m_hContact, 0);
 		char *szProto = Proto_GetBaseAccountName(m_hContact);
-		WORD dwStatus = db_get_w(m_hContact, szProto, "Status", ID_STATUS_OFFLINE);
+		uint16_t dwStatus = db_get_w(m_hContact, szProto, "Status", ID_STATUS_OFFLINE);
 		wchar_t *status = Clist_GetStatusModeDescription(dwStatus, 0);
 
 		GetWindowText(m_hwnd, format, _countof(format));
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp
index dae491137a..6a126d34e4 100644
--- a/plugins/SimpleStatusMsg/src/main.cpp
+++ b/plugins/SimpleStatusMsg/src/main.cpp
@@ -430,7 +430,7 @@ void SaveStatusAsCurrent(const char *szProto, int iStatus)
 {
 	char szSetting[80];
 	mir_snprintf(szSetting, "Cur%sStatus", szProto);
-	g_plugin.setWord(szSetting, (WORD)iStatus);
+	g_plugin.setWord(szSetting, (uint16_t)iStatus);
 }
 
 static wchar_t *GetAwayMessage(int iStatus, const char *szProto, BOOL bInsertVars, MCONTACT hContact)
@@ -1115,7 +1115,7 @@ VOID CALLBACK SetStartupStatusGlobal(HWND hwnd, UINT, UINT_PTR idEvent, DWORD)
 			ChangeStatusMessage(status_mode, (LPARAM)"SimpleStatusMsgGlobalStartupStatus");
 		else {
 			// pseudo-currentDesiredStatusMode ;-)
-			g_plugin.setWord("StartupStatus", (WORD)temp_status_mode);
+			g_plugin.setWord("StartupStatus", (uint16_t)temp_status_mode);
 			ChangeStatusMessage(ID_STATUS_CURRENT, (LPARAM)"SimpleStatusMsgGlobalStartupStatus");
 		}
 		return;
@@ -1624,7 +1624,7 @@ int CMPlugin::Load()
 	hwndSAMsgDialog = nullptr;
 	accounts = (PROTOACCOUNTS *)mir_alloc(sizeof(PROTOACCOUNTS));
 
-	db_set_w(0, "CList", "Status", (WORD)ID_STATUS_OFFLINE);
+	db_set_w(0, "CList", "Status", (uint16_t)ID_STATUS_OFFLINE);
 
 	HookEvent(ME_OPT_INITIALISE, InitOptions);
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp
index 248c97eeb8..18978758fc 100644
--- a/plugins/SimpleStatusMsg/src/msgbox.cpp
+++ b/plugins/SimpleStatusMsg/src/msgbox.cpp
@@ -657,7 +657,7 @@ void ClearHistory(struct MsgBoxData *data, int cur_sel)
 		mir_snprintf(buff2, "Last%sMsg", pa->szModuleName);
 		g_plugin.setString(buff2, "");
 	}
-	g_plugin.setWord("LMMsg", (WORD)data->max_hist_msgs);
+	g_plugin.setWord("LMMsg", (uint16_t)data->max_hist_msgs);
 	SendMessage(data->recent_cbex, CB_SETCURSEL, -1, 0);
 	num_items = SendMessage(data->recent_cbex, CB_GETCOUNT, 0, 0);
 	if (num_items == CB_ERR)
@@ -1256,7 +1256,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 								db_set_ws(0, "SRAway", StatusModeToDbSetting(iStatus, buff2), tszMsg);
 							}
 						}
-						g_plugin.setWord("LMMsg", (WORD)last_modified_msg);
+						g_plugin.setWord("LMMsg", (uint16_t)last_modified_msg);
 					}
 
 					if (!msgbox_data->m_szProto)
@@ -1599,7 +1599,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 						g_plugin.delSetting(buff);
 					num_items--;
 				}
-				g_plugin.setWord("DefMsgCount", (WORD)new_num_def_msgs);
+				g_plugin.setWord("DefMsgCount", (uint16_t)new_num_def_msgs);
 			}
 
 			ImageList_Destroy(msgbox_data->status_icons);
diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index 9ae0f1de41..6d3e02a87c 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -914,7 +914,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 					//							g_plugin.delSetting(szSetting);
 
 					mir_snprintf(szSetting, "Proto%sMaxLen", pa->szModuleName);
-					g_plugin.setWord(szSetting, (WORD)data->proto_msg[i + 1].max_length);
+					g_plugin.setWord(szSetting, (uint16_t)data->proto_msg[i + 1].max_length);
 
 					mir_snprintf(szSetting, "Proto%sFlags", pa->szModuleName);
 					g_plugin.setByte(szSetting, (uint8_t)data->proto_msg[i + 1].flags);
@@ -1008,7 +1008,7 @@ static INT_PTR CALLBACK DlgVariablesOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM
 				KillTimer(nullptr, g_uUpdateMsgTimer);
 
 			int val = SendDlgItemMessage(hwndDlg, IDC_SSECUPDTMSG, UDM_GETPOS, 0, 0);
-			g_plugin.setWord("UpdateMsgInt", (WORD)val);
+			g_plugin.setWord("UpdateMsgInt", (uint16_t)val);
 
 			if (IsDlgButtonChecked(hwndDlg, IDC_CUPDATEMSG) == BST_CHECKED && val) {
 				g_plugin.setByte("UpdateMsgOn", (uint8_t)1);
@@ -1207,7 +1207,7 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 					mir_snprintf(setting, "Last%sMsg", pa->szModuleName);
 					g_plugin.setString(setting, "");
 				}
-				g_plugin.setWord("LMMsg", (WORD)max_hist_msgs);
+				g_plugin.setWord("LMMsg", (uint16_t)max_hist_msgs);
 				EnableWindow(GetDlgItem(hwndDlg, IDC_BOPTHIST), FALSE);
 			}
 			return 0;
@@ -1459,12 +1459,12 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 
 				char szSetting[80];
 				mir_snprintf(szSetting, "Startup%sStatus", pa->szModuleName);
-				g_plugin.setWord(szSetting, (WORD)data->status[i]);
+				g_plugin.setWord(szSetting, (uint16_t)data->status[i]);
 
 				mir_snprintf(szSetting, "Set%sStatusDelay", pa->szModuleName);
-				g_plugin.setWord(szSetting, (WORD)data->setdelay[i]);
+				g_plugin.setWord(szSetting, (uint16_t)data->setdelay[i]);
 			}
-			g_plugin.setWord("SetStatusDelay", (WORD)data->setglobaldelay);
+			g_plugin.setWord("SetStatusDelay", (uint16_t)data->setglobaldelay);
 			g_plugin.setByte("GlobalStatusDelay", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_SPECSET) != BST_CHECKED));
 			g_plugin.setByte("StartupPopupDlg", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_POPUPDLG) == BST_CHECKED));
 			return TRUE;
diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp
index d155dcd097..f22e25b595 100644
--- a/plugins/Spamotron/src/spamotron.cpp
+++ b/plugins/Spamotron/src/spamotron.cpp
@@ -439,7 +439,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam)
 		else {
 			if (g_plugin.getByte("MarkMsgUnreadOnApproval", defaultMarkMsgUnreadOnApproval)) {
 				DBVARIANT _dbv;
-				DWORD dbei_size = 3 * sizeof(DWORD) + sizeof(WORD) + dbei->cbBlob + (DWORD)mir_strlen(dbei->szModule) + 1;
+				DWORD dbei_size = 3 * sizeof(DWORD) + sizeof(uint16_t) + dbei->cbBlob + (DWORD)mir_strlen(dbei->szModule) + 1;
 				uint8_t *eventdata = (uint8_t*)malloc(dbei_size);
 				uint8_t *pos = eventdata;
 				if (eventdata != nullptr && dbei->cbBlob > 0) {
@@ -450,12 +450,12 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam)
 						pos += _dbv.cpbVal;
 						db_free(&_dbv);
 					}
-					memcpy(pos, &dbei->eventType, sizeof(WORD));
-					memcpy(pos + sizeof(WORD), &dbei->flags, sizeof(DWORD));
-					memcpy(pos + sizeof(WORD) + sizeof(DWORD), &dbei->timestamp, sizeof(DWORD));
-					memcpy(pos + sizeof(WORD) + sizeof(DWORD) * 2, dbei->szModule, mir_strlen(dbei->szModule) + 1);
-					memcpy(pos + sizeof(WORD) + sizeof(DWORD) * 2 + mir_strlen(dbei->szModule) + 1, &dbei->cbBlob, sizeof(DWORD));
-					memcpy(pos + sizeof(WORD) + sizeof(DWORD) * 3 + mir_strlen(dbei->szModule) + 1, dbei->pBlob, dbei->cbBlob);
+					memcpy(pos, &dbei->eventType, sizeof(uint16_t));
+					memcpy(pos + sizeof(uint16_t), &dbei->flags, sizeof(DWORD));
+					memcpy(pos + sizeof(uint16_t) + sizeof(DWORD), &dbei->timestamp, sizeof(DWORD));
+					memcpy(pos + sizeof(uint16_t) + sizeof(DWORD) * 2, dbei->szModule, mir_strlen(dbei->szModule) + 1);
+					memcpy(pos + sizeof(uint16_t) + sizeof(DWORD) * 2 + mir_strlen(dbei->szModule) + 1, &dbei->cbBlob, sizeof(DWORD));
+					memcpy(pos + sizeof(uint16_t) + sizeof(DWORD) * 3 + mir_strlen(dbei->szModule) + 1, dbei->pBlob, dbei->cbBlob);
 					db_set_blob(hContact, MODULENAME, "LastMsgEvents", eventdata, (pos - eventdata) + dbei_size);
 					free(eventdata);
 				}
diff --git a/plugins/Spamotron/src/utils.cpp b/plugins/Spamotron/src/utils.cpp
index c29132d7b7..506dfec548 100644
--- a/plugins/Spamotron/src/utils.cpp
+++ b/plugins/Spamotron/src/utils.cpp
@@ -489,7 +489,7 @@ void MarkUnread(MCONTACT hContact)
 		pos = _dbv.pbVal;
 		while (pos - _dbv.pbVal < _dbv.cpbVal) {
 			DBEVENTINFO dbei = {};
-			memcpy(&dbei.eventType, pos, sizeof(WORD)); pos += sizeof(WORD);
+			memcpy(&dbei.eventType, pos, sizeof(uint16_t)); pos += sizeof(uint16_t);
 			memcpy(&dbei.flags, pos, sizeof(DWORD)); pos += sizeof(DWORD);
 			memcpy(&dbei.timestamp, pos, sizeof(DWORD)); pos += sizeof(DWORD);
 
diff --git a/plugins/SpellChecker/src/RichEdit.cpp b/plugins/SpellChecker/src/RichEdit.cpp
index fa001f1847..11a4a6f553 100644
--- a/plugins/SpellChecker/src/RichEdit.cpp
+++ b/plugins/SpellChecker/src/RichEdit.cpp
@@ -145,7 +145,7 @@ int RichEdit::GetLineCount() const
 
 void RichEdit::GetLine(int line, wchar_t *text, size_t text_len) const
 {
-	*((WORD*)text) = WORD(text_len - 1);
+	*((uint16_t*)text) = uint16_t(text_len - 1);
 	unsigned size = (unsigned)SendMessage(EM_GETLINE, (WPARAM)line, (LPARAM)text);
 
 	// Sometimes it likes to return size = lineLen+1, adding an \n at the end, so we remove it here
diff --git a/plugins/SpellChecker/src/options.h b/plugins/SpellChecker/src/options.h
index 5577c8fb3a..ade1e6f55b 100644
--- a/plugins/SpellChecker/src/options.h
+++ b/plugins/SpellChecker/src/options.h
@@ -38,7 +38,7 @@ struct Options
 	BOOL ignore_with_numbers;
 	BOOL ask_when_sending_with_error;
 
-	WORD underline_type;
+	uint16_t underline_type;
 	BOOL cascade_corrections;
 	BOOL show_all_corrections;
 	BOOL show_wrong_word;
diff --git a/plugins/StatusManager/src/aaa_options.cpp b/plugins/StatusManager/src/aaa_options.cpp
index c8b7e511e5..a773698ef1 100644
--- a/plugins/StatusManager/src/aaa_options.cpp
+++ b/plugins/StatusManager/src/aaa_options.cpp
@@ -196,17 +196,17 @@ static int WriteAutoAwaySetting(SMProto &autoAwaySetting, char *protoName)
 {
 	char setting[128];
 	mir_snprintf(setting, "%s_OptionFlags", protoName);
-	AAAPlugin.setWord(setting, (WORD)autoAwaySetting.optionFlags);
+	AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.optionFlags);
 	mir_snprintf(setting, "%s_AwayTime", protoName);
-	AAAPlugin.setWord(setting, (WORD)autoAwaySetting.awayTime);
+	AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.awayTime);
 	mir_snprintf(setting, "%s_NATime", protoName);
-	AAAPlugin.setWord(setting, (WORD)autoAwaySetting.naTime);
+	AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.naTime);
 	mir_snprintf(setting, "%s_StatusFlags", protoName);
-	AAAPlugin.setWord(setting, (WORD)autoAwaySetting.statusFlags);
+	AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.statusFlags);
 	mir_snprintf(setting, "%s_Lv1Status", protoName);
-	AAAPlugin.setWord(setting, (WORD)autoAwaySetting.lv1Status);
+	AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.lv1Status);
 	mir_snprintf(setting, "%s_Lv2Status", protoName);
-	AAAPlugin.setWord(setting, (WORD)autoAwaySetting.lv2Status);
+	AAAPlugin.setWord(setting, (uint16_t)autoAwaySetting.lv2Status);
 
 	return 0;
 }
@@ -584,8 +584,8 @@ static INT_PTR CALLBACK DlgProcAutoAwayGeneralOpts(HWND hwndDlg, UINT msg, WPARA
 				AAAPlugin.setByte(SETTING_IGNSYSKEYS, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_IGNSYSKEYS));
 				AAAPlugin.setByte(SETTING_IGNALTCOMBO, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_IGNALTCOMBO));
 				AAAPlugin.setByte(SETTING_SAMESETTINGS, (uint8_t)g_bAAASettingSame);
-				AAAPlugin.setWord(SETTING_AWAYCHECKTIMEINSECS, (WORD)GetDlgItemInt(hwndDlg, IDC_AWAYCHECKTIMEINSECS, nullptr, FALSE));
-				AAAPlugin.setWord(SETTING_CONFIRMDELAY, (WORD)GetDlgItemInt(hwndDlg, IDC_CONFIRMDELAY, nullptr, FALSE));
+				AAAPlugin.setWord(SETTING_AWAYCHECKTIMEINSECS, (uint16_t)GetDlgItemInt(hwndDlg, IDC_AWAYCHECKTIMEINSECS, nullptr, FALSE));
+				AAAPlugin.setWord(SETTING_CONFIRMDELAY, (uint16_t)GetDlgItemInt(hwndDlg, IDC_CONFIRMDELAY, nullptr, FALSE));
 				AAAPlugin.setByte(SETTING_MONITORMOUSE, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_MONITORMOUSE));
 				AAAPlugin.setByte(SETTING_MONITORKEYBOARD, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_MONITORKEYBOARD));
 			}
diff --git a/plugins/StatusManager/src/commonstatus.h b/plugins/StatusManager/src/commonstatus.h
index fd1117902e..6695cebaa8 100644
--- a/plugins/StatusManager/src/commonstatus.h
+++ b/plugins/StatusManager/src/commonstatus.h
@@ -103,7 +103,7 @@ struct SMProto : public PROTOCOLSETTINGEX, public MZeroedObject
 	int  awayTime; // db: time to wait for inactivity
 	int  naTime; // db: time to wait after away is set
 	int  statusFlags; // db: set lv1 status if this is original status
-	WORD lv1Status, lv2Status; // db: statuses to switch protocol to
+	uint16_t lv1Status, lv2Status; // db: statuses to switch protocol to
 	unsigned int sts1setTimer;
 
 	// KeepStatus
diff --git a/plugins/StatusManager/src/keepstatus.h b/plugins/StatusManager/src/keepstatus.h
index e4b1f5a7a4..dbfbc916d8 100644
--- a/plugins/StatusManager/src/keepstatus.h
+++ b/plugins/StatusManager/src/keepstatus.h
@@ -91,8 +91,8 @@
 /* old; replaced by PROTOCOLSETTINGEX see m_statusplugins.h */
 typedef struct {
 	char *szName;	// pointer to protocol modulename
-	WORD status;	// the status
-	WORD lastStatus;// last status
+	uint16_t status;	// the status
+	uint16_t lastStatus;// last status
 } PROTOCOLSETTING;
 
 /* old; replaced by ME_CS_STATUSCHANGE see m_statusplugins.h */
diff --git a/plugins/StatusManager/src/ks_options.cpp b/plugins/StatusManager/src/ks_options.cpp
index fcaae56b23..4848eff393 100644
--- a/plugins/StatusManager/src/ks_options.cpp
+++ b/plugins/StatusManager/src/ks_options.cpp
@@ -231,7 +231,7 @@ static INT_PTR CALLBACK DlgProcKSAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 			else KSPlugin.setByte(SETTING_LOGINERR, LOGINERR_NOTHING);
 
 			KSPlugin.setByte(SETTING_CHECKAPMRESUME, (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_CHECKAPMRESUME));
-			KSPlugin.setWord(SETTING_PINGCOUNT, (WORD)GetDlgItemInt(hwndDlg, IDC_PINGCOUNT, nullptr, FALSE));
+			KSPlugin.setWord(SETTING_PINGCOUNT, (uint16_t)GetDlgItemInt(hwndDlg, IDC_PINGCOUNT, nullptr, FALSE));
 			KSPlugin.setDword(SETTING_CNTDELAY, (DWORD)GetDlgItemInt(hwndDlg, IDC_CNTDELAY, nullptr, FALSE) == 0 ? CHECKCONTIN_DELAY : GetDlgItemInt(hwndDlg, IDC_CNTDELAY, nullptr, FALSE));
 		}
 		break;
diff --git a/plugins/StatusManager/src/ss_main.cpp b/plugins/StatusManager/src/ss_main.cpp
index e5118785a3..2f10ca761f 100644
--- a/plugins/StatusManager/src/ss_main.cpp
+++ b/plugins/StatusManager/src/ss_main.cpp
@@ -426,7 +426,7 @@ void StartupStatusLoad()
 		HookEvent(ME_SYSTEM_MODULESLOADED, SSModuleLoaded);
 
 	if (SSPlugin.getByte(SETTING_SETPROFILE, 1) || SSPlugin.getByte(SETTING_OFFLINECLOSE, 0))
-		db_set_w(0, "CList", "Status", (WORD)ID_STATUS_OFFLINE);
+		db_set_w(0, "CList", "Status", (uint16_t)ID_STATUS_OFFLINE);
 
 	// docking
 	if (SSPlugin.getByte(SETTING_SETDOCKED, 0)) {
diff --git a/plugins/StatusManager/src/ss_options.cpp b/plugins/StatusManager/src/ss_options.cpp
index 244575feb5..fad9da5be4 100644
--- a/plugins/StatusManager/src/ss_options.cpp
+++ b/plugins/StatusManager/src/ss_options.cpp
@@ -364,7 +364,7 @@ public:
 			SSPlugin.setDword(SETTING_SETPROFILEDELAY, GetDlgItemInt(m_hwnd, IDC_SETPROFILEDELAY, nullptr, FALSE));
 
 		if (bChecked || chkShowDialog.GetState())
-			SSPlugin.setWord(SETTING_DEFAULTPROFILE, (WORD)profiles.GetCurData());
+			SSPlugin.setWord(SETTING_DEFAULTPROFILE, (uint16_t)profiles.GetCurData());
 
 		SSPlugin.setByte(SETTING_OVERRIDE, (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_OVERRIDE));
 		SSPlugin.setByte(SETTING_SHOWDIALOG, bChecked = chkShowDialog.GetState());
@@ -736,7 +736,7 @@ public:
 				SSPlugin.setWord(OptName(i, jt->m_szName), jt->m_status);
 			}
 		}
-		SSPlugin.setWord(SETTING_PROFILECOUNT, (WORD)arProfiles.getCount());
+		SSPlugin.setWord(SETTING_PROFILECOUNT, (uint16_t)arProfiles.getCount());
 
 		// Rebuild status menu
 		if (bNeedRebuildMenu)
diff --git a/plugins/StatusManager/src/ss_profiles.cpp b/plugins/StatusManager/src/ss_profiles.cpp
index c5f2038ed2..da945ccb85 100644
--- a/plugins/StatusManager/src/ss_profiles.cpp
+++ b/plugins/StatusManager/src/ss_profiles.cpp
@@ -216,7 +216,7 @@ INT_PTR LoadAndSetProfile(WPARAM iProfileNo, LPARAM)
 	return 0;
 }
 
-static UINT GetFsModifiers(WORD wHotKey)
+static UINT GetFsModifiers(uint16_t wHotKey)
 {
 	UINT fsm = 0;
 	if (HIBYTE(wHotKey)&HOTKEYF_ALT)
@@ -269,7 +269,7 @@ int RegisterHotKeys()
 		if (!SSPlugin.getByte(OptName(i, SETTING_REGHOTKEY), 0))
 			continue;
 
-		WORD wHotKey = SSPlugin.getWord(OptName(i, SETTING_HOTKEY), 0);
+		uint16_t wHotKey = SSPlugin.getWord(OptName(i, SETTING_HOTKEY), 0);
 		hkInfo = (HKINFO*)mir_realloc(hkInfo, (hkiCount + 1)*sizeof(HKINFO));
 		if (hkInfo == nullptr)
 			return -1;
diff --git a/plugins/StatusManager/src/startupstatus.h b/plugins/StatusManager/src/startupstatus.h
index 12a8f7900b..7e3ad71123 100644
--- a/plugins/StatusManager/src/startupstatus.h
+++ b/plugins/StatusManager/src/startupstatus.h
@@ -39,7 +39,7 @@ struct PROFILEOPTIONS : public MZeroedObject
 	BOOL createMmi;
 	BOOL inSubMenu;
 	BOOL regHotkey;
-	WORD hotKey;
+	uint16_t hotKey;
 };
 
 typedef struct {
diff --git a/plugins/TabSRMM/src/TSButton.cpp b/plugins/TabSRMM/src/TSButton.cpp
index 865604457f..7102c19efd 100644
--- a/plugins/TabSRMM/src/TSButton.cpp
+++ b/plugins/TabSRMM/src/TSButton.cpp
@@ -439,7 +439,7 @@ static LRESULT CALLBACK TSButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				bct->stateId = PBS_PRESSED;
 			else if (LOWORD(lParam) > rc.right - 12) {
 				if (GetDlgCtrlID(hwndDlg) == IDOK || bct->stateId != PBS_DISABLED) {
-					WORD w = LOWORD((INT_PTR)bct->arrow);
+					uint16_t w = LOWORD((INT_PTR)bct->arrow);
 					SendMessage(GetParent(hwndDlg), WM_COMMAND, MAKELONG(w, BN_CLICKED), (LPARAM)hwndDlg);
 				}
 			}
diff --git a/plugins/TabSRMM/src/chat_log.cpp b/plugins/TabSRMM/src/chat_log.cpp
index d7dd0eb440..cd733f019c 100644
--- a/plugins/TabSRMM/src/chat_log.cpp
+++ b/plugins/TabSRMM/src/chat_log.cpp
@@ -214,7 +214,7 @@ static void Log_AppendRTF(LOGSTREAMDATA *streamData, bool simpleMode, CMStringA
 		else if (*line > 0 && *line < 128) {
 			res.AppendChar((char)*line);
 		}
-		else res.AppendFormat("\\u%u ?", (WORD)*line);
+		else res.AppendFormat("\\u%u ?", (uint16_t)*line);
 	}
 
 	str += res;
diff --git a/plugins/TabSRMM/src/chat_manager.cpp b/plugins/TabSRMM/src/chat_manager.cpp
index 4219dd649b..0cf8c324c6 100644
--- a/plugins/TabSRMM/src/chat_manager.cpp
+++ b/plugins/TabSRMM/src/chat_manager.cpp
@@ -46,8 +46,8 @@ static int sttCompareNicknames(const wchar_t *s1, const wchar_t *s2)
 
 int UM_CompareItem(const USERINFO *u1, const USERINFO *u2)
 {
-	WORD dw1 = u1->Status;
-	WORD dw2 = u2->Status;
+	uint16_t dw1 = u1->Status;
+	uint16_t dw2 = u2->Status;
 
 	for (int i = 0; i < 8; i++) {
 		if ((dw1 & 1) && !(dw2 & 1))
diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp
index 7720be1954..a08f5effc6 100644
--- a/plugins/TabSRMM/src/chat_options.cpp
+++ b/plugins/TabSRMM/src/chat_options.cpp
@@ -677,7 +677,7 @@ public:
 		g_chatApi.SM_InvalidateLogDirectories();
 
 		iLen = SendDlgItemMessage(m_hwnd, IDC_CHAT_SPIN4, UDM_GETPOS, 0, 0);
-		db_set_w(0, CHAT_MODULE, "LoggingLimit", (WORD)iLen);
+		db_set_w(0, CHAT_MODULE, "LoggingLimit", (uint16_t)iLen);
 
 		iLen = SendDlgItemMessage(m_hwnd, IDC_CHAT_SPIN3, UDM_GETPOS, 0, 0);
 		if (iLen > 0)
@@ -722,7 +722,7 @@ public:
 		db_set_b(0, CHAT_MODULE, "LogSymbols", lr == 2);
 
 		iLen = SendDlgItemMessage(m_hwnd, IDC_CHAT_SPIN2, UDM_GETPOS, 0, 0);
-		db_set_w(0, CHAT_MODULE, "LogLimit", (WORD)iLen);
+		db_set_w(0, CHAT_MODULE, "LogLimit", (uint16_t)iLen);
 		mir_free(pszText);
 
 		if (g_chatApi.hListBkgBrush)
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index 5656f3c263..b66b923f18 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -131,7 +131,7 @@ void CContactCache::updateMeta()
 		MCONTACT hOldSub = m_hSub;
 		m_hSub = db_mc_getSrmmSub(cc->contactID);
 		m_szMetaProto = Proto_GetBaseAccountName(m_hSub);
-		m_iMetaStatus = (WORD)db_get_w(m_hSub, m_szMetaProto, "Status", ID_STATUS_OFFLINE);
+		m_iMetaStatus = (uint16_t)db_get_w(m_hSub, m_szMetaProto, "Status", ID_STATUS_OFFLINE);
 		PROTOACCOUNT *pa = Proto_GetAccount(m_szMetaProto);
 		if (pa)
 			m_szAccount = pa->tszAccountName;
diff --git a/plugins/TabSRMM/src/containeroptions.cpp b/plugins/TabSRMM/src/containeroptions.cpp
index e56b3f0aed..f38dcb48c2 100644
--- a/plugins/TabSRMM/src/containeroptions.cpp
+++ b/plugins/TabSRMM/src/containeroptions.cpp
@@ -271,11 +271,11 @@ static INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM w
 		case IDC_APPLY:
 			SendMessage(hwndDlg, DM_SC_BUILDLIST, 0, (LPARAM)pContainer->m_pSettings);
 
-			pContainer->m_pSettings->dwTransparency = MAKELONG((WORD)SendDlgItemMessage(hwndDlg, IDC_TRANSPARENCY_ACTIVE, TBM_GETPOS, 0, 0),
-				(WORD)SendDlgItemMessage(hwndDlg, IDC_TRANSPARENCY_INACTIVE, TBM_GETPOS, 0, 0));
+			pContainer->m_pSettings->dwTransparency = MAKELONG((uint16_t)SendDlgItemMessage(hwndDlg, IDC_TRANSPARENCY_ACTIVE, TBM_GETPOS, 0, 0),
+				(uint16_t)SendDlgItemMessage(hwndDlg, IDC_TRANSPARENCY_INACTIVE, TBM_GETPOS, 0, 0));
 
-			pContainer->m_pSettings->avatarMode = (WORD)SendDlgItemMessage(hwndDlg, IDC_AVATARMODE, CB_GETCURSEL, 0, 0);
-			pContainer->m_pSettings->ownAvatarMode = (WORD)SendDlgItemMessage(hwndDlg, IDC_OWNAVATARMODE, CB_GETCURSEL, 0, 0);
+			pContainer->m_pSettings->avatarMode = (uint16_t)SendDlgItemMessage(hwndDlg, IDC_AVATARMODE, CB_GETCURSEL, 0, 0);
+			pContainer->m_pSettings->ownAvatarMode = (uint16_t)SendDlgItemMessage(hwndDlg, IDC_OWNAVATARMODE, CB_GETCURSEL, 0, 0);
 
 			GetDlgItemText(hwndDlg, IDC_TITLEFORMAT, pContainer->m_pSettings->szTitleFormat, TITLE_FORMATLEN);
 			pContainer->m_pSettings->szTitleFormat[TITLE_FORMATLEN - 1] = 0;
@@ -503,7 +503,7 @@ do_apply: Utils::enableDlgControl(hwndDlg, IDC_APPLY, true);
 
 			cs->flags = newFlags;
 			cs->flagsEx = newFlagsEx;
-			cs->autoCloseSeconds = (WORD)SendDlgItemMessage(hwndDlg, IDC_AUTOCLOSETABSPIN, UDM_GETPOS, 0, 0);
+			cs->autoCloseSeconds = (uint16_t)SendDlgItemMessage(hwndDlg, IDC_AUTOCLOSETABSPIN, UDM_GETPOS, 0, 0);
 		}
 		break;
 
diff --git a/plugins/TabSRMM/src/controls.h b/plugins/TabSRMM/src/controls.h
index 5def6f0335..7a1c083d92 100644
--- a/plugins/TabSRMM/src/controls.h
+++ b/plugins/TabSRMM/src/controls.h
@@ -40,7 +40,7 @@ public:
 	~CMenuBar();
 
 	const RECT&  getClientRect();
-	void         Resize(WORD wWidth) const
+	void         Resize(uint16_t wWidth) const
 	{
 		::SetWindowPos(m_hwndToolbar, nullptr, 4, 0, wWidth, m_size_y, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOREDRAW);
 	}
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 975d3fa5d4..82caf1009b 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -247,7 +247,7 @@ static wchar_t* ShortenPreview(DBEVENTINFO *dbe)
 	return buf;
 }
 
-static wchar_t* GetPreviewT(WORD eventType, DBEVENTINFO *dbe)
+static wchar_t* GetPreviewT(uint16_t eventType, DBEVENTINFO *dbe)
 {
 	char *pBlob = (char*)dbe->pBlob;
 
@@ -415,7 +415,7 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, MCONTACT hContact, MEVENT hEve
 	else
 		wcsncpy_s(pud.lpwzContactName, _A2T(dbe.szModule), _TRUNCATE);
 
-	wchar_t *szPreview = GetPreviewT((WORD)eventType, &dbe);
+	wchar_t *szPreview = GetPreviewT((uint16_t)eventType, &dbe);
 	if (szPreview) {
 		wcsncpy_s(pud.lpwzText, szPreview, _TRUNCATE);
 		mir_free(szPreview);
@@ -708,7 +708,7 @@ void Popup_Options(WPARAM wParam)
 	g_plugin.addOptions(wParam, &odp);
 }
 
-int tabSRMM_ShowPopup(MCONTACT hContact, MEVENT hDbEvent, WORD eventType, int windowOpen, TContainerData *pContainer, HWND hwndChild, const char *szProto)
+int tabSRMM_ShowPopup(MCONTACT hContact, MEVENT hDbEvent, uint16_t eventType, int windowOpen, TContainerData *pContainer, HWND hwndChild, const char *szProto)
 {
 	if (nen_options.iDisable) // no popups at all. Period
 		return 0;
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 26ba257f8e..d80846dc20 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -519,7 +519,7 @@ void CMsgDialog::DM_InitRichEdit()
 		cf2.crBackColor = m_pContainer->m_theme.inputbg;
 		wcsncpy_s(cf2.szFaceName, lf.lfFaceName, _TRUNCATE);
 		cf2.dwEffects = 0;
-		cf2.wWeight = (WORD)lf.lfWeight;
+		cf2.wWeight = (uint16_t)lf.lfWeight;
 		cf2.bPitchAndFamily = lf.lfPitchAndFamily;
 		cf2.yHeight = abs(lf.lfHeight) * 15;
 	}
@@ -536,7 +536,7 @@ void CMsgDialog::DM_InitRichEdit()
 		cf2.bCharSet = lf.lfCharSet;
 		wcsncpy_s(cf2.szFaceName, lf.lfFaceName, _TRUNCATE);
 		cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0) | (lf.lfUnderline ? CFE_UNDERLINE : 0) | (lf.lfStrikeOut ? CFE_STRIKEOUT : 0);
-		cf2.wWeight = (WORD)lf.lfWeight;
+		cf2.wWeight = (uint16_t)lf.lfWeight;
 		cf2.bPitchAndFamily = lf.lfPitchAndFamily;
 		cf2.yHeight = abs(lf.lfHeight) * 15;
 	}
@@ -608,7 +608,7 @@ void CMsgDialog::DM_SetDBButtonStates()
 			result = (db_get_b(hFinalContact, szModule, szSetting, 0) == buttonItem->bValuePush[0]);
 			break;
 		case DBVT_WORD:
-			result = (db_get_w(hFinalContact, szModule, szSetting, 0) == *((WORD *)&buttonItem->bValuePush));
+			result = (db_get_w(hFinalContact, szModule, szSetting, 0) == *((uint16_t *)&buttonItem->bValuePush));
 			break;
 		case DBVT_DWORD:
 			result = (db_get_dw(hFinalContact, szModule, szSetting, 0) == *((DWORD *)&buttonItem->bValuePush));
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 150faf6c00..b8ba8a3202 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -509,8 +509,8 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
 	if (Proto_GetStatus(c->getProto()) == ID_STATUS_OFFLINE || db_get_b(hContact, c->getProto(), "ChatRoom", 0))
 		return;
 
-	WORD wStatus = LOWORD(wParam);
-	WORD wOldStatus = HIWORD(wParam);
+	uint16_t wStatus = LOWORD(wParam);
+	uint16_t wOldStatus = HIWORD(wParam);
 	if (wStatus == wOldStatus)
 		return;
 
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 41ad17acfc..58a44987f9 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1517,7 +1517,7 @@ void OptCheckBox_Save(HWND hwnd, OptCheckBox *cb)
 		db_set_b(0, cb->dbModule, cb->dbSetting, (uint8_t)value);
 		break;
 	case DBVT_WORD:
-		db_set_w(0, cb->dbModule, cb->dbSetting, (WORD)value);
+		db_set_w(0, cb->dbModule, cb->dbSetting, (uint16_t)value);
 		break;
 	case DBVT_DWORD:
 		db_set_dw(0, cb->dbModule, cb->dbSetting, (DWORD)value);
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index e1d57835c1..90f2a5e9ad 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -268,9 +268,9 @@ struct TContainerSettings
 	DWORD   panelheight;
 	int     iSplitterX, iSplitterY;
 	wchar_t szTitleFormat[TITLE_FORMATLEN + 2];
-	WORD    avatarMode;
-	WORD    ownAvatarMode;
-	WORD    autoCloseSeconds;
+	uint16_t    avatarMode;
+	uint16_t    ownAvatarMode;
+	uint16_t    autoCloseSeconds;
 	bool    fPrivate;
 };
 
@@ -324,7 +324,7 @@ struct TContainerData : public MZeroedObject
 	HBITMAP  m_hbmToolbarBG, m_oldhbmToolbarBG;
 	SIZE	   m_szOldToolbarSize;
 	SIZE     m_oldSize, m_preSIZE;
-	WORD	   m_avatarMode, m_ownAvatarMode;
+	uint16_t	   m_avatarMode, m_ownAvatarMode;
 	uint8_t	   m_bTBRenderingMode;
 	TLogTheme m_theme;
 	CMenuBar *m_pMenuBar;
@@ -477,7 +477,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	void    VerifyProxy(void);
 	LRESULT WMCopyHandler(UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-	WORD    m_wStatus, m_wOldStatus;
+	uint16_t    m_wStatus, m_wOldStatus;
 	size_t  m_iSendBufferSize;
 	int     m_iSendLength;				// message length in utf-8 octets
 	HICON   m_hSmileyIcon;
diff --git a/plugins/TabSRMM/src/nen.h b/plugins/TabSRMM/src/nen.h
index f31509589f..d5e33c1b3a 100644
--- a/plugins/TabSRMM/src/nen.h
+++ b/plugins/TabSRMM/src/nen.h
@@ -39,7 +39,7 @@
 
 #define MODULE "tabSRMM_NEN"
 
-int tabSRMM_ShowPopup(MCONTACT hContact, MEVENT hDbEvent, WORD eventType, int windowOpen, TContainerData *pContainer, HWND hwndChild, const char *szProto);
+int tabSRMM_ShowPopup(MCONTACT hContact, MEVENT hDbEvent, uint16_t eventType, int windowOpen, TContainerData *pContainer, HWND hwndChild, const char *szProto);
 
 #define DEFAULT_COLBACK RGB(255,255,128)
 #define DEFAULT_COLTEXT RGB(0,0,0)
@@ -117,8 +117,8 @@ struct NEN_OPTIONS
 	BOOL   iNoAutoPopup;
 	BOOL   bWindowCheck;
 	int    iLimitPreview;
-	WORD   wMaxRecent;
-	WORD   wMaxFavorites;
+	uint16_t   wMaxRecent;
+	uint16_t   wMaxFavorites;
 	DWORD  dwRemoveMask;
 
 	COLORREF colBackMsg;
diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index b7c79b2421..9dc47521f3 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -1390,7 +1390,7 @@ void CSkin::Load(void)
 			db_set_dw(0, SRMSGMOD_T, _tagSettings[i].szSetting, data);
 			break;
 		case 2:
-			db_set_w(0, SRMSGMOD_T, _tagSettings[i].szSetting, (WORD)data);
+			db_set_w(0, SRMSGMOD_T, _tagSettings[i].szSetting, (uint16_t)data);
 			break;
 		case 5:
 			GetPrivateProfileString(_tagSettings[i].szIniKey, _tagSettings[i].szIniName, L"000000",
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 82338386cc..14b00bea61 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -170,7 +170,7 @@ void TN_TypingMessage(MCONTACT hContact, int iMode)
 
 static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	WORD idCtrl, wNotifyCode;
+	uint16_t idCtrl, wNotifyCode;
 
 	switch (msg) {
 	case WM_INITDIALOG:
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index f9ccd23e20..c902b8ee9a 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -393,7 +393,7 @@ int CMsgDialog::FindRTLLocale()
 	HKL layouts[20];
 	int i, result = 0;
 	LCID lcid;
-	WORD wCtype2[5];
+	uint16_t wCtype2[5];
 
 	if (m_iHaveRTLLang == 0) {
 		memset(layouts, 0, sizeof(layouts));
@@ -474,9 +474,9 @@ struct TOldContainerSettings
 	DWORD   panelheight;
 	int     iSplitterY;
 	wchar_t szTitleFormat[32];
-	WORD    avatarMode;
-	WORD    ownAvatarMode;
-	WORD    autoCloseSeconds;
+	uint16_t    avatarMode;
+	uint16_t    ownAvatarMode;
+	uint16_t    autoCloseSeconds;
 	uint8_t    reserved[10];
 };
 
diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp
index 594d282921..ad60f95536 100644
--- a/plugins/TipperYM/src/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
@@ -187,7 +187,7 @@ void SaveDS(DISPLAYSUBST *ds, int index)
 	mir_snprintf(setting, "Setting%d", index);
 	db_set_s(0, MODULE_ITEMS, setting, ds->szSettingName);
 	mir_snprintf(setting, "TransFuncId%d", index);
-	db_set_dw(0, MODULE_ITEMS, setting, (WORD)ds->iTranslateFuncId);
+	db_set_dw(0, MODULE_ITEMS, setting, (uint16_t)ds->iTranslateFuncId);
 }
 
 bool LoadDI(DISPLAYITEM *di, int index)
diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index 10e3744cfc..65e75e48b4 100644
--- a/plugins/TipperYM/src/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
@@ -1584,7 +1584,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 						if (proto == nullptr)
 							continue;
 
-						WORD wStatus = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE);
+						uint16_t wStatus = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE);
 						WordToStatusDesc(hContact, proto, "Status", swzStatus, 256);
 
 						if (wStatus != ID_STATUS_OFFLINE)
diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp
index 920de10718..efa18fbd4a 100644
--- a/plugins/TipperYM/src/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
@@ -189,7 +189,7 @@ bool CanRetrieveStatusMsg(MCONTACT hContact, char *szProto)
 {
 	if (opt.bGetNewStatusMsg) {
 		int iFlags = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0);
-		WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
+		uint16_t wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
 		if ((CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) && (iFlags & Proto_Status2Flag(wStatus))) {
 			iFlags = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & (PF1_VISLIST | PF1_INVISLIST);
 			if (opt.bDisableIfInvisible && iFlags) {
@@ -216,7 +216,7 @@ wchar_t* GetStatusMessageText(MCONTACT hContact)
 		if (!mir_strcmp(szProto, META_PROTO))
 			hContact = db_mc_getMostOnline(hContact);
 		else {
-			WORD wStatus = Proto_GetStatus(szProto);
+			uint16_t wStatus = Proto_GetStatus(szProto);
 			if (wStatus == ID_STATUS_OFFLINE)
 				return nullptr;
 
@@ -684,7 +684,7 @@ void TruncateString(wchar_t *ptszText)
 	}
 }
 
-wchar_t* GetProtoStatusMessage(char *szProto, WORD wStatus)
+wchar_t* GetProtoStatusMessage(char *szProto, uint16_t wStatus)
 {
 	if (!szProto || wStatus == ID_STATUS_OFFLINE)
 		return nullptr;
diff --git a/plugins/TipperYM/src/subst.h b/plugins/TipperYM/src/subst.h
index 888ca5b9cb..5e11279c5d 100644
--- a/plugins/TipperYM/src/subst.h
+++ b/plugins/TipperYM/src/subst.h
@@ -35,7 +35,7 @@ bool Uid(MCONTACT hContact, char *szProto, wchar_t *buff, int bufflen);
 // get info for status and tray tooltip
 bool DBGetContactSettingAsString(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen); 
 bool CanRetrieveStatusMsg(MCONTACT hContact, char *szProto);
-wchar_t *GetProtoStatusMessage(char *szProto, WORD status);
+wchar_t *GetProtoStatusMessage(char *szProto, uint16_t status);
 wchar_t *GetProtoExtraStatusTitle(char *szProto);
 wchar_t *GetProtoExtraStatusMessage(char *szProto); 
 wchar_t *GetListeningTo(char *szProto);
diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp
index 7fc31e59b4..d5b301ff95 100644
--- a/plugins/TipperYM/src/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
@@ -228,7 +228,7 @@ wchar_t *SecondsToTimeDifference(MCONTACT hContact, const char *szModuleName, co
 
 wchar_t *WordToStatusDesc(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen)
 {
-	WORD wStatus = db_get_w(hContact, szModuleName, szSettingName, ID_STATUS_OFFLINE);
+	uint16_t wStatus = db_get_w(hContact, szModuleName, szSettingName, ID_STATUS_OFFLINE);
 	wchar_t *szStatus = Clist_GetStatusModeDescription(wStatus, 0);
 	wcsncpy_s(buff, bufflen, szStatus, _TRUNCATE);
 	return buff;
@@ -269,8 +269,8 @@ wchar_t *ByteToGender(MCONTACT hContact, const char *szModuleName, const char *s
 wchar_t *WordToCountry(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen)
 {
 	char *szCountryName = nullptr;
-	WORD cid = (WORD)db_get_w(hContact, szModuleName, szSettingName, (WORD)-1);
-	if (cid != (WORD)-1 && ServiceExists(MS_UTILS_GETCOUNTRYBYNUMBER) && (szCountryName = (char *)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, cid, 0)) != nullptr) {
+	uint16_t cid = (uint16_t)db_get_w(hContact, szModuleName, szSettingName, (uint16_t)-1);
+	if (cid != (uint16_t)-1 && ServiceExists(MS_UTILS_GETCOUNTRYBYNUMBER) && (szCountryName = (char *)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, cid, 0)) != nullptr) {
 		if (mir_strcmp(szCountryName, "Unknown") == 0)
 			return nullptr;
 		a2t(szCountryName, buff, bufflen);
@@ -717,12 +717,12 @@ INT_PTR ServiceAddTranslation(WPARAM, LPARAM lParam)
 static DBVTranslation internalTranslations[] =
 {
 	{	NullTranslation,               LPGENW("[No translation]")                                                },
-	{	WordToStatusDesc,              LPGENW("WORD to status description")                                      },
+	{	WordToStatusDesc,              LPGENW("uint16_t to status description")                                      },
 	{	TimestampToTime,               LPGENW("DWORD timestamp to time")                                         },
 	{	TimestampToTimeDifference,     LPGENW("DWORD timestamp to time difference")                              },
 	{	ByteToYesNo,                   LPGENW("uint8_t to Yes/No")                                                  },
 	{	ByteToGender,                  LPGENW("uint8_t to Male/Female (ICQ)")                                       },
-	{	WordToCountry,                 LPGENW("WORD to country name")                                            },
+	{	WordToCountry,                 LPGENW("uint16_t to country name")                                            },
 	{	DwordToIp,                     LPGENW("DWORD to IP address")                                             },
 	{	DayMonthYearToDate,            LPGENW("<prefix>Day|Month|Year to date")                                  },
 	{  DayMonthYearToAge,             LPGENW("<prefix>Day|Month|Year to age")                                   },
@@ -736,8 +736,8 @@ static DBVTranslation internalTranslations[] =
 	{	EmptyXStatusToDefaultName,     LPGENW("xStatus: empty xStatus name to default name")                     },
 	{	SecondsToTimeDifference,       LPGENW("DWORD seconds to time difference")                                },
 	{	TimezoneToTime,                LPGENW("uint8_t timezone to time")                                           },
-	{	ByteToDay,                     LPGENW("WORD to name of a day (0..6, 0 is Sunday)")                       },
-	{	ByteToMonth,                   LPGENW("WORD to name of a month (1..12, 1 is January)")                   },
+	{	ByteToDay,                     LPGENW("uint16_t to name of a day (0..6, 0 is Sunday)")                       },
+	{	ByteToMonth,                   LPGENW("uint16_t to name of a month (1..12, 1 is January)")                   },
 	{	ByteToLanguage,                LPGENW("uint8_t to language (ICQ)")                                          },
 };
 
diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index 8aae437349..c8b1c5bea2 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -167,8 +167,8 @@ int CTooltipNotify::ProtoAck(WPARAM, LPARAM lParam)
 	ACKDATA *ack = (ACKDATA*)lParam;
 	if ((ack == nullptr) || (ack->type != ACKTYPE_STATUS)) return 0;
 
-	WORD wNewStatus = (WORD)ack->lParam;
-	WORD wOldStatus = (UINT_PTR)ack->hProcess;
+	uint16_t wNewStatus = (uint16_t)ack->lParam;
+	uint16_t wOldStatus = (UINT_PTR)ack->hProcess;
 	if (wOldStatus == wNewStatus) return 0; //Useless message.
 
 	char *szProtocol = (char *)ack->szModule;
@@ -218,7 +218,7 @@ int CTooltipNotify::ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 	if (idle && !m_sOptions.bIdle)
 		return 0;
 
-	WORD wNewStatus = cws->value.wVal;
+	uint16_t wNewStatus = cws->value.wVal;
 	switch (wNewStatus) {
 	case ID_STATUS_OFFLINE:
 		if (!m_sOptions.bOffline) return 0;
diff --git a/plugins/TooltipNotify/src/TooltipNotify.h b/plugins/TooltipNotify/src/TooltipNotify.h
index 03e955ce6c..d18b192c39 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.h
+++ b/plugins/TooltipNotify/src/TooltipNotify.h
@@ -52,8 +52,8 @@ private:
 		uint8_t  bAlpha;
 		uint8_t  bLDblClick;
 		uint8_t  bPrefixProto;
-		WORD  wDuration;
-		WORD  wStartupDelay;
+		uint16_t  wDuration;
+		uint16_t  wStartupDelay;
 		uint8_t  bIgnoreNew;
 		uint8_t  bIgnoreUnknown;
 	} m_sOptions;
diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp
index ac81a147ee..f6bb3d5b9e 100644
--- a/plugins/TrafficCounter/src/TrafficCounter.cpp
+++ b/plugins/TrafficCounter/src/TrafficCounter.cpp
@@ -46,8 +46,8 @@ wchar_t *TRAFFIC_COUNTER_WINDOW_CLASS = L"TrafficCounterWnd";
 //TRAFFIC COUNTER
 /*-------------------------------------------------------------------------------------------------------------------*/
 
-WORD notify_send_size = 0;
-WORD notify_recv_size = 0;
+uint16_t notify_send_size = 0;
+uint16_t notify_recv_size = 0;
 //
 // Цвет шрифта и фона
 COLORREF Traffic_BkColor, Traffic_FontColor;
@@ -474,7 +474,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC)
 		// Если есть Variables - рисуем по-новому
 		//-------------
 		RowItemInfo *ItemsList;
-		WORD ItemsNumber, RowsNumber;
+		uint16_t ItemsNumber, RowsNumber;
 
 		// Готовим список строк для Variables и иконок.
 		wchar_t **ExtraText = (wchar_t**)mir_alloc(sizeof(wchar_t*));
diff --git a/plugins/TrafficCounter/src/misc.cpp b/plugins/TrafficCounter/src/misc.cpp
index 83a53fc9b9..581a812da5 100644
--- a/plugins/TrafficCounter/src/misc.cpp
+++ b/plugins/TrafficCounter/src/misc.cpp
@@ -25,10 +25,10 @@ InputString - строка для разбора;
 RowItemsList - список найденных элементов.
 Возвращаемое значение - количество элементов в списках. */
 
-WORD GetRowItems(wchar_t *InputString, RowItemInfo **RowItemsList)
+uint16_t GetRowItems(wchar_t *InputString, RowItemInfo **RowItemsList)
 {
 	wchar_t *begin, *end;
-	WORD c = 0;
+	uint16_t c = 0;
 
 	// Ищем слева открывающую скобку.
 	begin = wcschr(InputString, '{');
@@ -75,7 +75,7 @@ WORD GetRowItems(wchar_t *InputString, RowItemInfo **RowItemsList)
 }
 
 /* Функция возвращает количество дней в указанном месяце указанного года. */
-uint8_t DaysInMonth(uint8_t Month, WORD Year)
+uint8_t DaysInMonth(uint8_t Month, uint16_t Year)
 {
 	switch (Month) {
 	case 1:
@@ -96,9 +96,9 @@ uint8_t DaysInMonth(uint8_t Month, WORD Year)
 
 // Функция определяет день недели по дате
 // 7 - ВС, 1 - ПН и т. д.
-uint8_t DayOfWeek(uint8_t Day, uint8_t Month, WORD Year)
+uint8_t DayOfWeek(uint8_t Day, uint8_t Month, uint16_t Year)
 {
-	WORD a, y, m;
+	uint16_t a, y, m;
 
 	a = (14 - Month) / 12;
 	y = Year - a;
diff --git a/plugins/TrafficCounter/src/misc.h b/plugins/TrafficCounter/src/misc.h
index 672793b80f..d75b09415d 100644
--- a/plugins/TrafficCounter/src/misc.h
+++ b/plugins/TrafficCounter/src/misc.h
@@ -3,7 +3,7 @@
 typedef struct
 {
 	wchar_t Alignment;	// Выравнивание. L - к левой границе, R - к правой.
-	WORD Interval;		// Расстояние, на которое граница строки отстоит от левого края фрейма.
+	uint16_t Interval;		// Расстояние, на которое граница строки отстоит от левого края фрейма.
 	wchar_t *String;		// Собственно строка.
 } RowItemInfo;
 
@@ -12,14 +12,14 @@ typedef struct
 InputString - строка для разбора;
 RowItemsList - список найденных элементов.
 Возвращаемое значение - количество элементов в списках. */
-WORD GetRowItems(wchar_t *InputString, RowItemInfo **RowItemsList);
+uint16_t GetRowItems(wchar_t *InputString, RowItemInfo **RowItemsList);
 
 /* Функция возвращает количество дней в указанном месяце указанного года. */
-uint8_t DaysInMonth(uint8_t Month, WORD Year);
+uint8_t DaysInMonth(uint8_t Month, uint16_t Year);
 
 // Функция определяет день недели по дате
 // 7 - ВС, 1 - ПН и т. д.
-uint8_t DayOfWeek(uint8_t Day, uint8_t Month, WORD Year);
+uint8_t DayOfWeek(uint8_t Day, uint8_t Month, uint16_t Year);
 
 /* Аргументы:
 	Value - количество байт;
diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp
index 51fa29203f..79546b68b8 100644
--- a/plugins/TrafficCounter/src/options.cpp
+++ b/plugins/TrafficCounter/src/options.cpp
@@ -175,10 +175,10 @@ static OPTTREE_OPTION options[] =
 
 static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	WORD i, j;
+	uint16_t i, j;
 	BOOL result;
 	static uint8_t Initialized = 0;
-	static WORD optionCount = 0;
+	static uint16_t optionCount = 0;
 
 	if (!Initialized) {
 		pOptions = options;
diff --git a/plugins/TrafficCounter/src/statistics.cpp b/plugins/TrafficCounter/src/statistics.cpp
index 09180f9162..d3b83a4d2b 100644
--- a/plugins/TrafficCounter/src/statistics.cpp
+++ b/plugins/TrafficCounter/src/statistics.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-WORD Stat_SelAcc; // Выбранные аккаунты в окне статистики
+uint16_t Stat_SelAcc; // Выбранные аккаунты в окне статистики
 
 HWND hListAccs;
 
@@ -415,7 +415,7 @@ void Stat_CheckStatistics(PROTOLIST &p)
 
 		// Последняя запись из статистики понадобится для вычисления новых записей, поэтому копируем её (кроме трафика и времени).
 		memcpy(&htTmp, &p.AllStatistics[p.NumberOfRecords - 1],
-			sizeof(HOURLYSTATS) - 2 * sizeof(DWORD) - sizeof(WORD));
+			sizeof(HOURLYSTATS) - 2 * sizeof(DWORD) - sizeof(uint16_t));
 		// Счётчик времени каждый час должен начинать считать с нуля.
 		p.Total.TimeAtStart = GetTickCount() - stNow.wMilliseconds;
 
@@ -571,7 +571,7 @@ Interval - выбранный интервал;
 ItemNum - номер строки в ListVew;
 SubitemNum - номер колонки, определяет вид информации. */
 
-DWORD Stat_GetItemValue(WORD SelectedAccs, uint8_t Interval, DWORD ItemNum, uint8_t SubItemNum)
+DWORD Stat_GetItemValue(uint16_t SelectedAccs, uint8_t Interval, DWORD ItemNum, uint8_t SubItemNum)
 {
 	DWORD Result = 0;
 	SYSTEMTIME st = { 0 };
@@ -683,7 +683,7 @@ DWORD Stat_GetRecordsNumber(uint8_t AccNum, uint8_t Interval)
 	return Result;
 }
 
-uint8_t Stat_GetEldestAcc(WORD SelectedAccs)
+uint8_t Stat_GetEldestAcc(uint16_t SelectedAccs)
 {
 	uint8_t Result, i;
 
diff --git a/plugins/TrafficCounter/src/statistics.h b/plugins/TrafficCounter/src/statistics.h
index b4b1733362..74916e4237 100644
--- a/plugins/TrafficCounter/src/statistics.h
+++ b/plugins/TrafficCounter/src/statistics.h
@@ -38,8 +38,8 @@ void Stat_UpdateTotalTraffic(HWND, DWORD, DWORD);
 void Stat_CheckStatistics(PROTOLIST &p);
 DWORD Stat_GetStartIndex(uint8_t AccNum, uint8_t Interval, int ItemNumber, SYSTEMTIME *st);
 void Stat_SetAccShift(uint8_t AccNum, uint8_t EldestAccount);
-DWORD Stat_GetItemValue(WORD SelectedAccs, uint8_t Interval, DWORD ItemNum, uint8_t SubitemNum);
+DWORD Stat_GetItemValue(uint16_t SelectedAccs, uint8_t Interval, DWORD ItemNum, uint8_t SubitemNum);
 DWORD Stat_GetRecordsNumber(uint8_t AccNum, uint8_t Interval);
-uint8_t Stat_GetEldestAcc(WORD SelectedAccs);
+uint8_t Stat_GetEldestAcc(uint16_t SelectedAccs);
 
 #endif // _statistics_h
 \ No newline at end of file
diff --git a/plugins/TrafficCounter/src/stdafx.h b/plugins/TrafficCounter/src/stdafx.h
index 635dda7f1f..d180fecf6c 100644
--- a/plugins/TrafficCounter/src/stdafx.h
+++ b/plugins/TrafficCounter/src/stdafx.h
@@ -63,9 +63,9 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 typedef	struct
 {
 	uint8_t Hour, Day, Month;
-	WORD Year;
+	uint16_t Year;
 	DWORD Incoming, Outgoing;
-	WORD Time;
+	uint16_t Time;
 } HOURLYSTATS;
 #pragma pack(pop)
 
@@ -171,7 +171,7 @@ extern COLORREF KeyColor;
 
 extern HGENMENU hTrafficMainMenuItem;
 
-extern WORD Stat_SelAcc;
+extern uint16_t Stat_SelAcc;
 extern OPTTREE_OPTION *pOptions; // Объявлено в модуле TrafficCounter.c.
 extern PROTOLIST OverallInfo;
 
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index cc162d86ff..8b694f83a0 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -43,7 +43,7 @@ static LIST<MsgWndData> gMsgWndList(10, NumericKeySortT);
 
 static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM)
 {
-	WORD countryNumber;
+	uint16_t countryNumber;
 	char *pszProto = Proto_GetBaseAccountName(wParam);
 	/* UserinfoEx */
 	if (countryNumber = db_get_w(wParam, USERINFO, SET_CONTACT_ORIGIN_COUNTRY, 0))
diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp
index adce05f464..cd3e87ab53 100644
--- a/plugins/UserInfoEx/src/classMAnnivDate.cpp
+++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp
@@ -63,7 +63,7 @@ void MAnnivDate::Clear()
 	_strModule.clear();
 	_wFlags = MADF_NONE;
 	_bRemind = BST_INDETERMINATE;
-	_wDaysEarlier = (WORD)-1;
+	_wDaysEarlier = (uint16_t)-1;
 }
 
 /**
@@ -171,9 +171,9 @@ DWORD MAnnivDate::DateStamp() const
  **/
 void MAnnivDate::DateStamp(const DWORD dwStamp)
 {
-	Day((const WORD)((dwStamp & 0xFF000000) >> 24));
-	Month((const WORD)((dwStamp & 0x00FF0000) >> 16));
-	Year((const WORD)(dwStamp & 0x0000FFFF));
+	Day((const uint16_t)((dwStamp & 0xFF000000) >> 24));
+	Month((const uint16_t)((dwStamp & 0x00FF0000) >> 16));
+	Year((const uint16_t)(dwStamp & 0x0000FFFF));
 }
 
 /**
@@ -212,8 +212,8 @@ int MAnnivDate::Age(MTime *pNow)
 
 struct
 {
-	WORD startDays;
-	WORD endDays;
+	uint16_t startDays;
+	uint16_t endDays;
 	LPCTSTR szZodiac;
 	int szZodiacIcon;
 }
@@ -236,7 +236,7 @@ static zodiac[] = {
 
 MZodiac MAnnivDate::Zodiac()
 {
-	const WORD wDays = DayOfYear();
+	const uint16_t wDays = DayOfYear();
 
 	int i;
 	for (i = 0; i < 13 && (wDays < zodiac[i].startDays || wDays > zodiac[i].endDays); i++);
@@ -265,7 +265,7 @@ int MAnnivDate::DBGetReminderOpts(MCONTACT hContact)
 
 	if (_wID == ANID_BIRTHDAY) {
 		_bRemind = db_get_b(hContact, USERINFO, SET_REMIND_BIRTHDAY_ENABLED, BST_INDETERMINATE);
-		_wDaysEarlier = db_get_w(hContact, USERINFO, SET_REMIND_BIRTHDAY_OFFSET, (WORD)-1);
+		_wDaysEarlier = db_get_w(hContact, USERINFO, SET_REMIND_BIRTHDAY_OFFSET, (uint16_t)-1);
 	}
 	else if (_wID <= ANID_LAST) {
 		char pszSetting[MAXSETTING];
@@ -275,11 +275,11 @@ int MAnnivDate::DBGetReminderOpts(MCONTACT hContact)
 		_bRemind = db_get_b(hContact, Module(), pszSetting, BST_INDETERMINATE);
 		// read offset
 		mir_snprintf(pszSetting, "Anniv%dOffset", _wID);
-		_wDaysEarlier = db_get_w(hContact, Module(), pszSetting, (WORD)-1);
+		_wDaysEarlier = db_get_w(hContact, Module(), pszSetting, (uint16_t)-1);
 	}
 	else {
 		_bRemind = BST_INDETERMINATE;
-		_wDaysEarlier = (WORD)-1;
+		_wDaysEarlier = (uint16_t)-1;
 	}
 	return 0;
 }
@@ -302,7 +302,7 @@ int MAnnivDate::DBWriteReminderOpts(MCONTACT hContact)
 		else
 			db_set_b(hContact, USERINFO, SET_REMIND_BIRTHDAY_ENABLED, _bRemind);
 
-		if (_wDaysEarlier == (WORD)-1)
+		if (_wDaysEarlier == (uint16_t)-1)
 			db_unset(hContact, USERINFO, SET_REMIND_BIRTHDAY_OFFSET);
 		else
 			db_set_w(hContact, USERINFO, SET_REMIND_BIRTHDAY_OFFSET, _wDaysEarlier);
@@ -318,7 +318,7 @@ int MAnnivDate::DBWriteReminderOpts(MCONTACT hContact)
 
 		// read offset
 		mir_snprintf(pszSetting, "Anniv%dOffset", _wID);
-		if (_wDaysEarlier == (WORD)-1)
+		if (_wDaysEarlier == (uint16_t)-1)
 			db_unset(hContact, USERINFO, pszSetting);
 		else
 			db_set_w(hContact, USERINFO, pszSetting, _wDaysEarlier);
@@ -345,7 +345,7 @@ int MAnnivDate::DBGetDate(MCONTACT hContact, LPCSTR pszModule, LPCSTR szDay, LPC
 {
 	ZeroDate();
 
-	WORD wtmp = db_get_w(hContact, pszModule, szYear, 0);
+	uint16_t wtmp = db_get_w(hContact, pszModule, szYear, 0);
 	Year(wtmp);
 
 	wtmp = db_get_w(hContact, pszModule, szMonth, 0);
@@ -620,7 +620,7 @@ int MAnnivDate::DBDeleteBirthDate(MCONTACT hContact)
  * return: 0 on success, 1 otherwise
  **/
 
-int MAnnivDate::DBGetAnniversaryDate(MCONTACT hContact, WORD iIndex)
+int MAnnivDate::DBGetAnniversaryDate(MCONTACT hContact, uint16_t iIndex)
 {
 	Clear();
 
@@ -652,7 +652,7 @@ int MAnnivDate::DBGetAnniversaryDate(MCONTACT hContact, WORD iIndex)
  *			pszProto		- basic protocol module
  * return:	0 on success, 1 otherwise
  **/
-int MAnnivDate::DBWriteAnniversaryDate(MCONTACT hContact, WORD wIndex)
+int MAnnivDate::DBWriteAnniversaryDate(MCONTACT hContact, uint16_t wIndex)
 {
 	// date can only be written to db as anniversary if it is not marked as birthday
 	if (wIndex <= ANID_LAST && _wID != ANID_BIRTHDAY) {
@@ -676,7 +676,7 @@ int MAnnivDate::DBWriteAnniversaryDate(MCONTACT hContact, WORD wIndex)
  * automatic backup service
  ***********************************************************************************************************/
 
-static WORD AskUser(MCONTACT hContact, MAnnivDate *pOldCustomDate, MAnnivDate *pNewProtoDate)
+static uint16_t AskUser(MCONTACT hContact, MAnnivDate *pOldCustomDate, MAnnivDate *pNewProtoDate)
 {
 	MSGBOX	MB;
 	wchar_t	 szMsg[MAXDATASIZE];
@@ -753,7 +753,7 @@ int MAnnivDate::BackupBirthday(MCONTACT hContact, LPSTR pszProto, const uint8_t
 			}
 			if (bWantBackup) {
 				if (!lastAnswer || *lastAnswer != IDALL) {
-					WORD rc = AskUser(hContact, this, &mdbNewProto);
+					uint16_t rc = AskUser(hContact, this, &mdbNewProto);
 					if (lastAnswer)
 						*lastAnswer = rc;
 
diff --git a/plugins/UserInfoEx/src/classMAnnivDate.h b/plugins/UserInfoEx/src/classMAnnivDate.h
index a4d0e1b04b..b11713e235 100644
--- a/plugins/UserInfoEx/src/classMAnnivDate.h
+++ b/plugins/UserInfoEx/src/classMAnnivDate.h
@@ -43,12 +43,12 @@ public:
 	} EFlags;
 
 private:
-	WORD	_wID;			// index to anniversary in database or ANID_BIRTHDAY
+	uint16_t	_wID;			// index to anniversary in database or ANID_BIRTHDAY
 	wstring	_strDesc;		// descripes the anniversary (e.g. birthday)
 	string	_strModule;		// the module the anniversary has been read from
-	WORD	_wFlags;		// the flags
+	uint16_t	_wFlags;		// the flags
 	uint8_t	_bRemind;		// per user setting for reminder (0 - disabled, 1 - use local offset, 2 - use global offset)
-	WORD	_wDaysEarlier;	// number of days to the anniversary the user wants to be reminded of this anniversary
+	uint16_t	_wDaysEarlier;	// number of days to the anniversary the user wants to be reminded of this anniversary
 
 	int DBWriteDate(MCONTACT hContact, LPCSTR pszModule, LPCSTR szDay, LPCSTR szMonth, LPCSTR szYear);
 	int DBDeleteDate(MCONTACT hContact, LPCSTR pszModule, LPCSTR szDay, LPCSTR szMonth, LPCSTR szYear) const;
@@ -64,10 +64,10 @@ public:
 	__inline void		Module(LPCSTR pszModule)		{ if (pszModule) _strModule = pszModule; else _strModule.clear(); };
 	__inline uint8_t		RemindOption() const			{ return _bRemind; };
 	__inline void		RemindOption(uint8_t bRemind)		{ if (bRemind <= BST_INDETERMINATE) _bRemind = bRemind; };
-	__inline WORD		RemindOffset() const			{ return _wDaysEarlier; };
-	__inline void		RemindOffset(WORD wOffset)		{ _wDaysEarlier = wOffset; };
-	__inline WORD		Id() const						{ return _wID; };
-	__inline void		Id(WORD wId)					{ if (_wID == ANID_NONE) _wID = wId; };
+	__inline uint16_t		RemindOffset() const			{ return _wDaysEarlier; };
+	__inline void		RemindOffset(uint16_t wOffset)		{ _wDaysEarlier = wOffset; };
+	__inline uint16_t		Id() const						{ return _wID; };
+	__inline void		Id(uint16_t wId)					{ if (_wID == ANID_NONE) _wID = wId; };
 	
 	DWORD				DateStamp() const;
 	void				DateStamp(const DWORD dwStamp);
@@ -80,10 +80,10 @@ public:
 	uint8_t	IsEqual(const SYSTEMTIME &st) const;
 
 	// handling flags
-	__inline WORD	Flags() const			{ return _wFlags; };
-	__inline void	Flags(WORD wFlags)		{ _wFlags = wFlags; };
-	__inline void	SetFlags(WORD wFlag)	{ _wFlags |= wFlag; };
-	__inline void	RemoveFlags(WORD wFlag)	{ _wFlags &= ~wFlag; };
+	__inline uint16_t	Flags() const			{ return _wFlags; };
+	__inline void	Flags(uint16_t wFlags)		{ _wFlags = wFlags; };
+	__inline void	SetFlags(uint16_t wFlag)	{ _wFlags |= wFlag; };
+	__inline void	RemoveFlags(uint16_t wFlag)	{ _wFlags &= ~wFlag; };
 
 	// return diffence of days, ignoring the date
 	int	CompareDays(MTime mt) const;
@@ -95,13 +95,13 @@ public:
 	// read date from database
 	int DBGetDate(MCONTACT hContact, LPCSTR pszModule, LPCSTR szDay, LPCSTR szMonth, LPCSTR szYear);
 	int DBGetDateStamp(MCONTACT hContact, LPCSTR pszModule, LPCSTR pszSetting);
-	int DBGetAnniversaryDate(MCONTACT hContact, WORD iIndex);
+	int DBGetAnniversaryDate(MCONTACT hContact, uint16_t iIndex);
 	int DBGetBirthDate(MCONTACT hContact, LPSTR pszProto = nullptr);
 	int DBGetReminderOpts(MCONTACT hContact);
 
 	// write date to database
 	int DBWriteDateStamp(MCONTACT hContact, LPCSTR pszModule, LPCSTR pszSetting);
-	int DBWriteAnniversaryDate(MCONTACT hContact, WORD wIndex);
+	int DBWriteAnniversaryDate(MCONTACT hContact, uint16_t wIndex);
 	int DBWriteBirthDate(MCONTACT hContact);
 	int DBWriteReminderOpts(MCONTACT hContact);
 
diff --git a/plugins/UserInfoEx/src/classMTime.cpp b/plugins/UserInfoEx/src/classMTime.cpp
index f727c79b07..e78d76192f 100644
--- a/plugins/UserInfoEx/src/classMTime.cpp
+++ b/plugins/UserInfoEx/src/classMTime.cpp
@@ -287,23 +287,23 @@ DWORD	MTime::TimeStamp() const
 	return (DWORD)li.QuadPart;
 }
 
-WORD	MTime::DaysInMonth(const WORD &wMonth)	const
+uint16_t	MTime::DaysInMonth(const uint16_t &wMonth)	const
 {
-	static const WORD wDaysInMonth[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+	static const uint16_t wDaysInMonth[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
 	if (wMonth > 12) return 0;
 	return (IsLeapYear() && wMonth == 2) ? wDaysInMonth[wMonth] + 1 : wDaysInMonth[wMonth];
 }
 
-WORD	MTime::DaysInYear(uint8_t bIgnoreLeap)	const
+uint16_t	MTime::DaysInYear(uint8_t bIgnoreLeap)	const
 {
 	return ((!bIgnoreLeap && IsLeapYear()) ? 366 : 365); 
 };
 
-WORD	MTime::DayOfYear()	const
+uint16_t	MTime::DayOfYear()	const
 {
-	WORD daysResult = 0;
-	WORD i;
+	uint16_t daysResult = 0;
+	uint16_t i;
 
 	for (i = 0; i < _SysTime.wMonth; i++)
 		daysResult += DaysInMonth(i);
@@ -311,7 +311,7 @@ WORD	MTime::DayOfYear()	const
 	return daysResult;
 }
 
-WORD	MTime::AdjustYear(const int nDiffDays)
+uint16_t	MTime::AdjustYear(const int nDiffDays)
 {
 	const int nDay = DayOfYear() + nDiffDays;
 
@@ -322,7 +322,7 @@ WORD	MTime::AdjustYear(const int nDiffDays)
 	return _SysTime.wYear;
 }
 
-WORD	MTime::TimeFormat(LPTSTR ptszTimeFormat, WORD cchTimeFormat)
+uint16_t	MTime::TimeFormat(LPTSTR ptszTimeFormat, uint16_t cchTimeFormat)
 {
 	if (!ptszTimeFormat || !cchTimeFormat)
 		return 0;
@@ -333,7 +333,7 @@ WORD	MTime::TimeFormat(LPTSTR ptszTimeFormat, WORD cchTimeFormat)
 	return cchTimeFormat;
 }
 
-WORD	MTime::DateFormat(LPTSTR ptszTimeFormat, WORD cchTimeFormat)
+uint16_t	MTime::DateFormat(LPTSTR ptszTimeFormat, uint16_t cchTimeFormat)
 {
 	if (!ptszTimeFormat || !cchTimeFormat)
 		return 0;
@@ -344,12 +344,12 @@ WORD	MTime::DateFormat(LPTSTR ptszTimeFormat, WORD cchTimeFormat)
 	return cchTimeFormat;
 }
 
-WORD	MTime::DateFormatAlt(LPTSTR ptszTimeFormat, WORD cchTimeFormat)
+uint16_t	MTime::DateFormatAlt(LPTSTR ptszTimeFormat, uint16_t cchTimeFormat)
 {
 	if (!ptszTimeFormat || !cchTimeFormat)
 		return 0;
 
-	WORD wRes = DateFormat(ptszTimeFormat, cchTimeFormat);
+	uint16_t wRes = DateFormat(ptszTimeFormat, cchTimeFormat);
 	if (wRes != 0)
 		return wRes;
 
@@ -377,7 +377,7 @@ WORD	MTime::DateFormatAlt(LPTSTR ptszTimeFormat, WORD cchTimeFormat)
 	return cchTimeFormat;
 }
 
-WORD	MTime::DateFormatLong(LPTSTR ptszTimeFormat, WORD cchTimeFormat)
+uint16_t	MTime::DateFormatLong(LPTSTR ptszTimeFormat, uint16_t cchTimeFormat)
 {
 	if (!ptszTimeFormat || !cchTimeFormat)
 		return 0;
diff --git a/plugins/UserInfoEx/src/classMTime.h b/plugins/UserInfoEx/src/classMTime.h
index 19fb811cf3..eaf5508130 100644
--- a/plugins/UserInfoEx/src/classMTime.h
+++ b/plugins/UserInfoEx/src/classMTime.h
@@ -53,31 +53,31 @@ public:
 	DWORD       TimeStamp() const;
 	SYSTEMTIME  SystemTime() const { return _SysTime; }
 	
-	WORD DaysInMonth(const WORD &wMonth) const;
-	WORD DaysInYear(uint8_t bIgnoreLeap = FALSE) const;
-	WORD DayOfYear() const;
-	WORD AdjustYear(const int nDiffDays);
-
-	WORD TimeFormat(LPTSTR ptszTimeFormat, WORD cchTimeFormat);
-	WORD DateFormat(LPTSTR ptszTimeFormat, WORD cchTimeFormat);
-	WORD DateFormatAlt(LPTSTR ptszTimeFormat, WORD cchTimeFormat);
-	WORD DateFormatLong(LPTSTR ptszTimeFormat, WORD cchTimeFormat);
+	uint16_t DaysInMonth(const uint16_t &wMonth) const;
+	uint16_t DaysInYear(uint8_t bIgnoreLeap = FALSE) const;
+	uint16_t DayOfYear() const;
+	uint16_t AdjustYear(const int nDiffDays);
+
+	uint16_t TimeFormat(LPTSTR ptszTimeFormat, uint16_t cchTimeFormat);
+	uint16_t DateFormat(LPTSTR ptszTimeFormat, uint16_t cchTimeFormat);
+	uint16_t DateFormatAlt(LPTSTR ptszTimeFormat, uint16_t cchTimeFormat);
+	uint16_t DateFormatLong(LPTSTR ptszTimeFormat, uint16_t cchTimeFormat);
 	
 	// return single attributes
-	__inline WORD DayOfWeek()	const { return _SysTime.wDayOfWeek; }
-	__inline WORD Day() const { return _SysTime.wDay; }
-	__inline WORD Month() const { return _SysTime.wMonth; }
-	__inline WORD Year() const { return _SysTime.wYear; }
-	__inline WORD Hour() const { return _SysTime.wHour; }
-	__inline WORD Minute() const { return _SysTime.wMinute; }
-	__inline WORD Second() const { return _SysTime.wSecond; }
+	__inline uint16_t DayOfWeek()	const { return _SysTime.wDayOfWeek; }
+	__inline uint16_t Day() const { return _SysTime.wDay; }
+	__inline uint16_t Month() const { return _SysTime.wMonth; }
+	__inline uint16_t Year() const { return _SysTime.wYear; }
+	__inline uint16_t Hour() const { return _SysTime.wHour; }
+	__inline uint16_t Minute() const { return _SysTime.wMinute; }
+	__inline uint16_t Second() const { return _SysTime.wSecond; }
 
 	// set single values
-	__inline void Minute(const WORD wMinute) { if (wMinute <= 59) _SysTime.wMinute = wMinute; }
-	__inline void Hour(const WORD wHour) { if (wHour <= 24) _SysTime.wHour = wHour; }
-	__inline void Day(const WORD wDay) { if (wDay <= 31) _SysTime.wDay = wDay; }
-	__inline void Month(const WORD wMonth) { if (wMonth <= 12) _SysTime.wMonth = wMonth; }
-	__inline void Year(const WORD wYear) { _SysTime.wYear = wYear; }
+	__inline void Minute(const uint16_t wMinute) { if (wMinute <= 59) _SysTime.wMinute = wMinute; }
+	__inline void Hour(const uint16_t wHour) { if (wHour <= 24) _SysTime.wHour = wHour; }
+	__inline void Day(const uint16_t wDay) { if (wDay <= 31) _SysTime.wDay = wDay; }
+	__inline void Month(const uint16_t wMonth) { if (wMonth <= 12) _SysTime.wMonth = wMonth; }
+	__inline void Year(const uint16_t wYear) { _SysTime.wYear = wYear; }
 
 	// set value to class
 	void ZeroDate();
diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index 3d809a064e..f4b55fa027 100644
--- a/plugins/UserInfoEx/src/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
@@ -380,7 +380,7 @@ HTREEITEM CPsTree::ShowItem(const int iPageIndex, LPWORD needWidth)
 		// calculate width of treeview
 		if (needWidth && TreeView_GetItemRect(_hWndTree, pti->Hti(), &rc, TRUE) && rc.right > *needWidth)
 		{
-			*needWidth = (WORD)rc.right;
+			*needWidth = (uint16_t)rc.right;
 		}
 	}
 	return tvii.itemex.hItem;
@@ -483,7 +483,7 @@ HTREEITEM CPsTree::MoveItem(HTREEITEM hItem, HTREEITEM hInsertAfter, uint8_t bAs
  * return:	0 on success or 1 otherwise
  **/
 
-WORD CPsTree::SaveItemsState(LPCSTR pszGroup, HTREEITEM hRootItem, int& iItem)
+uint16_t CPsTree::SaveItemsState(LPCSTR pszGroup, HTREEITEM hRootItem, int& iItem)
 {
 	TVITEMEX tvi;
 	tvi.mask = TVIF_CHILDREN|TVIF_STATE|TVIF_PARAM;
@@ -492,7 +492,7 @@ WORD CPsTree::SaveItemsState(LPCSTR pszGroup, HTREEITEM hRootItem, int& iItem)
 	tvi.lParam = (LPARAM)-1;
 
 	// save all visible items
-	WORD numErrors = 0;
+	uint16_t numErrors = 0;
 	for (tvi.hItem = TreeView_GetChild(_hWndTree, hRootItem); TreeView_GetItem(_hWndTree, &tvi); tvi.hItem = TreeView_GetNextSibling(_hWndTree, tvi.hItem)) {
 		auto &it = _pages[tvi.lParam];
 		numErrors += it.DBSaveItemState(pszGroup, iItem++, tvi.state, _dwFlags);
@@ -518,7 +518,7 @@ void CPsTree::SaveState()
 		int iItem = 0;
 
 		// save all visible items
-		WORD numErrors = SaveItemsState(TREE_ROOTITEM, TVGN_ROOT, iItem);
+		uint16_t numErrors = SaveItemsState(TREE_ROOTITEM, TVGN_ROOT, iItem);
 
 		// save all invisible items of the current subtree
 		for (auto &it : _pages) {
@@ -662,7 +662,7 @@ int CPsTree::EndLabelEdit(const uint8_t bSave)
 {
 	wchar_t szEdit[MAX_TINAME];
 	TVITEM tvi;
-	WORD cchEdit;
+	uint16_t cchEdit;
 
 	if (bSave && (cchEdit = Edit_GetText(_hLabelEdit, szEdit, MAX_TINAME)) > 0)
 	{
diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 7d3a5d2c9f..4a25156767 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -467,9 +467,9 @@ int CPsTreeItem::Create(CPsHdr* pPsh, OPTIONSDIALOGPAGE *odp)
  *			dwFlags				- tells what to save
  * return:	handle to new (moved) treeitem if successful or NULL otherwise
  **/
-WORD CPsTreeItem::DBSaveItemState(LPCSTR pszGroup, int iItemPosition, UINT iState, DWORD dwFlags)
+uint16_t CPsTreeItem::DBSaveItemState(LPCSTR pszGroup, int iItemPosition, UINT iState, DWORD dwFlags)
 {
-	WORD numErrors = 0;
+	uint16_t numErrors = 0;
 
 	// save group
 	if ((dwFlags & PSTVF_GROUPS) && (dwFlags & PSTVF_POS_CHANGED))
diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index b8ac49d503..bc19dd5b55 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "stdafx.h"
 
-CBaseCtrl* CAnnivEditCtrl::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
+CBaseCtrl* CAnnivEditCtrl::CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting)
 {
 	CAnnivEditCtrl *ctrl = nullptr;
 
@@ -32,7 +32,7 @@ CBaseCtrl* CAnnivEditCtrl::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
 	return (ctrl);
 }
 
-CAnnivEditCtrl::CAnnivEditCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
+CAnnivEditCtrl::CAnnivEditCtrl(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting)
 	: CBaseCtrl(hDlg, idCtrl, pszSetting)
 {
 	_hwndDlg = hDlg;
@@ -67,7 +67,7 @@ CAnnivEditCtrl::CAnnivEditCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
 
 CAnnivEditCtrl::~CAnnivEditCtrl()
 {
-	WORD i;
+	uint16_t i;
 
 	if (_pDates != nullptr) 
 	{
@@ -93,7 +93,7 @@ void CAnnivEditCtrl::Release()
  * param:	wIndex	- index to desired item
  * return:	TRUE if item is valid, FALSE otherwise
  **/
-uint8_t CAnnivEditCtrl::ItemValid(WORD wIndex) const
+uint8_t CAnnivEditCtrl::ItemValid(uint16_t wIndex) const
 {
 	return (_pDates != nullptr && wIndex < _numDates && _pDates[wIndex] != nullptr);
 }
@@ -164,9 +164,9 @@ void CAnnivEditCtrl::EnableCurrentItem()
  * return:	if an date with the wId was found - iterator to item,
  *			NULL otherwise
  **/
-MAnnivDate* CAnnivEditCtrl::FindDateById(const WORD wId)
+MAnnivDate* CAnnivEditCtrl::FindDateById(const uint16_t wId)
 {
-	WORD i;
+	uint16_t i;
 
 	if (_pDates != nullptr) {
 		for (i = 0; i < _numDates; i++) {
@@ -225,7 +225,7 @@ INT_PTR CAnnivEditCtrl::AddDate(MAnnivDate &mda)
  *			wIndex		- index of the item to delete
  * return:	0 on success 1 otherwise
  **/
-INT_PTR CAnnivEditCtrl::DeleteDate(WORD wIndex)
+INT_PTR CAnnivEditCtrl::DeleteDate(uint16_t wIndex)
 {
 	if (!ItemValid(wIndex)) return 1;
 	
@@ -246,7 +246,7 @@ INT_PTR CAnnivEditCtrl::DeleteDate(WORD wIndex)
 		}
 
 		_pDates[wIndex]->RemindOption(BST_INDETERMINATE);
-		_pDates[wIndex]->RemindOffset((WORD)-1);
+		_pDates[wIndex]->RemindOffset((uint16_t)-1);
 
 		_pDates[wIndex]->RemoveFlags(MAnnivDate::MADF_HASCUSTOM);
 		_pDates[wIndex]->SetFlags(MAnnivDate::MADF_CHANGED|MAnnivDate::MADF_REMINDER_CHANGED);
@@ -292,7 +292,7 @@ INT_PTR CAnnivEditCtrl::DBGetAnniversaries(MCONTACT hContact)
 {
 	MAnnivDate mda;
 
-	WORD i;
+	uint16_t i;
 	uint8_t bChanged = FALSE;
 
 	for (i = 0; i < ANID_LAST && !mda.DBGetAnniversaryDate(hContact, i); i++) {
@@ -348,7 +348,7 @@ INT_PTR CAnnivEditCtrl::DBWriteAnniversaries(MCONTACT hContact)
 {
 	const LPCSTR szPrefix[] = { "Reminder", "Offset", "Desc", "Day", "Month", "Year", "Stamp", "Date" };
 	CHAR szSet0[MAXSETTING];
-	WORD i, ret, ofs, wIndex = 0;
+	uint16_t i, ret, ofs, wIndex = 0;
 
 	for (i = 0; i < _numDates; i++) {
 		if (
@@ -381,7 +381,7 @@ INT_PTR CAnnivEditCtrl::DBWriteAnniversaries(MCONTACT hContact)
  *			wIndex		- index of the item to delete
  * return:	0 on success 1 otherwise
  **/
-INT_PTR CAnnivEditCtrl::SetCurSel(WORD wIndex)
+INT_PTR CAnnivEditCtrl::SetCurSel(uint16_t wIndex)
 {
 	uint8_t bEnabled = ItemValid(wIndex);
 
@@ -431,7 +431,7 @@ void CAnnivEditCtrl::OnMenuPopup()
 	POINT pt = { 0, 0 };
 	RECT rc;
 	HMENU hMenu;
-	WORD i;
+	uint16_t i;
 
 	if (hMenu = CreatePopupMenu()) {
 		SetFocus(_hBtnMenu);
@@ -545,7 +545,7 @@ void CAnnivEditCtrl::OnReminderChecked()
 		}
 		else if (IsDlgButtonChecked(_hwndDlg, RADIO_REMIND2))
 		{
-			if (pCurrent->RemindOffset() == (WORD)-1)
+			if (pCurrent->RemindOffset() == (uint16_t)-1)
 			{
 				_itow(g_plugin.getByte(SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET), buf, 10);
 			}
diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.h b/plugins/UserInfoEx/src/ctrl_annivedit.h
index 520dd525db..bccfa3e134 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.h
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.h
@@ -36,10 +36,10 @@ class CAnnivEditCtrl : public CBaseCtrl
 	uint8_t	_ReminderEnabled;
 
 	MAnnivDate** _pDates;
-	WORD	_numDates;
-	WORD	_curDate;
+	uint16_t	_numDates;
+	uint16_t	_curDate;
 
-	uint8_t ItemValid(WORD wIndex) const;
+	uint8_t ItemValid(uint16_t wIndex) const;
 	uint8_t CurrentItemValid() const;
 
 	INT_PTR DBGetBirthDay(MCONTACT hContact, LPCSTR pszProto);
@@ -48,25 +48,25 @@ class CAnnivEditCtrl : public CBaseCtrl
 	INT_PTR DBGetAnniversaries(MCONTACT hContact);
 	INT_PTR DBWriteAnniversaries(MCONTACT hContact);
 
-	CAnnivEditCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszSetting);
+	CAnnivEditCtrl(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting);
 	~CAnnivEditCtrl();
 
 public:
 
 	MAnnivDate* Current() { return CurrentItemValid() ? _pDates[_curDate] : nullptr; };
-	WORD				CurrentIndex() const { return _curDate; };
-	WORD				NumDates() const { return _numDates; };
+	uint16_t				CurrentIndex() const { return _curDate; };
+	uint16_t				NumDates() const { return _numDates; };
 	uint8_t		 ReminderEnabled() const { return _ReminderEnabled; };
 
-	MAnnivDate* FindDateById(const WORD wId);
+	MAnnivDate* FindDateById(const uint16_t wId);
 
 	void				EnableCurrentItem();
 	void				EnableReminderCtrl(uint8_t bEnabled);
 
-	INT_PTR		 SetCurSel(WORD wIndex);
+	INT_PTR		 SetCurSel(uint16_t wIndex);
 
 	INT_PTR		 AddDate(MAnnivDate &mda);
-	INT_PTR		 DeleteDate(WORD wIndex);
+	INT_PTR		 DeleteDate(uint16_t wIndex);
 
 	void				SetZodiacAndAge(MAnnivDate *mt);
 
@@ -81,10 +81,10 @@ public:
 	 **/
 	static FORCEINLINE CAnnivEditCtrl* GetObj(HWND hCtrl) 
 		{ return (CAnnivEditCtrl*) GetUserData(hCtrl); }
-	static FORCEINLINE CAnnivEditCtrl* GetObj(HWND hDlg, WORD idCtrl)
+	static FORCEINLINE CAnnivEditCtrl* GetObj(HWND hDlg, uint16_t idCtrl)
 		{ return GetObj(GetDlgItem(hDlg, idCtrl)); }
 
-	static CBaseCtrl* CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting);
+	static CBaseCtrl* CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting);
 
 	virtual void	Release();
 	virtual BOOL	OnInfoChanged(MCONTACT hContact, LPCSTR pszProto);
diff --git a/plugins/UserInfoEx/src/ctrl_base.cpp b/plugins/UserInfoEx/src/ctrl_base.cpp
index cc278096ef..9a2780cf60 100644
--- a/plugins/UserInfoEx/src/ctrl_base.cpp
+++ b/plugins/UserInfoEx/src/ctrl_base.cpp
@@ -40,7 +40,7 @@ void Ctrl_InitTextColours()
 	clrMeta = g_plugin.getDword(SET_PROPSHEET_CLRMETA, RGB(120, 40, 130));
 }
 
-INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, WORD wFlags)
+INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, uint16_t wFlags)
 {
 	// OLD stuff
 	SetTextColor(hdc, 
@@ -82,7 +82,7 @@ CBaseCtrl::CBaseCtrl()
  *
  *
  **/
-CBaseCtrl::CBaseCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
+CBaseCtrl::CBaseCtrl(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting)
 {
 	memset(this, 0, sizeof(*this));
 	_cbSize = sizeof(CBaseCtrl);
@@ -98,7 +98,7 @@ CBaseCtrl::CBaseCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
  *
  *
  **/
-CBaseCtrl::CBaseCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszModule, LPCSTR pszSetting)
+CBaseCtrl::CBaseCtrl(HWND hDlg, uint16_t idCtrl, LPCSTR pszModule, LPCSTR pszSetting)
 {
 	memset(this, 0, sizeof(*this));
 	_cbSize		= sizeof(CBaseCtrl);
@@ -255,7 +255,7 @@ void CCtrlList::OnApply(MCONTACT hContact, LPCSTR pszProto)
  *
  *
  **/
-void CCtrlList::OnChangedByUser(WORD idCtrl, WORD wChangedMsg)
+void CCtrlList::OnChangedByUser(uint16_t idCtrl, uint16_t wChangedMsg)
 {
 	// prefilter messages to avoid unessesary search operations
 	switch (wChangedMsg)
diff --git a/plugins/UserInfoEx/src/ctrl_base.h b/plugins/UserInfoEx/src/ctrl_base.h
index fe9c7fe99f..5cdab6cdb1 100644
--- a/plugins/UserInfoEx/src/ctrl_base.h
+++ b/plugins/UserInfoEx/src/ctrl_base.h
@@ -43,12 +43,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 typedef struct TCtrlInfo {
 	uint8_t	nType;
-	WORD	wFlags;
+	uint16_t	wFlags;
 } CTRL, *LPCTRL;
 
 // for compatibility with old styled controls
 void             Ctrl_InitTextColours();
-INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, WORD wFlags);
+INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, uint16_t wFlags);
 
 /***********************************************************************************************************
  * CBaseCtrl declaration
@@ -56,7 +56,7 @@ INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, WORD wFlags);
 
 union CCtrlFlags 
 {
-	WORD W;
+	uint16_t W;
 	struct CBits 
 	{
 		bool	hasChanged : 1;
@@ -82,7 +82,7 @@ protected:
 	
 	CCtrlFlags		_Flags; 
 	HWND			_hwnd;
-	WORD			_idCtrl;
+	uint16_t			_idCtrl;
 	LPCSTR			_pszModule;
 	LPCSTR			_pszSetting;
 	LPTSTR			_pszValue;
@@ -95,8 +95,8 @@ protected:
 	 * @return	nothing
 	 **/
 	CBaseCtrl();
-	CBaseCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszSetting);
-	CBaseCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszModule, LPCSTR pszSetting);
+	CBaseCtrl(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting);
+	CBaseCtrl(HWND hDlg, uint16_t idCtrl, LPCSTR pszModule, LPCSTR pszSetting);
 
 	/**
 	 * Private constructure is to force the class used as base class only.
@@ -120,7 +120,7 @@ public:
 	 *
 	 *
 	 **/
-	static FORCEINLINE CBaseCtrl* GetObj(HWND hDlg, WORD idCtrl)
+	static FORCEINLINE CBaseCtrl* GetObj(HWND hDlg, uint16_t idCtrl)
 		{ return GetObj(GetDlgItem(hDlg, idCtrl)); }
 	
 	/**
@@ -172,7 +172,7 @@ public:
 	 *
 	 * @return	nothing
 	 **/
-	virtual void OnChangedByUser(WORD) { }
+	virtual void OnChangedByUser(uint16_t) { }
 
 	virtual void OnReset() { }
 
@@ -209,7 +209,7 @@ public:
 	void		OnReset();
 	BOOL		OnInfoChanged(MCONTACT hContact, LPCSTR pszProto);
 	void		OnApply(MCONTACT hContact, LPCSTR pszProto);
-	void		OnChangedByUser(WORD idCtrl, WORD wChangedMsg);
+	void		OnChangedByUser(uint16_t idCtrl, uint16_t wChangedMsg);
 	INT_PTR OnSetTextColour(HWND hCtrl, HDC hdc);
 };
 
diff --git a/plugins/UserInfoEx/src/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp
index a6028aa75a..cffd91bd88 100644
--- a/plugins/UserInfoEx/src/ctrl_button.cpp
+++ b/plugins/UserInfoEx/src/ctrl_button.cpp
@@ -156,7 +156,7 @@ static void __fastcall PaintThemeButton(BTNCTRL *ctl, HDC hdcMem, LPRECT rcClien
 {
 	RECT rcText = { 0, 0, 0, 0 };
 	wchar_t wszText[MAX_PATH] = { 0 };
-	WORD ccText;
+	uint16_t ccText;
 
 	// Draw the flat button
 	if ((ctl->dwStyle & MBS_FLAT) && ctl->hThemeToolbar) {
@@ -255,7 +255,7 @@ static void __fastcall PaintButton(BTNCTRL *ctl, HDC hdcMem, LPRECT rcClient)
 {
 	RECT rcText = { 0, 0, 0, 0 };
 	wchar_t szText[MAX_PATH] = { 0 };
-	WORD ccText;
+	uint16_t ccText;
 
 	// Draw the flat button
 	if (ctl->dwStyle & MBS_FLAT) {
diff --git a/plugins/UserInfoEx/src/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp
index b686f41664..e2d7bdeaf1 100644
--- a/plugins/UserInfoEx/src/ctrl_combo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_combo.cpp
@@ -28,13 +28,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * @param		hDlg			- HWND of the owning propertysheet page
  * @param		idCtrl			- the ID of the control to associate with this class's instance
  * @param		pszSetting		- the database setting to be handled by this class
- * @param		bDBDataType		- datatype of of the associated database setting (WORD, DWORD, ...)
+ * @param		bDBDataType		- datatype of of the associated database setting (uint16_t, DWORD, ...)
  * @param		pList			- pointer to a LPIDSTRLIST list, which holds the items to insert into the combobox.
  * @param		nListCount		- number of items in the list
  *
  * @return	pointer of the newly created CCombo object.
  **/
-CBaseCtrl* CCombo::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting, uint8_t bDBDataType, LPIDSTRLIST pList, int nListCount)
+CBaseCtrl* CCombo::CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting, uint8_t bDBDataType, LPIDSTRLIST pList, int nListCount)
 {
 	return new CCombo(hDlg, idCtrl, pszSetting, bDBDataType, pList, nListCount);
 }
@@ -45,13 +45,13 @@ CBaseCtrl* CCombo::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting, uint8_t
  * @param		hDlg			- HWND of the owning propertysheet page
  * @param		idCtrl			- the ID of the control to associate with this class's instance
  * @param		pszSetting		- the database setting to be handled by this class
- * @param		bDBDataType		- datatype of of the associated database setting (WORD, DWORD, ...)
+ * @param		bDBDataType		- datatype of of the associated database setting (uint16_t, DWORD, ...)
  * @param		pList			- pointer to a LPIDSTRLIST list, which holds the items to insert into the combobox.
  * @param		nListCount		- number of items in the list
  *
  * @return	nothing
  **/
-CCombo::CCombo(HWND hDlg, WORD idCtrl, LPCSTR pszSetting, uint8_t bDBDataType, LPIDSTRLIST pList, int nListCount)
+CCombo::CCombo(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting, uint8_t bDBDataType, LPIDSTRLIST pList, int nListCount)
 	: CBaseCtrl(hDlg, idCtrl, pszSetting)
 {
 	_curSel = CB_ERR;
@@ -172,7 +172,7 @@ BOOL CCombo::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto)
 		db_free(&dbv);
 		ComboBox_SetCurSel(_hwnd, iVal);
 		_curSel = ComboBox_GetCurSel(_hwnd);
-		SendMessage(GetParent(_hwnd), WM_COMMAND, MAKEWPARAM((WORD)this->_idCtrl, (WORD)CBN_SELCHANGE), (LPARAM)_hwnd);
+		SendMessage(GetParent(_hwnd), WM_COMMAND, MAKEWPARAM((uint16_t)this->_idCtrl, (uint16_t)CBN_SELCHANGE), (LPARAM)_hwnd);
 	}
 	return _Flags.B.hasChanged;
 }
@@ -229,7 +229,7 @@ void CCombo::OnApply(MCONTACT hContact, LPCSTR pszProto)
  * The user changed combobox selection, so mark it changed.
  *
  **/
-void CCombo::OnChangedByUser(WORD wChangedMsg)
+void CCombo::OnChangedByUser(uint16_t wChangedMsg)
 {
 	if (wChangedMsg == CBN_SELCHANGE) {
 		int c = ComboBox_GetCurSel(_hwnd);
diff --git a/plugins/UserInfoEx/src/ctrl_combo.h b/plugins/UserInfoEx/src/ctrl_combo.h
index 9bb5bb5348..618a5441fa 100644
--- a/plugins/UserInfoEx/src/ctrl_combo.h
+++ b/plugins/UserInfoEx/src/ctrl_combo.h
@@ -40,7 +40,7 @@ class CCombo : public CBaseCtrl
 	 *
 	 * @return	nothing
 	 **/
-	CCombo(HWND hDlg, WORD idCtrl, LPCSTR pszSetting, uint8_t bDBDataType, LPIDSTRLIST pList, int nListCount);
+	CCombo(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting, uint8_t bDBDataType, LPIDSTRLIST pList, int nListCount);
 
 	int Find(int nIndex) const;
 	int Find(LPTSTR ptszItemLabel) const;
@@ -55,15 +55,15 @@ public:
 	 **/
 	static FORCEINLINE CCombo* GetObj(HWND hCtrl) 
 		{ return (CCombo*) GetUserData(hCtrl); }
-	static FORCEINLINE CCombo* GetObj(HWND hDlg, WORD idCtrl)
+	static FORCEINLINE CCombo* GetObj(HWND hDlg, uint16_t idCtrl)
 		{ return GetObj(GetDlgItem(hDlg, idCtrl)); }
 
-	static CBaseCtrl* CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting, uint8_t bDBDataType, LPIDSTRLIST pList, int nListCount);
+	static CBaseCtrl* CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting, uint8_t bDBDataType, LPIDSTRLIST pList, int nListCount);
 
 	virtual void	Release();
 	virtual BOOL	OnInfoChanged(MCONTACT hContact, LPCSTR pszProto);
 	virtual void	OnApply(MCONTACT hContact, LPCSTR pszProto);
-	virtual void	OnChangedByUser(WORD wChangedMsg);
+	virtual void	OnChangedByUser(uint16_t wChangedMsg);
 };
 
 #endif /* _UI_CTRL_COMBO_INCLUDE_ */
 \ No newline at end of file
diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index e5a970fe72..df0651487d 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -32,8 +32,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 typedef struct TCbExItem
 {
-	WORD	wMask;
-	WORD	wFlags;
+	uint16_t	wMask;
+	uint16_t	wFlags;
 	DWORD	dwID;
 	wchar_t	szCat[MAX_CAT];
 	LPTSTR	pszVal;
@@ -68,7 +68,7 @@ static int compareProc(LPCVOID cbi1, LPCVOID cbi2)
 	return mir_wstrcmp(((LPCBEXITEMINTERN)cbi1)->szCat, ((LPCBEXITEMINTERN)cbi2)->szCat);
 }
 
-static int CheckPhoneSyntax(LPTSTR pszSrc, LPTSTR szNumber, WORD cchNumber, int& errorPos)
+static int CheckPhoneSyntax(LPTSTR pszSrc, LPTSTR szNumber, uint16_t cchNumber, int& errorPos)
 {
 	int lenNum = 0;
 	uint8_t	hasLeftBreaket = FALSE,
@@ -440,9 +440,9 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 			**/
 	case WM_CREATE:
 		{
-			WORD wHeight = (WORD)(cbex->rect.bottom - cbex->rect.top);
-			WORD wWidth = 130;
-			WORD x = 0;
+			uint16_t wHeight = (uint16_t)(cbex->rect.bottom - cbex->rect.top);
+			uint16_t wWidth = 130;
+			uint16_t x = 0;
 
 			if (!(cbex->hBtnEdit = CreateWindowEx(WS_EX_NOPARENTNOTIFY,
 				UINFOBUTTONCLASS,
@@ -471,7 +471,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 				return FALSE;
 			}
 			x += wWidth + 2;
-			wWidth = (WORD)(cbex->rect.right - cbex->rect.left - x - (2 * (wHeight + 2)));
+			wWidth = (uint16_t)(cbex->rect.right - cbex->rect.left - x - (2 * (wHeight + 2)));
 			if (!(cbex->hEdit = CreateWindowEx(WS_EX_CLIENTEDGE,
 				L"Edit",
 				nullptr,
@@ -661,7 +661,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		case BTN_ADD:
 			if (HIWORD(wParam) == BN_CLICKED) {
 				DLGPROC dlgProc;
-				WORD dlgID;
+				uint16_t dlgID;
 				wchar_t szCat[MAX_CAT] = { 0 };
 				wchar_t szVal[MAXDATASIZE] = { 0 };
 				CBEXITEM cbi;
@@ -718,7 +718,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		case BTN_EDIT:
 			if (HIWORD(wParam) == BN_CLICKED) {
 				DLGPROC dlgProc;
-				WORD dlgID;
+				uint16_t dlgID;
 				wchar_t szCat[MAX_CAT] = { 0 };
 				wchar_t szVal[MAXDATASIZE] = { 0 };
 				CBEXITEM cbi;
@@ -1331,7 +1331,7 @@ int CtrlContactAddItemFromDB(
 int CtrlContactAddMyItemsFromDB(
 	HWND hCtrl,
 	int iIcon,
-	WORD wForcedFlags,
+	uint16_t wForcedFlags,
 	MCONTACT hContact,
 	LPCSTR pszModule,
 	LPCSTR pszProto,
@@ -1341,7 +1341,7 @@ int CtrlContactAddMyItemsFromDB(
 	CBEXITEM cbi;
 	DBVARIANT dbv;
 	CHAR pszSetting[MAXSETTING];
-	WORD i;
+	uint16_t i;
 	LPTSTR sms;
 	int bAnyItemIsChanged = 0;
 
diff --git a/plugins/UserInfoEx/src/ctrl_contact.h b/plugins/UserInfoEx/src/ctrl_contact.h
index df3e9f8858..1313428b6a 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.h
+++ b/plugins/UserInfoEx/src/ctrl_contact.h
@@ -56,21 +56,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 struct CBEXITEM
 {
-	WORD     wMask;		// determines which element of this structure is valid
-	WORD     wFlags;	 // standard control flags
+	uint16_t     wMask;		// determines which element of this structure is valid
+	uint16_t     wFlags;	 // standard control flags
 	int      iItem;		// position of the item in the data array
 	DWORD	   dwID;		 // unique number for each setting read from db to identify it, new entries have dwID = 0
 	LPTSTR   pszCat;	 // pointer to a descriptive category string to set or retrieve for the data entry
-	WORD     ccCat;
+	uint16_t     ccCat;
 	LPTSTR   pszVal;
-	WORD     ccVal;
+	uint16_t     ccVal;
 	int      iIcon;
 };
 
 int CtrlContactLoadModule();
 int CtrlContactUnLoadModule();
 int CtrlContactAddItemFromDB(HWND hCtrl, int iIcon, LPTSTR szItem, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szSettingVal);
-int CtrlContactAddMyItemsFromDB(HWND hCtrl, int iIcon, WORD wForcedFlags, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szFormatCat, LPCSTR szFormatVal);
+int CtrlContactAddMyItemsFromDB(HWND hCtrl, int iIcon, uint16_t wForcedFlags, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szFormatCat, LPCSTR szFormatVal);
 int CtrlContactWriteItemToDB(HWND hCtrl, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR pszSetting);
 int CtrlContactWriteMyItemsToDB(HWND hCtrl, int iFirstItem, MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR szFormatCat, LPCSTR szFormatVal);
 
diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp
index e0af506783..12537bbfcd 100644
--- a/plugins/UserInfoEx/src/ctrl_edit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_edit.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * @return	This static method returns the pointer of the created object.
  **/
 
-CBaseCtrl* CEditCtrl::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting, uint8_t dbType)
+CBaseCtrl* CEditCtrl::CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting, uint8_t dbType)
 {
 	CEditCtrl *ctrl = new CEditCtrl(hDlg, idCtrl, USERINFO, pszSetting);
 	if (ctrl)
@@ -53,7 +53,7 @@ CBaseCtrl* CEditCtrl::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting, uint8
  * @return	This static method returns the pointer of the created object.
  **/
 
-CBaseCtrl* CEditCtrl::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszModule, LPCSTR pszSetting, uint8_t dbType)
+CBaseCtrl* CEditCtrl::CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszModule, LPCSTR pszSetting, uint8_t dbType)
 {
 	CEditCtrl *ctrl = new CEditCtrl(hDlg, idCtrl, pszModule, pszSetting);
 	if (ctrl)
@@ -66,7 +66,7 @@ CBaseCtrl* CEditCtrl::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszModule, LPCSTR
  *
  *
  **/
-CEditCtrl::CEditCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszModule, LPCSTR pszSetting)
+CEditCtrl::CEditCtrl(HWND hDlg, uint16_t idCtrl, LPCSTR pszModule, LPCSTR pszSetting)
 	: CBaseCtrl(hDlg, idCtrl, pszModule, pszSetting)
 {
 	SendDlgItemMessage(hDlg, idCtrl, EM_LIMITTEXT, 0x7fFFffFF, 0L);
@@ -183,7 +183,7 @@ void CEditCtrl::OnApply(MCONTACT hContact, LPCSTR pszProto)
 						break;
 
 					case DBVT_WORD:
-						dbv.wVal = (WORD)wcstol(val, nullptr, 10);
+						dbv.wVal = (uint16_t)wcstol(val, nullptr, 10);
 						break;
 
 					case DBVT_DWORD:
@@ -232,7 +232,7 @@ void CEditCtrl::OnApply(MCONTACT hContact, LPCSTR pszProto)
  *
  * @return	nothing
  **/
-void CEditCtrl::OnChangedByUser(WORD wChangedMsg)
+void CEditCtrl::OnChangedByUser(uint16_t wChangedMsg)
 {
 	if ((wChangedMsg == EN_UPDATE) || (wChangedMsg == EN_CHANGE)) {
 		DWORD cch = GetWindowTextLength(_hwnd);
diff --git a/plugins/UserInfoEx/src/ctrl_edit.h b/plugins/UserInfoEx/src/ctrl_edit.h
index a384bafbe6..773f5e1efc 100644
--- a/plugins/UserInfoEx/src/ctrl_edit.h
+++ b/plugins/UserInfoEx/src/ctrl_edit.h
@@ -39,7 +39,7 @@ class CEditCtrl : public CBaseCtrl
 	 *
 	 * @return	nothing
 	 **/
-	CEditCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszModule, LPCSTR pszSetting);
+	CEditCtrl(HWND hDlg, uint16_t idCtrl, LPCSTR pszModule, LPCSTR pszSetting);
 
 public:
 
@@ -49,17 +49,17 @@ public:
 	 **/
 	static FORCEINLINE CEditCtrl* GetObj(HWND hCtrl) 
 		{ return (CEditCtrl*) GetUserData(hCtrl); }
-	static FORCEINLINE CEditCtrl* GetObj(HWND hDlg, WORD idCtrl)
+	static FORCEINLINE CEditCtrl* GetObj(HWND hDlg, uint16_t idCtrl)
 		{ return GetObj(GetDlgItem(hDlg, idCtrl)); }
 
-	static CBaseCtrl* CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting, uint8_t dbType);
-	static CBaseCtrl* CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszModule, LPCSTR pszSetting, uint8_t dbType);
+	static CBaseCtrl* CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting, uint8_t dbType);
+	static CBaseCtrl* CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszModule, LPCSTR pszSetting, uint8_t dbType);
 
 	virtual void	Release();
 	virtual void	OnReset();
 	virtual BOOL	OnInfoChanged(MCONTACT hContact, LPCSTR pszProto);
 	virtual void	OnApply(MCONTACT hContact, LPCSTR pszProto);
-	virtual void	OnChangedByUser(WORD wChangedMsg);
+	virtual void	OnChangedByUser(uint16_t wChangedMsg);
 
 	void		OpenUrl();
 	LRESULT LinkNotificationHandler(ENLINK* lnk);
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
index 12d41473f7..f28c7812a0 100644
--- a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * @return	CTzCombo*
  **/
-CBaseCtrl* CTzCombo::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
+CBaseCtrl* CTzCombo::CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting)
 {
 	HWND hCtrl = GetDlgItem(hDlg, idCtrl);
 
@@ -58,7 +58,7 @@ CTzCombo::CTzCombo() : CBaseCtrl()
  *
  *
  **/
-CTzCombo::CTzCombo(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
+CTzCombo::CTzCombo(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting)
 	: CBaseCtrl(hDlg, idCtrl, pszSetting)
 {
 	_curSel = CB_ERR;
@@ -159,7 +159,7 @@ void CTzCombo::OnApply(MCONTACT hContact, LPCSTR pszProto)
  *
  * @return	nothing
  **/
-void CTzCombo::OnChangedByUser(WORD wChangedMsg)
+void CTzCombo::OnChangedByUser(uint16_t wChangedMsg)
 {
 	if (wChangedMsg == CBN_SELCHANGE) {
 		int c = ComboBox_GetCurSel(_hwnd);
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.h b/plugins/UserInfoEx/src/ctrl_tzcombo.h
index daa48907bd..4eba24f871 100644
--- a/plugins/UserInfoEx/src/ctrl_tzcombo.h
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.h
@@ -30,7 +30,7 @@ class CTzCombo : public CBaseCtrl
 	int _curSel;											//selectet combo index
 	
 	CTzCombo();
-	CTzCombo(HWND hDlg, WORD idCtrl, LPCSTR pszSetting);
+	CTzCombo(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting);
 
 	int Find(LPTIME_ZONE_INFORMATION pTimeZone) const;		//new core tz interface
 
@@ -38,16 +38,16 @@ public:
 
 	static FORCEINLINE CTzCombo* GetObj(HWND hCtrl) 
 		{ return (CTzCombo*) GetUserData(hCtrl); }
-	static FORCEINLINE CTzCombo* GetObj(HWND hDlg, WORD idCtrl)
+	static FORCEINLINE CTzCombo* GetObj(HWND hDlg, uint16_t idCtrl)
 		{ return GetObj(GetDlgItem(hDlg, idCtrl)); }
 
-	static CBaseCtrl* CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting);
+	static CBaseCtrl* CreateObj(HWND hDlg, uint16_t idCtrl, LPCSTR pszSetting);
 
 	virtual void	Release();
 //	virtual void	OnReset() {};
 	virtual BOOL	OnInfoChanged(MCONTACT hContact, LPCSTR pszProto);
 	virtual void	OnApply(MCONTACT hContact, LPCSTR pszProto);
-	virtual void	OnChangedByUser(WORD wChangedMsg);
+	virtual void	OnChangedByUser(uint16_t wChangedMsg);
 
 	void			GetTime(LPTSTR szTime, int cchTime);
 };
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index 86a6fe9dc1..de64451ba9 100644
--- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
@@ -75,7 +75,7 @@ class CAnnivList
 
 	struct CFilter
 	{
-		WORD	wDaysBefore = (WORD)-1;
+		uint16_t	wDaysBefore = (uint16_t)-1;
 		uint8_t	bFilterIndex = 0;
 		LPSTR	pszProto = nullptr;
 		LPTSTR pszAnniv = nullptr;
@@ -85,7 +85,7 @@ class CAnnivList
 	{
 		MCONTACT	_hContact;
 		MAnnivDate _pDate;
-		WORD		_wDaysBefore;
+		uint16_t		_wDaysBefore;
 		uint8_t		_wReminderState;
 
 		CItemData(MCONTACT hContact, MAnnivDate &date) :
@@ -187,7 +187,7 @@ class CAnnivList
 			EndDeferWindowPos(_hdWnds);
 		}
 
-		void MoveCtrl(WORD idCtrl, int anchors)
+		void MoveCtrl(uint16_t idCtrl, int anchors)
 		{
 			if (!(_wndPos->flags & SWP_NOSIZE)) {
 				HWND hCtrl = GetDlgItem(_wndPos->hwnd, idCtrl);
@@ -433,7 +433,7 @@ class CAnnivList
 				// number of days to remind in advance is edited
 				case EDIT_REMIND:
 					if (pid && pDlg->_bRemindEnable && HIWORD(wParam) == EN_CHANGE) {
-						WORD wDaysBefore = GetDlgItemInt(hDlg, LOWORD(wParam), nullptr, FALSE);
+						uint16_t wDaysBefore = GetDlgItemInt(hDlg, LOWORD(wParam), nullptr, FALSE);
 						if (pid->_wReminderState == BST_CHECKED && pid->_wDaysBefore != wDaysBefore) {
 							pid->_wDaysBefore = wDaysBefore;
 						}
@@ -447,7 +447,7 @@ class CAnnivList
 						uint8_t isChecked = Button_GetCheck((HWND)lParam);
 						EnableWindow(GetDlgItem(hDlg, EDIT_DAYS), isChecked);
 						EnableWindow(GetDlgItem(hDlg, TXT_DAYS), isChecked);
-						pDlg->_filter.wDaysBefore = isChecked ? GetDlgItemInt(hDlg, EDIT_DAYS, nullptr, FALSE) : (WORD)-1;
+						pDlg->_filter.wDaysBefore = isChecked ? GetDlgItemInt(hDlg, EDIT_DAYS, nullptr, FALSE) : (uint16_t)-1;
 						pDlg->RebuildList();
 					}
 					break;
@@ -455,7 +455,7 @@ class CAnnivList
 				// the number of days a contact must have an anniversary in advance to be displayed is edited
 				case EDIT_DAYS:
 					if (HIWORD(wParam) == EN_CHANGE) {
-						WORD wNewDays = GetDlgItemInt(hDlg, LOWORD(wParam), nullptr, FALSE);
+						uint16_t wNewDays = GetDlgItemInt(hDlg, LOWORD(wParam), nullptr, FALSE);
 						if (wNewDays != pDlg->_filter.wDaysBefore) {
 							pDlg->_filter.wDaysBefore = wNewDays;
 							pDlg->RebuildList();
@@ -657,7 +657,7 @@ class CAnnivList
 			ad.DBGetReminderOpts(hContact);
 			if ((_filter.bFilterIndex != FILTER_DISABLED_REMINDER) || (ad.RemindOption() == BST_UNCHECKED)) {
 				// set default offset if required
-				if (ad.RemindOffset() == (WORD)-1) {
+				if (ad.RemindOffset() == (uint16_t)-1) {
 					ad.RemindOffset(wDaysBefore);
 					
 					// create data object
@@ -810,7 +810,7 @@ class CAnnivList
 	void SaveFilter()
 	{
 		if (_hDlg) {
-			g_plugin.setWord(SET_ANNIVLIST_FILTER_DAYS, (WORD)GetDlgItemInt(_hDlg, EDIT_DAYS, nullptr, FALSE));
+			g_plugin.setWord(SET_ANNIVLIST_FILTER_DAYS, (uint16_t)GetDlgItemInt(_hDlg, EDIT_DAYS, nullptr, FALSE));
 			g_plugin.setByte(SET_ANNIVLIST_FILTER_DAYSENABLED, (uint8_t)Button_GetCheck(GetDlgItem(_hDlg, CHECK_DAYS)));
 			g_plugin.setByte(SET_ANNIVLIST_FILTER_INDEX, (uint8_t)ComboBox_GetCurSel(GetDlgItem(_hDlg, EDIT_DAYS)));
 		}
@@ -857,7 +857,7 @@ public:
 
 				for (c = 0; c < cc; c++) {
 					mir_snprintf(pszSetting, "AnnivDlg_Col%d", c);
-					g_plugin.setWord(pszSetting, (WORD)ListView_GetColumnWidth(_hList, c));
+					g_plugin.setWord(pszSetting, (uint16_t)ListView_GetColumnWidth(_hList, c));
 				}
 				DeleteAllItems();
 			}
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index a1a1068f5f..d6d5acd4e8 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -614,7 +614,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			pPs->hBoldFont = CreateFontIndirect(&lf);
 
 			// initialize the optionpages and tree control
-			WORD needWidth = 0;
+			uint16_t needWidth = 0;
 			if (!pPs->pTree->InitTreeItems(&needWidth))
 				return FALSE;
 
@@ -663,8 +663,8 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 
 				// move and resize the rest of the controls
 				if (addWidth > 0) {
-					static const WORD idResize[] = { IDC_HEADERBAR, STATIC_LINE2 };
-					static const WORD idMove[] = { IDC_PAGETITLE, IDC_PAGETITLEBG, IDC_PAGETITLEBG2, IDOK, IDCANCEL, IDAPPLY };
+					static const uint16_t idResize[] = { IDC_HEADERBAR, STATIC_LINE2 };
+					static const uint16_t idMove[] = { IDC_PAGETITLE, IDC_PAGETITLEBG, IDC_PAGETITLEBG2, IDOK, IDCANCEL, IDAPPLY };
 					HWND hCtrl;
 
 					for (auto &it : idResize) {
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.h b/plugins/UserInfoEx/src/dlg_propsheet.h
index 6e1c1735ae..dec1525be7 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.h
+++ b/plugins/UserInfoEx/src/dlg_propsheet.h
@@ -96,7 +96,7 @@ public:
 	LPSTR ParentItemName();
 	HWND CreateWnd(LPPS pPs);
 	
-	WORD DBSaveItemState(LPCSTR pszGroup, int iItemPosition, UINT iState, DWORD dwFlags);
+	uint16_t DBSaveItemState(LPCSTR pszGroup, int iItemPosition, UINT iState, DWORD dwFlags);
 
 	// notification handlers
 	void OnInfoChanged();
@@ -145,7 +145,7 @@ class CPsTree
 	bool _isDragging = false;
 	LPPS _pPs = nullptr;
 
-	WORD	SaveItemsState(LPCSTR pszGroup, HTREEITEM hRootItem, int& iItem);
+	uint16_t	SaveItemsState(LPCSTR pszGroup, HTREEITEM hRootItem, int& iItem);
 
 public:
 	CPsTree(LPPS pPs);
@@ -223,7 +223,7 @@ struct CPsHdr
 	LPCSTR   _pszProto = 0;    // owning contact's protocol 
 	LPCSTR   _pszPrefix = 0;   // name prefix for treeitem settings
 	CPsTreeItem** _pPages = 0; // the pages
-	WORD     _numPages = 0;    // number of pages
+	uint16_t     _numPages = 0;    // number of pages
 	DWORD    _dwFlags = 0;     // some option flags
 	HIMAGELIST _hImages = 0;   // the imagelist with all tree item icons
 	LIST<wchar_t> _ignore;     // list of skipped items when adding metasubcontacts pages
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
index 8ac4701159..741182c913 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
@@ -54,9 +54,9 @@ public:
 	__inline void	ampro(LPCSTR val) { _pszAMPro = val ? mir_strdup(val) : nullptr; }
 	__inline void	uidk(LPCSTR val) { _pszUIDKey = val ? mir_strdup(val) : nullptr; }
 	__inline void	uid(uint8_t val) { _dbvUID.type = DBVT_BYTE;  _dbvUID.bVal = val; }
-	__inline void	uid(WORD val) { _dbvUID.type = DBVT_WORD;  _dbvUID.wVal = val; }
+	__inline void	uid(uint16_t val) { _dbvUID.type = DBVT_WORD;  _dbvUID.wVal = val; }
 	__inline void	uid(DWORD val) { _dbvUID.type = DBVT_DWORD; _dbvUID.dVal = val; }
-	__inline void	uidn(uint8_t *val, DWORD len) { _dbvUID.type = DBVT_BLOB;  _dbvUID.pbVal = val; _dbvUID.cpbVal = (WORD)len; }
+	__inline void	uidn(uint8_t *val, DWORD len) { _dbvUID.type = DBVT_BLOB;  _dbvUID.pbVal = val; _dbvUID.cpbVal = (uint16_t)len; }
 	__inline void	uida(LPCSTR val)
 	{
 		_dbvUID.type = (_dbvUID.pszVal = mir_utf8decodeA(val)) ? DBVT_ASCIIZ : DBVT_DELETED;
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index c6abf8dc13..7b31b83f26 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -528,7 +528,7 @@ int CExImContactXML::LoadXmlElement(const TiXmlElement *xContact)
 					uid((uint8_t)atoi(pUID));
 					break;
 				case 'w':
-					uid((WORD)atoi(pUID));
+					uid((uint16_t)atoi(pUID));
 					break;
 				case 'd':
 					uid((DWORD)_atoi64(pUID));
@@ -850,7 +850,7 @@ int CExImContactXML::ImportSetting(LPCSTR pszModule, const TiXmlElement *xmlEntr
 		break;
 	case 'w':			//'w' wVal and sVal are valid
 		dbv.type = DBVT_WORD;
-		dbv.wVal = (WORD)atoi(value + 1);
+		dbv.wVal = (uint16_t)atoi(value + 1);
 		break;
 	case 'd':			//'d' dVal and lVal are valid
 		dbv.type = DBVT_DWORD;
@@ -868,7 +868,7 @@ int CExImContactXML::ImportSetting(LPCSTR pszModule, const TiXmlElement *xmlEntr
 		dbv.type = DBVT_BLOB;
 		dbv.pbVal = (uint8_t*)mir_base64_decode(value + 1, &baselen);
 		if (dbv.pbVal != nullptr)
-			dbv.cpbVal = (WORD)baselen;
+			dbv.cpbVal = (uint16_t)baselen;
 		else {
 			mir_free(dbv.pbVal);
 			return ERROR_NOT_ADDED;
@@ -928,7 +928,7 @@ int CExImContactXML::ImportEvent(LPCSTR pszModule, const TiXmlElement *xmlEvent)
 	if (tmpVal != NULL) {
 		// event owning module
 		dbei.pBlob = tmpVal;
-		dbei.cbBlob = (WORD)baselen;
+		dbei.cbBlob = (uint16_t)baselen;
 		dbei.szModule = (LPSTR)pszModule;
 		dbei.eventType = xmlEvent->IntAttribute("type");
 		dbei.flags = xmlEvent->IntAttribute("flag");
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
index dfc3b85940..854c2ad622 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
@@ -85,7 +85,7 @@ static void ExportModule(MCONTACT hContact, LPCSTR pszModule, FILE *file)
 
 				case DBVT_BLOB:
 					fprintf(file, "%s=n", it);
-					for (WORD j = 0; j < dbv.cpbVal; j++)
+					for (uint16_t j = 0; j < dbv.cpbVal; j++)
 						fprintf(file, "%02X ", (uint8_t)dbv.pbVal[j]);
 					fputc('\n', file);
 					break;
@@ -321,7 +321,7 @@ int ImportSetting(MCONTACT hContact, LPCSTR pszModule, LPSTR &strLine)
 		if (size_t brk = strspn(value, "0123456789-"))
 			*(value + brk) = 0;
 		dbv.type = DBVT_WORD;
-		dbv.wVal = (WORD)atoi(value);
+		dbv.wVal = (uint16_t)atoi(value);
 		break;
 
 	case 'd':
@@ -367,7 +367,7 @@ int ImportSetting(MCONTACT hContact, LPCSTR pszModule, LPSTR &strLine)
 	case 'N':
 		uint8_t *dest;
 		dbv.type = DBVT_BLOB;
-		dbv.cpbVal = (WORD)mir_strlen(value) / 3;
+		dbv.cpbVal = (uint16_t)mir_strlen(value) / 3;
 		dbv.pbVal = (uint8_t*)value;
 		for (dest = dbv.pbVal, value = strtok(value, " ");
 			value && *value;
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
index b0272ff998..9a48a5e3fe 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
@@ -245,7 +245,7 @@ size_t CLineBuffer::operator + (const SHORT sVal)
  * return:	length of the string, added
  **/
 
-size_t CLineBuffer::operator + (const WORD wVal)
+size_t CLineBuffer::operator + (const uint16_t wVal)
 {
 	size_t cbLength = 5;
 
@@ -460,7 +460,7 @@ int CLineBuffer::fgetEncoded(FILE *inFile)
 {
 	int c;
 	CHAR hex[3];
-	WORD wAdd = 0;
+	uint16_t wAdd = 0;
 
 	hex[2] = 0;
 
@@ -1138,7 +1138,7 @@ uint8_t CVCardFileVCF::Export(uint8_t bExportUtf)
  * return:	number of characters read from the file or EOF
  **/
 
-int CVCardFileVCF::readLine(LPSTR szVCFSetting, WORD cchSetting)
+int CVCardFileVCF::readLine(LPSTR szVCFSetting, uint16_t cchSetting)
 {
 	LPSTR here;
 	int c;
@@ -1234,7 +1234,7 @@ uint8_t CVCardFileVCF::Import()
 
 					memcpy(buf, _clVal.GetBuffer(), 4);
 					buf[4] = 0;
-					db_set_w(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHYEAR, (WORD)strtol(buf, nullptr, 10));
+					db_set_w(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHYEAR, (uint16_t)strtol(buf, nullptr, 10));
 					memcpy(buf, _clVal.GetBuffer() + 4, 2);
 					buf[2] = 0;
 					db_set_b(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHMONTH, (uint8_t)strtol(buf, nullptr, 10));
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
index e2f833df48..1cbb11ac3c 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
@@ -42,7 +42,7 @@ public:
 	size_t operator + (const CHAR cVal);
 	size_t operator + (const uint8_t bVal);
 	size_t operator + (const SHORT sVal);
-	size_t operator + (const WORD wVal);
+	size_t operator + (const uint16_t wVal);
 	size_t operator + (const LONG lVal);
 	size_t operator + (const DWORD dVal);
 
@@ -71,9 +71,9 @@ private:
 	FILE*       _pFile;
 	MCONTACT    _hContact;
 	const CHAR* _pszBaseProto;
-	WORD        _cbRew;
+	uint16_t        _cbRew;
 	uint8_t        _useUtf8;
-	WORD        _hasUtf8;
+	uint16_t        _hasUtf8;
 
 	size_t packList(LPIDSTRLIST pList, UINT nList, int iID, size_t *cbRew = nullptr);
 	uint8_t   GetSetting(const CHAR *pszModule, const CHAR *pszSetting, DBVARIANT *dbv);
@@ -82,7 +82,7 @@ private:
 
 	void writeLine(const CHAR *szSet, size_t *cbRew = nullptr);
 	void writeLineEncoded(const CHAR *szSet, size_t *cbRew = nullptr);
-	int  readLine(LPSTR szVCFSetting, WORD cchSetting);
+	int  readLine(LPSTR szVCFSetting, uint16_t cchSetting);
 
 public:
 	CVCardFileVCF();
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index 09e8040a50..d5a9b3b9e9 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -61,7 +61,7 @@ INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 				break;
 
 			case IDOK:
-				WORD hiWord = 0;
+				uint16_t hiWord = 0;
 				if (IsDlgButtonChecked(hDlg, IDC_CHECK1))
 					hiWord |= EXPORT_DATA;
 				if (IsDlgButtonChecked(hDlg, IDC_CHECK2))
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
index eb1bb6328c..0152fcac9b 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
@@ -39,7 +39,7 @@ class CFileXml {
 
 	MCONTACT _hContactToWorkOn;	// contact to ex/import (NULL=owner|INVALID_HANDLE_VALUE=all|HADNLE=one user)
 
-	WORD _wExport;
+	uint16_t _wExport;
 
 	CProgress _progress;
 
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index 34f2050c52..83867be920 100644
--- a/plugins/UserInfoEx/src/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
@@ -242,12 +242,12 @@ uint8_t GetEx(MCONTACT hContact, LPCSTR pszModule, LPCSTR pszProto, LPCSTR pszSe
 * @param	pszSetting		- the setting to read
 * @param	destType		- desired string type (DBVT_ASCIIZ, DBVT_WCHAR, DBVT_UTF8)
 *
-* @return	This function returns the WORD which contains the source of information.
+* @return	This function returns the uint16_t which contains the source of information.
 **/
 
-WORD GetCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR pszSubModule, LPCSTR pszProto, LPCSTR pszSetting, DBVARIANT *dbv, const uint8_t destType)
+uint16_t GetCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR pszSubModule, LPCSTR pszProto, LPCSTR pszSetting, DBVARIANT *dbv, const uint8_t destType)
 {
-	WORD wFlags = 0;
+	uint16_t wFlags = 0;
 
 	// read setting from given module
 	if (hContact && pszModule && *pszModule && !Get(hContact, pszModule, pszSetting, dbv, destType)) {
@@ -421,7 +421,7 @@ uint8_t ConvertString(DBVARIANT* dbv, const uint8_t destType)
 
 /**
 * This function completely converts a DBVARIANT to the destination string type.
-* It includes uint8_t, WORD, DWORD and all string types
+* It includes uint8_t, uint16_t, DWORD and all string types
 * @param		dbv			- pointer to DBVARIANT structure which is to manipulate
 * @param		destType	- one of (DBVT_ASCIIZ, DBVT_UTF8 or DBVT_WCHAR)
 *
diff --git a/plugins/UserInfoEx/src/mir_db.h b/plugins/UserInfoEx/src/mir_db.h
index ea2f1d00ad..61f8c86fba 100644
--- a/plugins/UserInfoEx/src/mir_db.h
+++ b/plugins/UserInfoEx/src/mir_db.h
@@ -69,14 +69,14 @@ namespace Setting {
 	static FORCEINLINE LPSTR GetUStringEx(MCONTACT hContact, LPCSTR pszModule, LPCSTR szProto, LPCSTR pszSetting)
 	{ DBVARIANT dbv; return (!GetEx(hContact, pszModule, szProto, pszSetting, &dbv, DBVT_UTF8) && dbv.type == DBVT_UTF8) ? dbv.pszVal : nullptr; }
 
-	WORD GetCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv, const uint8_t nType);
-	static FORCEINLINE WORD	GetAsIsCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv)
+	uint16_t GetCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv, const uint8_t nType);
+	static FORCEINLINE uint16_t	GetAsIsCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv)
 	{ return GetCtrl(hContact, pszModule, szSubModule, szProto, pszSetting, dbv, 0); }
-	static FORCEINLINE WORD	GetAStringCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv)
+	static FORCEINLINE uint16_t	GetAStringCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv)
 	{ return GetCtrl(hContact, pszModule, szSubModule, szProto, pszSetting, dbv, DBVT_ASCIIZ); }
-	static FORCEINLINE WORD	GetWStringCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv)
+	static FORCEINLINE uint16_t	GetWStringCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv)
 	{ return GetCtrl(hContact, pszModule, szSubModule, szProto, pszSetting, dbv, DBVT_WCHAR); }
-	static FORCEINLINE WORD	GetUStringCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv)
+	static FORCEINLINE uint16_t	GetUStringCtrl(MCONTACT hContact, LPCSTR pszModule, LPCSTR szSubModule, LPCSTR szProto, LPCSTR pszSetting, DBVARIANT *dbv)
 	{ return GetCtrl(hContact, pszModule, szSubModule, szProto, pszSetting, dbv, DBVT_UTF8); }
 
 	#define GetTString     GetWString
diff --git a/plugins/UserInfoEx/src/mir_icolib.h b/plugins/UserInfoEx/src/mir_icolib.h
index 3d1fc2d30e..342af48002 100644
--- a/plugins/UserInfoEx/src/mir_icolib.h
+++ b/plugins/UserInfoEx/src/mir_icolib.h
@@ -38,7 +38,7 @@ struct ICONCTRL
 {
 	int   iIcon;
 	UINT  Message;
-	WORD  idCtrl;
+	uint16_t  idCtrl;
 };
 
 LPTSTR	IcoLib_GetDefaultIconFileName();
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index 6cc3131c86..46bd0f9d64 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -201,7 +201,7 @@ static uint8_t DBWriteEditByte(HWND hDlg, const int idCtrl, LPCSTR pszSetting, u
 }
 
 /**
- * This function writes a WORD to database according to the value
+ * This function writes a uint16_t to database according to the value
  * read from the edit control identified by 'idCtrl'.
  *
  * @param	hWnd			- the dialog's window handle
@@ -213,12 +213,12 @@ static uint8_t DBWriteEditByte(HWND hDlg, const int idCtrl, LPCSTR pszSetting, u
  * @retval	TRUE			- the database value was updated
  * @retval	FALSE			- no database update needed
  **/
-static uint8_t DBWriteEditWord(HWND hDlg, const int idCtrl, LPCSTR pszSetting, WORD defVal)
+static uint8_t DBWriteEditWord(HWND hDlg, const int idCtrl, LPCSTR pszSetting, uint16_t defVal)
 {
-	WORD v;
+	uint16_t v;
 	BOOL t;
 
-	v = (WORD)GetDlgItemInt(hDlg, idCtrl, &t, FALSE);
+	v = (uint16_t)GetDlgItemInt(hDlg, idCtrl, &t, FALSE);
 	if (t && (v != g_plugin.getWord(pszSetting, defVal))) {
 		g_plugin.setWord(pszSetting, v);
 		return true;
@@ -688,7 +688,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam
 		case EDIT_REMIND:
 			if (bInitialized && HIWORD(wParam) == EN_UPDATE) {
 				BOOL t;
-				WORD v = (WORD)GetDlgItemInt(hDlg, LOWORD(wParam), &t, FALSE);
+				uint16_t v = (uint16_t)GetDlgItemInt(hDlg, LOWORD(wParam), &t, FALSE);
 				if (t && (v != g_plugin.getWord(SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET)))
 					NotifyParentOfChange(hDlg);
 			}
@@ -708,7 +708,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam
 		case EDIT_REMIND2:
 			if (bInitialized && HIWORD(wParam) == EN_UPDATE) {
 				BOOL t;
-				WORD v = (WORD)GetDlgItemInt(hDlg, LOWORD(wParam), &t, FALSE);
+				uint16_t v = (uint16_t)GetDlgItemInt(hDlg, LOWORD(wParam), &t, FALSE);
 				if (t && (v != g_plugin.getWord(SET_REMIND_NOTIFYINTERVAL, DEFVAL_REMIND_NOTIFYINTERVAL)))
 					NotifyParentOfChange(hDlg);
 			}
diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index 73840c48d0..db61cce98b 100644
--- a/plugins/UserInfoEx/src/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
@@ -208,7 +208,7 @@ static int ProfileList_EndLabelEdit(LPLISTCTRL pList, uint8_t bSave)
 	pList->labelEdit.hEdit = nullptr;
 
 	if (bSave != FALSE && pList->labelEdit.pItem) {
-		WORD ccText;
+		uint16_t ccText;
 		LPTSTR	szEdit = nullptr;
 		uint8_t bChanged = FALSE;
 
@@ -474,7 +474,7 @@ static int ProfileList_AddItemlistFromDB(
 				LPCSTR pszModule,
 				LPCSTR szCatFormat,
 				LPCSTR szValFormat,
-				WORD wFlags)
+				uint16_t wFlags)
 {
 	DBVARIANT dbvVal, dbvCat;
 	LPLCITEM pItem;
@@ -519,7 +519,7 @@ static int ProfileList_AddItemlistFromDB(
 						continue;
 					break;
 				case DBVT_WORD:
-					if (dbvCat.wVal != (WORD)idList[j].nID)
+					if (dbvCat.wVal != (uint16_t)idList[j].nID)
 						continue;
 					break;
 				case DBVT_DWORD:
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index e3f8ed65a2..55443210fb 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -34,17 +34,17 @@ struct CEvent
 	enum EType { NONE, BIRTHDAY, ANNIVERSARY };
 
 	EType	_eType;
-	WORD	_wDaysLeft;
+	uint16_t	_wDaysLeft;
 
 	CEvent();
-	CEvent(EType eType, WORD wDaysLeft);
+	CEvent(EType eType, uint16_t wDaysLeft);
 
 	uint8_t operator << (const CEvent& e);
 };
 
 typedef struct _REMINDEROPTIONS
 {
-	WORD	wDaysEarlier;
+	uint16_t	wDaysEarlier;
 	uint8_t	bPopups;
 	uint8_t	bCListExtraIcon;
 	uint8_t	bFlashCList;
@@ -98,7 +98,7 @@ CEvent::CEvent()
 * @return	nothing
 **/
 
-CEvent::CEvent(EType eType, WORD wDaysLeft)
+CEvent::CEvent(EType eType, uint16_t wDaysLeft)
 {
 	_wDaysLeft = wDaysLeft;
 	_eType = eType;
@@ -369,8 +369,8 @@ static uint8_t CheckAnniversaries(MCONTACT hContact, MTime &Now, CEvent &evt, ui
 			mta.DBGetReminderOpts(hContact);
 
 			if (mta.RemindOption() != BST_UNCHECKED) {
-				WORD wDaysEarlier = (mta.RemindOption() == BST_CHECKED) ? mta.RemindOffset() : -1;
-				if (wDaysEarlier == (WORD)-1)
+				uint16_t wDaysEarlier = (mta.RemindOption() == BST_CHECKED) ? mta.RemindOffset() : -1;
+				if (wDaysEarlier == (uint16_t)-1)
 					wDaysEarlier = gRemindOpts.wDaysEarlier;
 
 				Diff = mta.CompareDays(Now);
@@ -454,8 +454,8 @@ static bool CheckBirthday(MCONTACT hContact, MTime &Now, CEvent &evt, uint8_t bN
 				mtb.BackupBirthday(hContact, nullptr, 0, LastAnwer);
 
 			if (mtb.RemindOption() != BST_UNCHECKED) {
-				WORD wDaysEarlier = (mtb.RemindOption() == BST_CHECKED) ? mtb.RemindOffset() : -1;
-				if (wDaysEarlier == (WORD)-1)
+				uint16_t wDaysEarlier = (mtb.RemindOption() == BST_CHECKED) ? mtb.RemindOffset() : -1;
+				if (wDaysEarlier == (uint16_t)-1)
 					wDaysEarlier = gRemindOpts.wDaysEarlier;
 
 				Diff = mtb.CompareDays(Now);
@@ -467,7 +467,7 @@ static bool CheckBirthday(MCONTACT hContact, MTime &Now, CEvent &evt, uint8_t bN
 
 					if (bNotify) {
 						wchar_t szMsg[MAXDATASIZE];
-						WORD cchMsg = 0;
+						uint16_t cchMsg = 0;
 
 						switch (Diff) {
 						case 0:
@@ -553,7 +553,7 @@ void SvcReminderCheckAll(const ENotify notify)
 
 	// walk through all the contacts stored in the DB
 	CEvent evt;
-	WORD a1 = 0;
+	uint16_t a1 = 0;
 	for (auto &hContact : Contacts())
 		CheckContact(hContact, now, evt, notify != NOTIFY_CLIST, &a1);
 
@@ -646,7 +646,7 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb
 		MTime now;
 		now.GetLocalTime();
 		if (!mir_strcmp(pdbcws->szModule, SvcReminderGetMyBirthdayModule())) {
-			WORD LastAnswer = IDNONE;
+			uint16_t LastAnswer = IDNONE;
 			CheckContact(hContact, now, evt, FALSE, &LastAnswer);
 		}
 		else CheckContact(hContact, now, evt, FALSE, nullptr);
@@ -692,7 +692,7 @@ static INT_PTR BackupBirthdayService(WPARAM hContact, LPARAM lParam)
 			mdb.BackupBirthday(hContact, nullptr, TRUE);
 	}
 	else {
-		WORD a1 = 0;
+		uint16_t a1 = 0;
 
 		// walk through all the contacts stored in the DB
 		for (auto &cc : Contacts())
diff --git a/plugins/Variables/src/enumprocs.cpp b/plugins/Variables/src/enumprocs.cpp
index 52b9c0ad83..373904a59a 100644
--- a/plugins/Variables/src/enumprocs.cpp
+++ b/plugins/Variables/src/enumprocs.cpp
@@ -37,7 +37,7 @@ struct EnumInfoStruct
 //           the callback routine.
 //
 // Callback function definition:
-// BOOL CALLBACK Proc(DWORD dw, WORD w, LPCSTR lpstr, LPARAM lParam);
+// BOOL CALLBACK Proc(DWORD dw, uint16_t w, LPCSTR lpstr, LPARAM lParam);
 
 BOOL WINAPI EnumProcs(PROCENUMPROC lpProc, LPARAM lParam)
 {
diff --git a/plugins/Variables/src/enumprocs.h b/plugins/Variables/src/enumprocs.h
index 61c4ea717e..c24387f39a 100644
--- a/plugins/Variables/src/enumprocs.h
+++ b/plugins/Variables/src/enumprocs.h
@@ -20,5 +20,5 @@
 #pragma once
 
 /*** Process names are ANSI only ***/
-typedef BOOL (CALLBACK *PROCENUMPROC)(DWORD, WORD, char *, LPARAM);
+typedef BOOL (CALLBACK *PROCENUMPROC)(DWORD, uint16_t, char *, LPARAM);
 BOOL WINAPI EnumProcs(PROCENUMPROC lpProc, LPARAM lParam);
diff --git a/plugins/Variables/src/parse_system.cpp b/plugins/Variables/src/parse_system.cpp
index 70604d5757..c3edd3b079 100644
--- a/plugins/Variables/src/parse_system.cpp
+++ b/plugins/Variables/src/parse_system.cpp
@@ -415,7 +415,7 @@ static wchar_t* parseListDir(ARGUMENTSINFO *ai)
 }
 
 #ifndef WINE
-static BOOL CALLBACK MyProcessEnumerator(DWORD, WORD, char *szProcess, LPARAM lParam)
+static BOOL CALLBACK MyProcessEnumerator(DWORD, uint16_t, char *szProcess, LPARAM lParam)
 {
 	char **szProc = (char **)lParam;
 	if ((*szProc != nullptr) && (!_stricmp(*szProc, szProcess)))
diff --git a/plugins/Watrack_MPD/src/init.cpp b/plugins/Watrack_MPD/src/init.cpp
index 381769f8ef..9d8b044a07 100755
--- a/plugins/Watrack_MPD/src/init.cpp
+++ b/plugins/Watrack_MPD/src/init.cpp
@@ -20,7 +20,7 @@ CMPlugin g_plugin;
 
 BOOL bWatrackService = FALSE;
 wchar_t *gbHost, *gbPassword;
-WORD gbPort;
+uint16_t gbPort;
 HNETLIBUSER ghNetlibUser;
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp
index a83003f9e0..a3d95ffec3 100755
--- a/plugins/Watrack_MPD/src/options.cpp
+++ b/plugins/Watrack_MPD/src/options.cpp
@@ -33,7 +33,7 @@ public:
 
 	bool OnApply() override
 	{
-		g_plugin.setWord("Port", (WORD)edit_PORT.GetInt());
+		g_plugin.setWord("Port", (uint16_t)edit_PORT.GetInt());
 		gbPort = edit_PORT.GetInt();
 		g_plugin.setWString("Server", edit_SERVER.GetText());
 		mir_wstrcpy(gbHost, edit_SERVER.GetText());
diff --git a/plugins/Watrack_MPD/src/stdafx.h b/plugins/Watrack_MPD/src/stdafx.h
index fddc052a34..2aa2688d31 100755
--- a/plugins/Watrack_MPD/src/stdafx.h
+++ b/plugins/Watrack_MPD/src/stdafx.h
@@ -44,7 +44,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 extern HNETLIBUSER ghNetlibUser;
 extern BOOL bWatrackService;
 extern wchar_t *gbHost, *gbPassword;
-extern WORD gbPort;
+extern uint16_t gbPort;
 
 extern int WaMpdOptInit(WPARAM, LPARAM);
 extern void RegisterPlayer();
diff --git a/plugins/WhoUsesMyFiles/src/options.cpp b/plugins/WhoUsesMyFiles/src/options.cpp
index 0373326b8b..de674b67c4 100644
--- a/plugins/WhoUsesMyFiles/src/options.cpp
+++ b/plugins/WhoUsesMyFiles/src/options.cpp
@@ -87,8 +87,8 @@ void ChooseFile(HWND hwndDlg)
 
 INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lparam)
 {
-	WORD wControlId = LOWORD(wparam);
-	WORD wNotifyCode = HIWORD(wparam);
+	uint16_t wControlId = LOWORD(wparam);
+	uint16_t wNotifyCode = HIWORD(wparam);
 	int seconds;
 
 	switch(msg) {
diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index e82fd92025..6355db4b9f 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -81,8 +81,8 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 
 	logmsg("ContactSettingChanged1");
 
-	WORD newStatus = cws->value.wVal;
-	WORD oldStatus = DBGetContactSettingRangedWord(hContact, "UserOnline", "OldStatus2", ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX);
+	uint16_t newStatus = cws->value.wVal;
+	uint16_t oldStatus = DBGetContactSettingRangedWord(hContact, "UserOnline", "OldStatus2", ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX);
 
 	if (oldStatus == newStatus) return 0;
 
@@ -101,7 +101,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 int ContactStatusChanged(WPARAM wParam, LPARAM lParam)
 {
 	MCONTACT hContact = (MCONTACT)wParam;
-	WORD newStatus = HIWORD(lParam);
+	uint16_t newStatus = HIWORD(lParam);
 	DWORD ann = g_plugin.getDword("announce", DEFAULT_ANNOUNCE);
 
 	logmsg("ContactStatusChanged1");
diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp
index 3b2e777958..472411de62 100644
--- a/plugins/wbOSD/src/options.cpp
+++ b/plugins/wbOSD/src/options.cpp
@@ -21,7 +21,7 @@ void FillCheckBoxTree(HWND hwndTree, DWORD style)
 	tvis.hParent = nullptr;
 	tvis.hInsertAfter = TVI_LAST;
 	tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_STATE;
-	for (WORD status = ID_STATUS_OFFLINE; status <= ID_STATUS_MAX; status++) {
+	for (uint16_t status = ID_STATUS_OFFLINE; status <= ID_STATUS_MAX; status++) {
 		tvis.item.lParam = status - ID_STATUS_OFFLINE;
 		tvis.item.pszText = Clist_GetStatusModeDescription(status, 0);
 		tvis.item.stateMask = TVIS_STATEIMAGEMASK;
diff --git a/protocols/CloudFile/src/utils.cpp b/protocols/CloudFile/src/utils.cpp
index 8ddaafaf04..da5ca75595 100644
--- a/protocols/CloudFile/src/utils.cpp
+++ b/protocols/CloudFile/src/utils.cpp
@@ -23,7 +23,7 @@ void ShowNotification(const wchar_t *message, int flags, MCONTACT hContact)
 	ShowNotification(_A2W(MODULENAME), message, flags, hContact);
 }
 
-MEVENT AddEventToDb(MCONTACT hContact, WORD type, DWORD flags, DWORD cbBlob, uint8_t *pBlob)
+MEVENT AddEventToDb(MCONTACT hContact, uint16_t type, DWORD flags, DWORD cbBlob, uint8_t *pBlob)
 {
 	DBEVENTINFO dbei = {};
 	dbei.szModule = MODULENAME;
diff --git a/protocols/ConnectionNotify/src/stdafx.h b/protocols/ConnectionNotify/src/stdafx.h
index 2de755f4ce..cbb3bb9ef0 100644
--- a/protocols/ConnectionNotify/src/stdafx.h
+++ b/protocols/ConnectionNotify/src/stdafx.h
@@ -46,7 +46,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	int      iStatus[MAX_STATUS_COUNT];
 	int      iFiltersCount;
 	int      iDefaultAction = TRUE;
-	WORD     iStatusMask;
+	uint16_t     iStatusMask;
 
 	CMPlugin();
 
diff --git a/protocols/CurrencyRates/src/CurrencyRatesProviderBase.cpp b/protocols/CurrencyRates/src/CurrencyRatesProviderBase.cpp
index 5cf1ab001d..3a9b13cff5 100644
--- a/protocols/CurrencyRates/src/CurrencyRatesProviderBase.cpp
+++ b/protocols/CurrencyRates/src/CurrencyRatesProviderBase.cpp
@@ -525,8 +525,8 @@ void CCurrencyRatesProviderBase::WriteContactRate(MCONTACT hContact, double dRat
 
 	CAdvProviderSettings global_settings(this);
 
-	WORD dwMode = (bUseContactSpecific)
-		? g_plugin.getWord(hContact, DB_STR_CURRENCYRATE_LOG, static_cast<WORD>(lmDisabled))
+	uint16_t dwMode = (bUseContactSpecific)
+		? g_plugin.getWord(hContact, DB_STR_CURRENCYRATE_LOG, static_cast<uint16_t>(lmDisabled))
 		: global_settings.GetLogMode();
 	if (dwMode&lmExternalFile) {
 		bool bAdd = true;
diff --git a/protocols/CurrencyRates/src/CurrencyRatesProviders.cpp b/protocols/CurrencyRates/src/CurrencyRatesProviders.cpp
index 2e0e1e584e..1b744d01ec 100644
--- a/protocols/CurrencyRates/src/CurrencyRatesProviders.cpp
+++ b/protocols/CurrencyRates/src/CurrencyRatesProviders.cpp
@@ -23,7 +23,7 @@ void ClearProviders()
 
 void convert_contact_settings(MCONTACT hContact)
 {
-	WORD dwLogMode = g_plugin.getWord(hContact, DB_STR_CURRENCYRATE_LOG, static_cast<WORD>(lmDisabled));
+	uint16_t dwLogMode = g_plugin.getWord(hContact, DB_STR_CURRENCYRATE_LOG, static_cast<uint16_t>(lmDisabled));
 	if ((dwLogMode&lmInternalHistory) || (dwLogMode&lmExternalFile))
 		g_plugin.setByte(hContact, DB_STR_CONTACT_SPEC_SETTINGS, 1);
 }
@@ -32,8 +32,8 @@ void InitProviders()
 {
 	CreateProviders();
 
-	const WORD nCurrentVersion = 17;
-	WORD nVersion = g_plugin.getWord(LAST_RUN_VERSION, 1);
+	const uint16_t nCurrentVersion = 17;
+	uint16_t nVersion = g_plugin.getWord(LAST_RUN_VERSION, 1);
 
 	for (auto &hContact : Contacts(MODULENAME)) {
 		ICurrencyRatesProvider *pProvider = GetContactProviderPtr(hContact);
diff --git a/protocols/CurrencyRates/src/ImportExport.cpp b/protocols/CurrencyRates/src/ImportExport.cpp
index f2091a3d0b..dce9989367 100644
--- a/protocols/CurrencyRates/src/ImportExport.cpp
+++ b/protocols/CurrencyRates/src/ImportExport.cpp
@@ -319,7 +319,7 @@ bool handle_module(MCONTACT hContact, const TiXmlElement *pXmlModule)
 			mir_ptr<uint8_t> buf((uint8_t*)mir_base64_decode(sValue, &bufLen));
 			if (buf) {
 				dbs.value.pbVal = buf;
-				dbs.value.cpbVal = (WORD)bufLen;
+				dbs.value.cpbVal = (uint16_t)bufLen;
 				dbs.value.type = DBVT_BLOB;
 
 				if (set_contact_settings(hContact, dbs))
diff --git a/protocols/CurrencyRates/src/SettingsDlg.cpp b/protocols/CurrencyRates/src/SettingsDlg.cpp
index 70e9b2fe9f..f3134e29be 100644
--- a/protocols/CurrencyRates/src/SettingsDlg.cpp
+++ b/protocols/CurrencyRates/src/SettingsDlg.cpp
@@ -242,13 +242,13 @@ INT_PTR CALLBACK EditSettingsPerContactDlgProc(HWND hWnd, UINT msg, WPARAM wp, L
 			auto pProvider = GetContactProviderPtr(hContact);
 			CAdvProviderSettings setGlobal(pProvider);
 			// log to history
-			WORD dwLogMode = g_plugin.getWord(hContact, DB_STR_CURRENCYRATE_LOG, setGlobal.GetLogMode());
+			uint16_t dwLogMode = g_plugin.getWord(hContact, DB_STR_CURRENCYRATE_LOG, setGlobal.GetLogMode());
 			UINT nCheck = (dwLogMode & lmInternalHistory) ? 1 : 0;
 			::CheckDlgButton(hWnd, IDC_CHECK_INTERNAL_HISTORY, nCheck ? BST_CHECKED : BST_UNCHECKED);
 
 			::SetDlgItemText(hWnd, IDC_EDIT_HISTORY_FORMAT, g_plugin.getMStringW(hContact, DB_STR_CURRENCYRATE_FORMAT_HISTORY, setGlobal.GetHistoryFormat()));
 
-			WORD wOnlyIfChanged = g_plugin.getWord(hContact, DB_STR_CURRENCYRATE_HISTORY_CONDITION, setGlobal.GetHistoryOnlyChangedFlag());
+			uint16_t wOnlyIfChanged = g_plugin.getWord(hContact, DB_STR_CURRENCYRATE_HISTORY_CONDITION, setGlobal.GetHistoryOnlyChangedFlag());
 			::CheckDlgButton(hWnd, IDC_CHECK_HISTORY_CONDITION, (1 == wOnlyIfChanged) ? BST_CHECKED : BST_UNCHECKED);
 
 			// log to file
@@ -335,7 +335,7 @@ INT_PTR CALLBACK EditSettingsPerContactDlgProc(HWND hWnd, UINT msg, WPARAM wp, L
 
 				bool bUseContactSpec = 1 == ::IsDlgButtonChecked(hWnd, IDC_CHECK_CONTACT_SPECIFIC);
 
-				WORD nLogMode = lmDisabled;
+				uint16_t nLogMode = lmDisabled;
 				UINT nCheck = ::IsDlgButtonChecked(hWnd, IDC_CHECK_EXTERNAL_FILE);
 				if (1 == nCheck)
 					nLogMode |= lmExternalFile;
@@ -456,7 +456,7 @@ INT_PTR CALLBACK EditSettingsPerProviderDlgProc(HWND hWnd, UINT msg, WPARAM wp,
 			::SetDlgItemText(hWnd, IDC_EDIT_NAME, pAdvSettings->GetProviderPtr()->GetInfo().m_sName.c_str());
 
 			// log to history
-			WORD dwLogMode = pAdvSettings->GetLogMode();
+			uint16_t dwLogMode = pAdvSettings->GetLogMode();
 			UINT nCheck = (dwLogMode & lmInternalHistory) ? 1 : 0;
 			::CheckDlgButton(hWnd, IDC_CHECK_INTERNAL_HISTORY, nCheck ? BST_CHECKED : BST_UNCHECKED);
 			::SetDlgItemText(hWnd, IDC_EDIT_HISTORY_FORMAT, pAdvSettings->GetHistoryFormat().c_str());
@@ -488,7 +488,7 @@ INT_PTR CALLBACK EditSettingsPerProviderDlgProc(HWND hWnd, UINT msg, WPARAM wp,
 		switch (LOWORD(wp)) {
 		case IDOK:
 			{
-				WORD nLogMode = lmDisabled;
+				uint16_t nLogMode = lmDisabled;
 				UINT nCheck = ::IsDlgButtonChecked(hWnd, IDC_CHECK_EXTERNAL_FILE);
 				if (1 == nCheck) {
 					nLogMode |= lmExternalFile;
@@ -613,7 +613,7 @@ CAdvProviderSettings::CAdvProviderSettings(const ICurrencyRatesProvider *pCurren
 {
 	assert(m_pCurrencyRatesProvider);
 
-	m_wLogMode = g_plugin.getWord(DB_KEY_LogMode, static_cast<WORD>(lmDisabled));
+	m_wLogMode = g_plugin.getWord(DB_KEY_LogMode, static_cast<uint16_t>(lmDisabled));
 	m_sFormatHistory = g_plugin.getMStringW(DB_KEY_HistoryFormat, DB_DEF_HistoryFormat);
 	m_bIsOnlyChangedHistory = 1 == g_plugin.getByte(DB_KEY_HistoryCondition, 0);
 
@@ -778,12 +778,12 @@ void CPopupSettings::SetDelayMode(EDelayMode nMode)
 	m_modeDelay = nMode;
 }
 
-WORD CPopupSettings::GetDelayTimeout() const
+uint16_t CPopupSettings::GetDelayTimeout() const
 {
 	return m_wDelay;
 }
 
-void CPopupSettings::SetDelayTimeout(WORD delay)
+void CPopupSettings::SetDelayTimeout(uint16_t delay)
 {
 	m_wDelay = delay;
 }
diff --git a/protocols/CurrencyRates/src/SettingsDlg.h b/protocols/CurrencyRates/src/SettingsDlg.h
index b3cf8c0114..76c0868493 100644
--- a/protocols/CurrencyRates/src/SettingsDlg.h
+++ b/protocols/CurrencyRates/src/SettingsDlg.h
@@ -38,8 +38,8 @@ public:
 	EDelayMode GetDelayMode() const;
 	void SetDelayMode(EDelayMode nMode);
 
-	WORD GetDelayTimeout() const;
-	void SetDelayTimeout(WORD delay);
+	uint16_t GetDelayTimeout() const;
+	void SetDelayTimeout(uint16_t delay);
 
 	bool GetHistoryFlag() const;
 	void SetHistoryFlag(bool flag);
@@ -49,7 +49,7 @@ private:
 	EDelayMode m_modeDelay;
 	COLORREF m_rgbBkg;
 	COLORREF m_rgbText;
-	WORD m_wDelay;
+	uint16_t m_wDelay;
 	bool m_bUseHistory;
 };
 
@@ -57,7 +57,7 @@ private:
 class CAdvProviderSettings
 {
 	const ICurrencyRatesProvider *m_pCurrencyRatesProvider;
-	WORD m_wLogMode;
+	uint16_t m_wLogMode;
 	bool m_bIsOnlyChangedHistory;
 	bool m_bIsOnlyChangedLogFile;
 	bool m_bShowPopupIfValueChanged;
@@ -73,8 +73,8 @@ public:
 
 	void SaveToDb() const;
 
-	__forceinline WORD GetLogMode() const { return m_wLogMode; }
-	__forceinline void SetLogMode(WORD wMode) { m_wLogMode = wMode; }
+	__forceinline uint16_t GetLogMode() const { return m_wLogMode; }
+	__forceinline void SetLogMode(uint16_t wMode) { m_wLogMode = wMode; }
 
 	__forceinline const CMStringW& GetHistoryFormat() const { return m_sFormatHistory; }
 	__forceinline void SetHistoryFormat(const CMStringW &rsFormat) { m_sFormatHistory = rsFormat; }
diff --git a/protocols/EmLanProto/src/mlan.h b/protocols/EmLanProto/src/mlan.h
index 9a2e257720..05623bd4a6 100644
--- a/protocols/EmLanProto/src/mlan.h
+++ b/protocols/EmLanProto/src/mlan.h
@@ -19,7 +19,7 @@ class CMLan;
 struct EMPSEARCHRESULT : public PROTOSEARCHRESULT
 {
 	u_long ipaddr;
-	WORD stat;
+	uint16_t stat;
 	u_long ver;
 };
 
diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 32d7629a7a..b3f8567b14 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -703,8 +703,8 @@ retry:
 							int br = atoi(__birthyear);
 							if (br > 0)
 							{
-								setWord(hContact, GG_KEY_PD_AGE, (WORD)(lt->tm_year + 1900 - br));
-								setWord(hContact, GG_KEY_PD_BIRTHYEAR, (WORD)br);
+								setWord(hContact, GG_KEY_PD_AGE, (uint16_t)(lt->tm_year + 1900 - br));
+								setWord(hContact, GG_KEY_PD_BIRTHYEAR, (uint16_t)br);
 							}
 						}
 						else if (res->seq == GG_SEQ_CHINFO) {
@@ -758,7 +758,7 @@ retry:
 		case GG_EVENT_STATUS60:
 		{
 			MCONTACT hContact = getcontact(e->event.status60.uin, 0, 0, nullptr);
-			int oldstatus = getWord(hContact, GG_KEY_STATUS, (WORD)ID_STATUS_OFFLINE);
+			int oldstatus = getWord(hContact, GG_KEY_STATUS, (uint16_t)ID_STATUS_OFFLINE);
 			uin_t uin = (uin_t)getDword(GG_KEY_UIN, 0);
 
 			wchar_t *descrT = mir_utf8decodeW(e->event.status60.descr);
@@ -775,7 +775,7 @@ retry:
 
 			mir_free(descrT);
 
-			if (oldstatus == ID_STATUS_OFFLINE && getWord(hContact, GG_KEY_STATUS, (WORD)ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)
+			if (oldstatus == ID_STATUS_OFFLINE && getWord(hContact, GG_KEY_STATUS, (uint16_t)ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)
 				requestAvatarInfo(hContact, 0);
 		}
 		break;
@@ -1367,7 +1367,7 @@ void GaduProto::notifyuser(MCONTACT hContact, int refresh)
 	{
 		// Check if user should be invisible
 		// Or be blocked ?
-		if ((getWord(hContact, GG_KEY_APPARENT, (WORD)ID_STATUS_ONLINE) == ID_STATUS_OFFLINE) || !Contact_OnList(hContact))
+		if ((getWord(hContact, GG_KEY_APPARENT, (uint16_t)ID_STATUS_ONLINE) == ID_STATUS_OFFLINE) || !Contact_OnList(hContact))
 		{
 			gg_EnterCriticalSection(&sess_mutex, "notifyuser", 77, "sess_mutex", 1);
 			if (refresh) {
@@ -1422,7 +1422,7 @@ void GaduProto::notifyall()
 	int cc = 0;
 	for (auto &hContact : AccContacts()) {
 		if (uins[cc] = getDword(hContact, GG_KEY_UIN, 0)) {
-			if ((getWord(hContact, GG_KEY_APPARENT, (WORD)ID_STATUS_ONLINE) == ID_STATUS_OFFLINE) || !Contact_OnList(hContact))
+			if ((getWord(hContact, GG_KEY_APPARENT, (uint16_t)ID_STATUS_ONLINE) == ID_STATUS_OFFLINE) || !Contact_OnList(hContact))
 				types[cc] = GG_USER_OFFLINE;
 			else if (getByte(hContact, GG_KEY_BLOCK, 0))
 				types[cc] = GG_USER_BLOCKED;
@@ -1612,7 +1612,7 @@ void GaduProto::changecontactstatus(uin_t uin, int status, const wchar_t *idescr
 		return;
 
 	// Write contact status
-	setWord(hContact, GG_KEY_STATUS, (WORD)status_gg2m(status));
+	setWord(hContact, GG_KEY_STATUS, (uint16_t)status_gg2m(status));
 
 	// Check if there's description and if it's not empty
 	if (idescr && *idescr) {
@@ -1628,7 +1628,7 @@ void GaduProto::changecontactstatus(uin_t uin, int status, const wchar_t *idescr
 	if (remote_ip)
 		setDword(hContact, GG_KEY_CLIENTIP, (DWORD)swap32(remote_ip));
 	if (remote_port)
-		setWord(hContact, GG_KEY_CLIENTPORT, (WORD)remote_port);
+		setWord(hContact, GG_KEY_CLIENTPORT, (uint16_t)remote_port);
 	if (version) {
 		char sversion[48];
 		setDword(hContact, GG_KEY_CLIENTVERSION, (DWORD)version);
diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index dac2149fb1..e7d512683a 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -72,7 +72,7 @@ void GaduProto::dccconnect(uin_t uin)
 
 	// Read user IP and port
 	DWORD ip = swap32(getDword(hContact, GG_KEY_CLIENTIP, 0));
-	WORD port = getWord(hContact, GG_KEY_CLIENTPORT, 0);
+	uint16_t port = getWord(hContact, GG_KEY_CLIENTPORT, 0);
 	DWORD myuin = getDword(GG_KEY_UIN, 0);
 
 	// If not port nor ip nor my uin (?) specified
@@ -916,7 +916,7 @@ HANDLE GaduProto::SendFile(MCONTACT hContact, const wchar_t *, wchar_t** ppszFil
 
 	// Read user IP and port
 	DWORD ip = swap32(getDword(hContact, GG_KEY_CLIENTIP, 0));
-	WORD port = getWord(hContact, GG_KEY_CLIENTPORT, 0);
+	uint16_t port = getWord(hContact, GG_KEY_CLIENTPORT, 0);
 	uin_t myuin = getDword(GG_KEY_UIN, 0);
 	uin_t uin = getDword(hContact, GG_KEY_UIN, 0);
 	DWORD ver = getDword(hContact, GG_KEY_CLIENTVERSION, 0);
diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index ca86284ffc..42a3bcc935 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -521,7 +521,7 @@ int GaduProto::SendMsg(MCONTACT hContact, int, const char *msg)
 //
 int GaduProto::SetApparentMode(MCONTACT hContact, int mode)
 {
-	setWord(hContact, GG_KEY_APPARENT, (WORD)mode);
+	setWord(hContact, GG_KEY_APPARENT, (uint16_t)mode);
 	notifyuser(hContact, 1);
 
 	return 0;
diff --git a/protocols/Gadu-Gadu/src/options.h b/protocols/Gadu-Gadu/src/options.h
index 6e8d7502ac..8061b8731a 100644
--- a/protocols/Gadu-Gadu/src/options.h
+++ b/protocols/Gadu-Gadu/src/options.h
@@ -13,8 +13,8 @@ struct GaduOptions
 	CMOption<uint8_t> useMsgDeliveryAcknowledge;
 	CMOption<uint8_t> useSslConnection;
 
-	CMOption<WORD> directConnectionPort;
-	CMOption<WORD> forwardPort;
+	CMOption<uint16_t> directConnectionPort;
+	CMOption<uint16_t> forwardPort;
 
 	CMOption<wchar_t*> forwardHost;
 	CMOption<wchar_t*> serverHosts;
diff --git a/protocols/ICQCorp/src/options.cpp b/protocols/ICQCorp/src/options.cpp
index 79c9fda410..16fc69713a 100644
--- a/protocols/ICQCorp/src/options.cpp
+++ b/protocols/ICQCorp/src/options.cpp
@@ -50,7 +50,7 @@ static INT_PTR CALLBACK icqOptionsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LP
 			g_plugin.setString("Password", str);
 			GetDlgItemTextA(hWnd, IDC_OPT_SERVER, str, sizeof(str));
 			g_plugin.setString("Server", str);
-			g_plugin.setWord("Port", (WORD)GetDlgItemInt(hWnd, IDC_OPT_PORT, nullptr, FALSE));
+			g_plugin.setWord("Port", (uint16_t)GetDlgItemInt(hWnd, IDC_OPT_PORT, nullptr, FALSE));
 			return TRUE;
 		}
 		break;
diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp
index 01cf703d8f..825f277f9d 100644
--- a/protocols/ICQCorp/src/services.cpp
+++ b/protocols/ICQCorp/src/services.cpp
@@ -409,7 +409,7 @@ static INT_PTR icqSetApparentMode(WPARAM, LPARAM)
 
 	Netlib_Logf(hNetlibUser, "[   ] set apparent mode\n");
 
-	if (newMode == ID_STATUS_ONLINE || newMode == ID_STATUS_OFFLINE) db_set_w(u->hContact, ICQCORP_PROTONAME, "ApparentMode", (WORD)newMode);
+	if (newMode == ID_STATUS_ONLINE || newMode == ID_STATUS_OFFLINE) db_set_w(u->hContact, ICQCORP_PROTONAME, "ApparentMode", (uint16_t)newMode);
 	else db_unset(u->hContact, ICQCORP_PROTONAME, "ApparentMode");
 
 	if (icq.statusVal <= ID_STATUS_OFFLINE) return 0;
diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index d23c9c7991..67625b3ccd 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -859,7 +859,7 @@ int CDccSession::SetupConnection()
 	if (di->iType == DCC_CHAT && !di->bSender || di->iType == DCC_SEND && di->bSender && di->bReverse) {
 		NETLIBOPENCONNECTION ncon = {};
 		ncon.szHost = ConvertIntegerToIP(di->dwAdr);
-		ncon.wPort = (WORD)di->iPort;
+		ncon.wPort = (uint16_t)di->iPort;
 		con = Netlib_OpenConnection(m_proto->hNetlibDCC, &ncon);
 	}
 
@@ -953,7 +953,7 @@ int CDccSession::SetupConnection()
 		// connect to the remote computer from which you are receiving the file (now all actions to take (resume/overwrite etc) have been decided
 		NETLIBOPENCONNECTION ncon = {};
 		ncon.szHost = ConvertIntegerToIP(di->dwAdr);
-		ncon.wPort = (WORD)di->iPort;
+		ncon.wPort = (uint16_t)di->iPort;
 
 		con = Netlib_OpenConnection(m_proto->hNetlibDCC, &ncon);
 	}
@@ -1024,7 +1024,7 @@ void CDccSession::DoSendFile()
 	ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (void *)di, 0);
 	ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, (void *)di, 0);
 
-	WORD wPacketSize = m_proto->getWord("DCCPacketSize", 1024 * 4);
+	uint16_t wPacketSize = m_proto->getWord("DCCPacketSize", 1024 * 4);
 
 	if (wPacketSize < 256)
 		wPacketSize = 256;
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 8c55fc7fc8..28f5e032f7 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -596,7 +596,7 @@ HANDLE CIrcProto::SendFile(MCONTACT hContact, const wchar_t*, wchar_t** ppszFile
 int CIrcProto::SendMsg(MCONTACT hContact, int, const char* pszSrc)
 {
 	uint8_t bDcc = getByte(hContact, "DCC", 0);
-	WORD wStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);
+	uint16_t wStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);
 	if (bDcc && wStatus != ID_STATUS_ONLINE) {
 		ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, nullptr, (LPARAM)TranslateT("The dcc chat connection is not active"));
 		return 0;
diff --git a/protocols/IRCG/src/ircproto.h b/protocols/IRCG/src/ircproto.h
index f0792daf08..efc465f31f 100644
--- a/protocols/IRCG/src/ircproto.h
+++ b/protocols/IRCG/src/ircproto.h
@@ -118,7 +118,7 @@ struct CIrcProto : public PROTO<CIrcProto>
 	char     m_mySpecifiedHost[500];
 	char     m_mySpecifiedHostIP[50];
 	char     m_myLocalHost[50];
-	WORD     m_myLocalPort;
+	uint16_t     m_myLocalPort;
 	wchar_t *m_alias;
 	int      m_quickComboSelection;
 	int      m_onlineNotificationTime;
@@ -146,7 +146,7 @@ struct CIrcProto : public PROTO<CIrcProto>
 	uint8_t     m_DCCChatIgnore;
 	uint8_t     m_DCCPassive;
 	uint8_t     m_DCCMode;
-	WORD     m_DCCPacketSize;
+	uint16_t     m_DCCPacketSize;
 	uint8_t     m_manualHost;
 	uint8_t     m_oldStyleModes;
 	uint8_t     m_channelAwayNotification;
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 3c5285309c..9961f0be81 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -45,7 +45,7 @@ void CIrcProto::ReadSettings(TDbSetting *sets, int count)
 			*(uint8_t*)ptr = getByte(p->name, p->defValue);
 			break;
 		case DBVT_WORD:
-			*(WORD*)ptr = getWord(p->name, p->defValue);
+			*(uint16_t*)ptr = getWord(p->name, p->defValue);
 			break;
 		case DBVT_DWORD:
 			*(DWORD*)ptr = getDword(p->name, p->defValue);
@@ -100,7 +100,7 @@ void CIrcProto::WriteSettings(TDbSetting *sets, int count)
 		uint8_t *ptr = base + p->offset;
 		switch (p->type) {
 		case DBVT_BYTE:   setByte(p->name, *(uint8_t*)ptr);       break;
-		case DBVT_WORD:   setWord(p->name, *(WORD*)ptr);       break;
+		case DBVT_WORD:   setWord(p->name, *(uint16_t*)ptr);       break;
 		case DBVT_DWORD:  setDword(p->name, *(DWORD*)ptr);     break;
 
 		case DBVT_ASCIIZ:
diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp
index 13691315d6..c9c9088aca 100644
--- a/protocols/JabberG/src/jabber_byte.cpp
+++ b/protocols/JabberG/src/jabber_byte.cpp
@@ -365,7 +365,7 @@ int CJabberProto::ByteSendParse(HNETLIBCONN hConn, JABBER_BYTE_TRANSFER *jbt, ch
 		// 03-03 address type (1=IPv4 address)
 		// 04-07 bnd.addr server bound address
 		// 08-09 bnd.port server bound port
-		if (datalen == 47 && *((DWORD*)buffer) == 0x03000105 && buffer[4] == 40 && *((WORD*)(buffer + 45)) == 0) {
+		if (datalen == 47 && *((DWORD*)buffer) == 0x03000105 && buffer[4] == 40 && *((uint16_t*)(buffer + 45)) == 0) {
 			ptrA szInitiatorJid(JabberPrepareJid(jbt->srcJID));
 			ptrA szTargetJid(JabberPrepareJid(jbt->dstJID));
 			CMStringA szAuthString(FORMAT, "%s%s%s", jbt->sid, szInitiatorJid.get(), szTargetJid.get());
@@ -438,7 +438,7 @@ void CJabberProto::ByteSendViaProxy(JABBER_BYTE_TRANSFER *jbt)
 	char *szPort = jbt->szProxyPort;
 	char *szHost = jbt->szProxyHost;
 
-	WORD port = (WORD)atoi(szPort);
+	uint16_t port = (uint16_t)atoi(szPort);
 	replaceStr(jbt->streamhostJID, jbt->szProxyJid);
 
 	NETLIBOPENCONNECTION nloc = {};
@@ -575,7 +575,7 @@ void __cdecl CJabberProto::ByteReceiveThread(JABBER_BYTE_TRANSFER *jbt)
 		return;
 
 	const TiXmlElement *iqNode, *queryNode = nullptr;
-	WORD port;
+	uint16_t port;
 	char data[3];
 	char* buffer;
 	int datalen, bytesParsed, recvResult;
@@ -606,7 +606,7 @@ void __cdecl CJabberProto::ByteReceiveThread(JABBER_BYTE_TRANSFER *jbt)
 				const char *szHost = XmlGetAttr(n, "host");
 				const char *szPort = XmlGetAttr(n, "port");
 				if (str != nullptr && szHost != nullptr && szPort != nullptr) {
-					port = (WORD)atoi(szPort);
+					port = (uint16_t)atoi(szPort);
 					replaceStr(jbt->streamhostJID, str);
 
 					debugLogA("bytestream_recv connecting to %s:%d", szHost, port);
diff --git a/protocols/JabberG/src/jabber_ibb.cpp b/protocols/JabberG/src/jabber_ibb.cpp
index 7a20c70760..3fefc2f186 100644
--- a/protocols/JabberG/src/jabber_ibb.cpp
+++ b/protocols/JabberG/src/jabber_ibb.cpp
@@ -171,7 +171,7 @@ bool CJabberProto::OnIbbRecvdData(const char *data, const char *sid, const char
 	if (item == nullptr)
 		return false;
 
-	WORD wSeq = (WORD)atoi(seq);
+	uint16_t wSeq = (uint16_t)atoi(seq);
 	if (wSeq != item->jibb->wPacketId) {
 		if (item->jibb->hEvent)
 			SetEvent(item->jibb->hEvent);
diff --git a/protocols/JabberG/src/jabber_ibb.h b/protocols/JabberG/src/jabber_ibb.h
index 44312bb816..a9e7905237 100644
--- a/protocols/JabberG/src/jabber_ibb.h
+++ b/protocols/JabberG/src/jabber_ibb.h
@@ -38,7 +38,7 @@ struct JABBER_IBB_TRANSFER
 	HANDLE hEvent;
 	bool bStreamInitialized;
 	bool bStreamClosed;
-	WORD wPacketId;
+	uint16_t wPacketId;
 	bool (CJabberProto::*pfnSend)(int blocksize, filetransfer *ft);
 	int  (CJabberProto::*pfnRecv)(HNETLIBCONN hConn, filetransfer *ft, char* buffer, int datalen);
 	void (CJabberProto::*pfnFinal)(bool success, filetransfer *ft);
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index d50c2e541f..93b287e016 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -340,7 +340,7 @@ INT_PTR __cdecl CJabberProto::OnGetAdvancedStatusIcon(WPARAM hContact, LPARAM)
 		if (iID < 0)
 			return -1;
 
-		WORD Status = getWord(hContact, "Status", ID_STATUS_OFFLINE);
+		uint16_t Status = getWord(hContact, "Status", ID_STATUS_OFFLINE);
 		if (Status < ID_STATUS_OFFLINE)
 			Status = ID_STATUS_OFFLINE;
 		else if (Status > ID_STATUS_INVISIBLE)
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index a1b7fb9a43..cef7f3a195 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -283,7 +283,7 @@ bool CJabberProto::OnIqRequestOOB(const TiXmlElement*, CJabberIqInfo *pInfo)
 				strncpy_s(text, p, q - p);
 				text[q - p] = '\0';
 				if (char *d = strchr(text, ':')) {
-					ft->httpPort = (WORD)atoi(d + 1);
+					ft->httpPort = (uint16_t)atoi(d + 1);
 					*d = '\0';
 				}
 				ft->httpHostName = mir_strdup(text);
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 32449881be..07931a08ad 100755
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -703,7 +703,7 @@ void CJabberProto::OnIqResultGetVcard(const TiXmlElement *iqNode, CJabberIqInfo*
 					if (hContact != 0) {
 						if (sscanf(n->GetText(), "%d-%d-%d", &nYear, &nMonth, &nDay) == 3) {
 							hasBday = true;
-							setWord(hContact, "BirthYear", (WORD)nYear);
+							setWord(hContact, "BirthYear", (uint16_t)nYear);
 							setByte(hContact, "BirthMonth", (uint8_t)nMonth);
 							setByte(hContact, "BirthDay", (uint8_t)nDay);
 
@@ -713,7 +713,7 @@ void CJabberProto::OnIqResultGetVcard(const TiXmlElement *iqNode, CJabberIqInfo*
 							if (sToday.wMonth < nMonth || (sToday.wMonth == nMonth && sToday.wDay < nDay))
 								nAge--;
 							if (nAge)
-								setWord(hContact, "Age", (WORD)nAge);
+								setWord(hContact, "Age", (uint16_t)nAge);
 						}
 					}
 					else {
diff --git a/protocols/JabberG/src/jabber_list.h b/protocols/JabberG/src/jabber_list.h
index 6ad73e6490..05d65fdb23 100644
--- a/protocols/JabberG/src/jabber_list.h
+++ b/protocols/JabberG/src/jabber_list.h
@@ -190,7 +190,7 @@ struct JABBER_LIST_ITEM : public MZeroedObject
 	// LIST_FILE
 	// jid = string representation of port number
 	filetransfer *ft;
-	WORD port;
+	uint16_t port;
 
 	// LIST_BYTE
 	// jid = string representation of port number
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 1f4bfd91b4..97a821e275 100755
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -550,11 +550,11 @@ private:
 		m_txtPassword.GetTextU(regInfo.password, _countof(regInfo.password));
 		m_cbServer.GetTextA(regInfo.server, _countof(regInfo.server));
 		if (m_chkManualHost.GetState() == BST_CHECKED) {
-			regInfo.port = (WORD)m_txtManualPort.GetInt();
+			regInfo.port = (uint16_t)m_txtManualPort.GetInt();
 			m_txtManualHost.GetTextA(regInfo.manualHost, _countof(regInfo.manualHost));
 		}
 		else {
-			regInfo.port = (WORD)m_txtPort.GetInt();
+			regInfo.port = (uint16_t)m_txtPort.GetInt();
 			regInfo.manualHost[0] = '\0';
 		}
 
@@ -669,11 +669,11 @@ private:
 		m_txtPassword.GetTextU(regInfo.password, _countof(regInfo.password));
 		m_cbServer.GetTextA(regInfo.server, _countof(regInfo.server));
 		if (m_chkManualHost.GetState() == BST_CHECKED) {
-			regInfo.port = (WORD)m_txtManualPort.GetInt();
+			regInfo.port = (uint16_t)m_txtManualPort.GetInt();
 			m_txtManualHost.GetTextA(regInfo.manualHost, _countof(regInfo.manualHost));
 		}
 		else {
-			regInfo.port = (WORD)m_txtPort.GetInt();
+			regInfo.port = (uint16_t)m_txtPort.GetInt();
 			regInfo.manualHost[0] = '\0';
 		}
 
@@ -830,7 +830,7 @@ public:
 					if (hContact != 0) {
 						if (bChecked) {
 							if (item->getTemp()->m_iStatus != m_proto->getWord(hContact, "Status", ID_STATUS_OFFLINE)) {
-								m_proto->setWord(hContact, "Status", (WORD)item->getTemp()->m_iStatus);
+								m_proto->setWord(hContact, "Status", (uint16_t)item->getTemp()->m_iStatus);
 							}
 						}
 						else if (m_proto->getWord(hContact, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)
@@ -1251,7 +1251,7 @@ private:
 		m_txtUsername.GetTextU(regInfo.username, _countof(regInfo.username));
 		m_txtPassword.GetTextU(regInfo.password, _countof(regInfo.password));
 		m_cbServer.GetTextA(regInfo.server, _countof(regInfo.server));
-		regInfo.port = (WORD)m_txtPort.GetInt();
+		regInfo.port = (uint16_t)m_txtPort.GetInt();
 		if (m_chkManualHost.GetState() == BST_CHECKED)
 			m_txtManualHost.GetTextA(regInfo.manualHost, _countof(regInfo.manualHost));
 		else
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index a92d005d29..6559ac437e 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -1866,7 +1866,7 @@ public:
 		PostMessage(m_hwnd, WM_PROTO_REFRESH, 0, 0);
 	}
 
-	void OnCommand_Close(HWND /*hwndCtrl*/, WORD /*idCtrl*/, WORD /*idCode*/)
+	void OnCommand_Close(HWND /*hwndCtrl*/, uint16_t /*idCtrl*/, uint16_t /*idCode*/)
 	{
 		if (IsWindowVisible(m_clcClist.GetHwnd()))
 			CListBuildList(clc_info.pList);
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 7beb4d6a42..9ff764ecdc 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -989,7 +989,7 @@ int CJabberProto::SetApparentMode(MCONTACT hContact, int mode)
 	if (mode == oldMode)
 		return 1;
 
-	setWord(hContact, "ApparentMode", (WORD)mode);
+	setWord(hContact, "ApparentMode", (uint16_t)mode);
 	if (!m_bJabberOnline)
 		return 0;
 
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index 4ac9cf3ee3..b82abb54e4 100755
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -884,7 +884,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 
 	//---- jabber_ws.c -------------------------------------------------
 
-	HNETLIBCONN WsConnect(char* host, WORD port);
+	HNETLIBCONN WsConnect(char* host, uint16_t port);
 
 	bool       WsInit(void);
 	int        WsSend(HNETLIBCONN s, char* data, int datalen, int flags);
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index cff0eb6468..38cb49427c 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -51,7 +51,7 @@ struct JabberPasswordDlgParam
 	CJabberProto *pro;
 
 	BOOL    saveOnlinePassword;
-	WORD    dlgResult;
+	uint16_t    dlgResult;
 	wchar_t onlinePassword[128];
 	HANDLE  hEventPasswdDlg;
 	char   *pszJid;
@@ -188,7 +188,7 @@ void ThreadData::xmpp_client_query(void)
 				dnsList.insert(&rec->Data.Srv);
 
 		for (auto &it : dnsList) {
-			WORD dnsPort = (conn.port == 0 || conn.port == 5222) ? it->wPort : conn.port;
+			uint16_t dnsPort = (conn.port == 0 || conn.port == 5222) ? it->wPort : conn.port;
 			char* dnsHost = it->pNameTarget;
 
 			proto->debugLogA("%s%s resolved to %s:%d", "_xmpp-client._tcp.", conn.server, dnsHost, dnsPort);
@@ -1514,7 +1514,7 @@ void CJabberProto::UpdateJidDbSettings(const char *jid)
 
 	if (strchr(jid, '@') != nullptr || m_bShowTransport == TRUE)
 		if (getWord(hContact, "Status", ID_STATUS_OFFLINE) != status)
-			setWord(hContact, "Status", (WORD)status);
+			setWord(hContact, "Status", (uint16_t)status);
 
 	// remove x-status icon
 	if (status == ID_STATUS_OFFLINE) {
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index b2d1856ce9..b8ddd22545 100755
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -338,7 +338,7 @@ void CJabberProto::SendVisibleInvisiblePresence(bool invisible)
 		if (hContact == 0)
 			continue;
 
-		WORD apparentMode = getWord(hContact, "ApparentMode", 0);
+		uint16_t apparentMode = getWord(hContact, "ApparentMode", 0);
 		if (invisible && apparentMode == ID_STATUS_OFFLINE)
 			m_ThreadInfo->send(XmlNode("presence") << XATTR("to", item->jid) << XATTR("type", "invisible"));
 		else if (!invisible && apparentMode == ID_STATUS_ONLINE)
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp
index f2c75e7112..d01fcb4d3b 100644
--- a/protocols/JabberG/src/jabber_vcard.cpp
+++ b/protocols/JabberG/src/jabber_vcard.cpp
@@ -563,7 +563,7 @@ static INT_PTR CALLBACK EditEmailDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 				SetDlgItemTextA(hwndDlg, IDC_EMAIL, email);
 
 			mir_snprintf(idstr, "e-mailFlag%d", (int)lParam);
-			WORD nFlag = dat->ppro->getWord(idstr, 0);
+			uint16_t nFlag = dat->ppro->getWord(idstr, 0);
 			if (nFlag & JABBER_VCEMAIL_HOME) CheckDlgButton(hwndDlg, IDC_HOME, BST_CHECKED);
 			if (nFlag & JABBER_VCEMAIL_WORK) CheckDlgButton(hwndDlg, IDC_WORK, BST_CHECKED);
 			if (nFlag & JABBER_VCEMAIL_INTERNET) CheckDlgButton(hwndDlg, IDC_INTERNET, BST_CHECKED);
@@ -588,7 +588,7 @@ static INT_PTR CALLBACK EditEmailDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 			mir_snprintf(idstr, "e-mail%d", dat->id);
 			dat->ppro->setWString(idstr, text);
 			{
-				WORD nFlag = 0;
+				uint16_t nFlag = 0;
 				if (IsDlgButtonChecked(hwndDlg, IDC_HOME)) nFlag |= JABBER_VCEMAIL_HOME;
 				if (IsDlgButtonChecked(hwndDlg, IDC_WORK)) nFlag |= JABBER_VCEMAIL_WORK;
 				if (IsDlgButtonChecked(hwndDlg, IDC_INTERNET)) nFlag |= JABBER_VCEMAIL_INTERNET;
@@ -659,7 +659,7 @@ static INT_PTR CALLBACK EditPhoneDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 			mir_snprintf(idstr, "Phone%d", dat->id);
 			dat->ppro->setString(idstr, text);
 			{
-				WORD nFlag = 0;
+				uint16_t nFlag = 0;
 				if (IsDlgButtonChecked(hwndDlg, IDC_HOME))  nFlag |= JABBER_VCTEL_HOME;
 				if (IsDlgButtonChecked(hwndDlg, IDC_WORK))  nFlag |= JABBER_VCTEL_WORK;
 				if (IsDlgButtonChecked(hwndDlg, IDC_VOICE)) nFlag |= JABBER_VCTEL_VOICE;
@@ -872,7 +872,7 @@ static INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM lP
 							ppro->setString(idstr, fieldVal);
 
 							mir_snprintf(idstr, szFlagTemplate, i + 1);
-							WORD nFlag = ppro->getWord(idstr, 0);
+							uint16_t nFlag = ppro->getWord(idstr, 0);
 							mir_snprintf(idstr, szFlagTemplate, i);
 							ppro->setWord(idstr, nFlag);
 						}
@@ -1043,7 +1043,7 @@ void CJabberProto::SetServerVcard(BOOL bPhotoChanged, wchar_t *szPhotoFileName)
 		AppendVcardFromDB(e, "USERID", idstr);
 
 		mir_snprintf(idstr, "e-mailFlag%d", i);
-		WORD nFlag = getWord(idstr, 0);
+		uint16_t nFlag = getWord(idstr, 0);
 		if (nFlag & JABBER_VCEMAIL_HOME)     e << XCHILD("HOME");
 		if (nFlag & JABBER_VCEMAIL_WORK)     e << XCHILD("WORK");
 		if (nFlag & JABBER_VCEMAIL_INTERNET) e << XCHILD("INTERNET");
@@ -1091,7 +1091,7 @@ void CJabberProto::SetServerVcard(BOOL bPhotoChanged, wchar_t *szPhotoFileName)
 		AppendVcardFromDB(n, "NUMBER", idstr);
 
 		mir_snprintf(idstr, "PhoneFlag%d", i);
-		WORD nFlag = getWord(idstr, 0);
+		uint16_t nFlag = getWord(idstr, 0);
 		if (nFlag & JABBER_VCTEL_HOME)  n << XCHILD("HOME");
 		if (nFlag & JABBER_VCTEL_WORK)  n << XCHILD("WORK");
 		if (nFlag & JABBER_VCTEL_VOICE) n << XCHILD("VOICE");
diff --git a/protocols/JabberG/src/jabber_ws.cpp b/protocols/JabberG/src/jabber_ws.cpp
index 79bffb948d..467e02d8f8 100644
--- a/protocols/JabberG/src/jabber_ws.cpp
+++ b/protocols/JabberG/src/jabber_ws.cpp
@@ -39,7 +39,7 @@ bool CJabberProto::WsInit(void)
 	return m_hNetlibUser != nullptr;
 }
 
-HNETLIBCONN CJabberProto::WsConnect(char* host, WORD port)
+HNETLIBCONN CJabberProto::WsConnect(char* host, uint16_t port)
 {
 	NETLIBOPENCONNECTION nloc = {};
 	nloc.szHost = host;
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index c007b351a7..2cc9550b8f 100755
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -432,7 +432,7 @@ struct filetransfer : public MZeroedObject
 
 	// Used by file receiving only
 	char* httpHostName;
-	WORD httpPort;
+	uint16_t httpPort;
 	char* httpPath;
 	unsigned __int64 dwExpectedRecvFileSize;
 
diff --git a/protocols/LotusNotify/src/LotusNotify.cpp b/protocols/LotusNotify/src/LotusNotify.cpp
index 73bd54a92a..28bf497693 100644
--- a/protocols/LotusNotify/src/LotusNotify.cpp
+++ b/protocols/LotusNotify/src/LotusNotify.cpp
@@ -493,10 +493,10 @@ void ErMsgByLotusCode(STATUS erno)
 	char far error_text_LMBCS[200];
 	char far error_text_UNICODEatCHAR[400];
 	wchar_t far error_text_UNICODE[200];
-    WORD text_len;
+    uint16_t text_len;
 
     text_len = OSLoadString1(NULLHANDLE, erno, error_text_LMBCS, sizeof(error_text_LMBCS)-1);
-	OSTranslate1(OS_TRANSLATE_LMBCS_TO_UNICODE, error_text_LMBCS, (WORD)mir_strlen(error_text_LMBCS), error_text_UNICODEatCHAR, sizeof(error_text_UNICODEatCHAR)-1);
+	OSTranslate1(OS_TRANSLATE_LMBCS_TO_UNICODE, error_text_LMBCS, (uint16_t)mir_strlen(error_text_LMBCS), error_text_UNICODEatCHAR, sizeof(error_text_UNICODEatCHAR)-1);
 	memcpy(error_text_UNICODE, error_text_UNICODEatCHAR, sizeof(error_text_UNICODE));
 
 	ErMsgW(error_text_UNICODE);
@@ -548,7 +548,7 @@ void checkthread(void*)
 	BOOL		fFirst = TRUE;
 
 	NOTEHANDLE	note_handle;
-	WORD        field_len;
+	uint16_t        field_len;
 	char        field_date[MAXALPHATIMEDATE + 1];
 
 	char        field_lotus_LMBCS[MAX_FIELD];
@@ -601,7 +601,7 @@ void checkthread(void*)
 #endif
 
 	/* Get the unread list */
-	if (error = NSFDbGetUnreadNoteTable1(db_handle, UserName, (WORD)mir_strlen(UserName), TRUE, &hTable)) {
+	if (error = NSFDbGetUnreadNoteTable1(db_handle, UserName, (uint16_t)mir_strlen(UserName), TRUE, &hTable)) {
 		goto errorblock0;
 	}
 #ifdef _DEBUG
@@ -621,13 +621,13 @@ void checkthread(void*)
 
 	while (IDScan1(hTable, fFirst, &noteID)) {
 
-		WORD Att;
+		uint16_t Att;
 		BLOCKID bhAttachment;
 		DWORD cSize = 0;
 		DWORD attSize = 0;
 		OID          retNoteOID;
 		TIMEDATE     retModified;     /* modified timedate      */
-		WORD         retNoteClass;    /* note class             */
+		uint16_t         retNoteClass;    /* note class             */
 		TIMEDATE     sendDate;
 		char strLink[4 * 16];
 
@@ -704,7 +704,7 @@ void checkthread(void*)
 
 		log_p(L"checkthread: got noteInfo, built link: %S", strLink);
 
-		field_len = NSFItemGetText1(note_handle, MAIL_FROM_ITEM, field_lotus_LMBCS, (WORD)sizeof(field_lotus_LMBCS));
+		field_len = NSFItemGetText1(note_handle, MAIL_FROM_ITEM, field_lotus_LMBCS, (uint16_t)sizeof(field_lotus_LMBCS));
 		OSTranslate1(OS_TRANSLATE_LMBCS_TO_UNICODE, field_lotus_LMBCS, field_len, field_lotus_UNICODEatCHAR, sizeof(field_lotus_UNICODEatCHAR));
 		memcpy(field_from_UNICODE, field_lotus_UNICODEatCHAR, field_len * sizeof(wchar_t));
 		field_from_UNICODE[field_len] = '\0';
@@ -713,17 +713,17 @@ void checkthread(void*)
 		error = ConvertTIMEDATEToText1(nullptr, nullptr, &sendDate, field_date, MAXALPHATIMEDATE, &field_len);
 		field_date[field_len] = '\0';
 
-		field_len = NSFItemGetText1(note_handle, MAIL_SUBJECT_ITEM, field_lotus_LMBCS, (WORD)sizeof(field_lotus_LMBCS));
+		field_len = NSFItemGetText1(note_handle, MAIL_SUBJECT_ITEM, field_lotus_LMBCS, (uint16_t)sizeof(field_lotus_LMBCS));
 		OSTranslate1(OS_TRANSLATE_LMBCS_TO_UNICODE, field_lotus_LMBCS, field_len, field_lotus_UNICODEatCHAR, sizeof(field_lotus_UNICODEatCHAR));
 		memcpy(field_subject_UNICODE, field_lotus_UNICODEatCHAR, field_len * sizeof(wchar_t));
 		field_subject_UNICODE[field_len] = '\0';
 
-		field_len = NSFItemGetText1(note_handle, MAIL_SENDTO_ITEM, field_lotus_LMBCS, (WORD)sizeof(field_lotus_LMBCS));
+		field_len = NSFItemGetText1(note_handle, MAIL_SENDTO_ITEM, field_lotus_LMBCS, (uint16_t)sizeof(field_lotus_LMBCS));
 		OSTranslate1(OS_TRANSLATE_LMBCS_TO_UNICODE, field_lotus_LMBCS, field_len, field_lotus_UNICODEatCHAR, sizeof(field_lotus_UNICODEatCHAR));
 		memcpy(field_to_UNICODE, field_lotus_UNICODEatCHAR, field_len * sizeof(wchar_t));
 		field_to_UNICODE[field_len] = '\0';
 
-		field_len = NSFItemGetText1(note_handle, MAIL_COPYTO_ITEM, field_lotus_LMBCS, (WORD)sizeof(field_lotus_LMBCS));
+		field_len = NSFItemGetText1(note_handle, MAIL_COPYTO_ITEM, field_lotus_LMBCS, (uint16_t)sizeof(field_lotus_LMBCS));
 		OSTranslate1(OS_TRANSLATE_LMBCS_TO_UNICODE, field_lotus_LMBCS, field_len, field_lotus_UNICODEatCHAR, sizeof(field_lotus_UNICODEatCHAR));
 		memcpy(field_copy_UNICODE, field_lotus_UNICODEatCHAR, field_len * sizeof(wchar_t));
 		field_copy_UNICODE[field_len] = '\0';
@@ -888,8 +888,8 @@ void fillServersList(HWND hwndDlg)
 {
 	HANDLE    hServerList = NULLHANDLE;
 	uint8_t far *pServerList;            /* Pointer to start of Server List */
-	WORD      wServerCount;           /* Number of servers in list. */
-	WORD far *pwServerLength;         /* Index to array of servername lens */
+	uint16_t      wServerCount;           /* Number of servers in list. */
+	uint16_t far *pwServerLength;         /* Index to array of servername lens */
 	uint8_t far *pServerName;
 	STATUS    error = NOERROR;        /* Error return from API routines. */
 	char      ServerString[MAXPATH];  /* String to hold server names.   */
@@ -903,11 +903,11 @@ void fillServersList(HWND hwndDlg)
 	if (error == NOERROR) {
 
 		pServerList = (uint8_t far *) OSLockObject1(hServerList);
-		wServerCount = (WORD)*pServerList;
+		wServerCount = (uint16_t)*pServerList;
 
-		pwServerLength = (WORD *)(pServerList + sizeof(WORD));
+		pwServerLength = (uint16_t *)(pServerList + sizeof(uint16_t));
 
-		pServerName = (uint8_t far *) pServerList + sizeof(wServerCount) + ((wServerCount)* sizeof(WORD));
+		pServerName = (uint8_t far *) pServerList + sizeof(wServerCount) + ((wServerCount)* sizeof(uint16_t));
 
 		for (USHORT i = 0; i < wServerCount; pServerName += pwServerLength[i], i++) {
 			memmove(szServerString, pServerName, pwServerLength[i]);
diff --git a/protocols/LotusNotify/src/lotusnotes.h b/protocols/LotusNotify/src/lotusnotes.h
index 620aab2822..ba8288a014 100644
--- a/protocols/LotusNotify/src/lotusnotes.h
+++ b/protocols/LotusNotify/src/lotusnotes.h
@@ -27,7 +27,7 @@ extern SECKFMGETUSERNAME SECKFMGetUserName1;
 typedef STATUS (CALLBACK LNPUBLIC *NSFDBGETUNREADNOTETABLE)(
 	DBHANDLE  hDB,
 	char far *UserName,
-	WORD  UserNameLength,
+	uint16_t  UserNameLength,
 	BOOL  fCreateIfNotAvailable,
 	HANDLE far *rethUnreadList);
 extern NSFDBGETUNREADNOTETABLE NSFDbGetUnreadNoteTable1;
@@ -46,7 +46,7 @@ extern IDSCAN IDScan1;
 typedef STATUS (CALLBACK LNPUBLIC *NSFNOTEOPEN)(
 	DBHANDLE  db_handle,
 	NOTEID  note_id,
-	WORD  open_flags,
+	uint16_t  open_flags,
 	NOTEHANDLE far *note_handle);
 extern NSFNOTEOPEN NSFNoteOpen1;
 
@@ -55,14 +55,14 @@ typedef STATUS (CALLBACK LNPUBLIC *NSFDBGETNOTEINFO)(
 	NOTEID  NoteID,
 	OID far *retNoteOID,
 	TIMEDATE far *retModified,
-	WORD far *retNoteClass);
+	uint16_t far *retNoteClass);
 extern NSFDBGETNOTEINFO NSFDbGetNoteInfo1;
 
-typedef WORD (CALLBACK LNPUBLIC *NSFITEMGETTEXT)(
+typedef uint16_t (CALLBACK LNPUBLIC *NSFITEMGETTEXT)(
 	NOTEHANDLE  note_handle,
 	const char far *item_name,
 	char far *item_text,
-	WORD  text_len);
+	uint16_t  text_len);
 extern NSFITEMGETTEXT NSFItemGetText1;
 
 typedef BOOL (CALLBACK LNPUBLIC *NSFITEMGETTIME)(
@@ -76,26 +76,26 @@ typedef STATUS (CALLBACK LNPUBLIC *CONVERTTIMEDATETOTEXT)(
 	const TFMT far *TextFormat,
 	const TIMEDATE far *InputTime,
 	char far *retTextBuffer,
-	WORD  TextBufferLength,
-	WORD far *retTextLength);
+	uint16_t  TextBufferLength,
+	uint16_t far *retTextLength);
 extern CONVERTTIMEDATETOTEXT ConvertTIMEDATEToText1;
 
-typedef WORD (CALLBACK LNPUBLIC *OSTRANSLATE)(
-	WORD  TranslateMode,
+typedef uint16_t (CALLBACK LNPUBLIC *OSTRANSLATE)(
+	uint16_t  TranslateMode,
 	const char far *In,
-	WORD  InLength,
+	uint16_t  InLength,
 	char far *Out,
-	WORD  OutLength);
+	uint16_t  OutLength);
 extern OSTRANSLATE OSTranslate1;
 
 typedef BOOL (CALLBACK LNPUBLIC *MAILGETMESSAGEATTACHMENTINFO)(
 	HANDLE  hMessage, ///DHANDLE
-	WORD  Num,
+	uint16_t  Num,
 	BLOCKID far *bhItem,
 	char far *FileName,
 	DWORD far *FileSize,
-	WORD far *FileAttributes,
-	WORD far *FileHostType,
+	uint16_t far *FileAttributes,
+	uint16_t far *FileHostType,
 	TIMEDATE *FileCreated,
 	TIMEDATE far *FileModified);
 extern MAILGETMESSAGEATTACHMENTINFO MailGetMessageAttachmentInfo1;
@@ -112,11 +112,11 @@ typedef STATUS (CALLBACK LNPUBLIC *NSFDBCLOSE)(
 	DBHANDLE hDB);
 extern NSFDBCLOSE NSFDbClose1;
 
-typedef WORD (CALLBACK LNPUBLIC *OSLOADSTRING)(
+typedef uint16_t (CALLBACK LNPUBLIC *OSLOADSTRING)(
 	HMODULE  hModule,
 	STATUS  StringCode,
 	char far *retBuffer,
-	WORD  BufferLength);
+	uint16_t  BufferLength);
 extern OSLOADSTRING OSLoadString1;
 
 typedef void (CALLBACK LNPUBLIC *NOTESTERM)(void);
@@ -125,7 +125,7 @@ extern NOTESTERM NotesTerm1;
 typedef BOOL (CALLBACK LNPUBLIC *OSGETENVIRONMENTSTRING)(
 	const char far *VariableName,
 	char far *retValueBuffer,
-	WORD  BufferLength);
+	uint16_t  BufferLength);
 extern OSGETENVIRONMENTSTRING OSGetEnvironmentString1;
 
 typedef void (CALLBACK LNPUBLIC *OSSETENVIRONMENTVARIABLE)(
@@ -154,7 +154,7 @@ typedef STATUS  (CALLBACK LNPUBLIC *EMREGISTER)(
 	EID  EmID,
 	DWORD  Flags,
 	EMHANDLER  Proc,
-	WORD  RecursionID,
+	uint16_t  RecursionID,
 	HEMREGISTRATION far *rethRegistration);
 extern EMREGISTER EMRegister1;
 
diff --git a/protocols/Non-IM Contact/src/contactinfo.cpp b/protocols/Non-IM Contact/src/contactinfo.cpp
index 47effee3e7..551bee412b 100644
--- a/protocols/Non-IM Contact/src/contactinfo.cpp
+++ b/protocols/Non-IM Contact/src/contactinfo.cpp
@@ -242,11 +242,11 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 
 				for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_MAX; i++)
 					if (IsDlgButtonChecked(hwnd, i))
-						g_plugin.setWord(hContact, "Icon", (WORD)i);
+						g_plugin.setWord(hContact, "Icon", (uint16_t)i);
 
 				/* set correct status */
 				if (status == ID_STATUS_ONLINE || status == ID_STATUS_AWAY || (status == g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE)))
-					g_plugin.setWord(hContact, "Status", (WORD)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
+					g_plugin.setWord(hContact, "Status", (uint16_t)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
 				else
 					g_plugin.setWord(hContact, "Status", ID_STATUS_OFFLINE);
 
@@ -254,7 +254,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 					if (GetWindowTextLength(GetDlgItem(hwnd, IDC_TIMER))) {
 						wchar_t text[512];
 						GetDlgItemText(hwnd, IDC_TIMER, text, _countof(text));
-						g_plugin.setWord(hContact, "Timer", (WORD)_wtoi(text));
+						g_plugin.setWord(hContact, "Timer", (uint16_t)_wtoi(text));
 					}
 					else g_plugin.setWord(hContact, "Timer", 15);
 				}
@@ -645,9 +645,9 @@ INT_PTR ImportContacts(WPARAM, LPARAM)
 				// timer
 				g_plugin.setByte(hContact, "UseTimer", (uint8_t)usetimer);
 				g_plugin.setByte(hContact, "Minutes", (uint8_t)minutes);
-				g_plugin.setWord(hContact, "Timer", (WORD)timer);
+				g_plugin.setWord(hContact, "Timer", (uint16_t)timer);
 				//icon
-				g_plugin.setWord(hContact, "Icon", (WORD)icon);
+				g_plugin.setWord(hContact, "Icon", (uint16_t)icon);
 				replaceAllStrings(hContact);
 			}
 			free(msg);
diff --git a/protocols/Non-IM Contact/src/dialog.cpp b/protocols/Non-IM Contact/src/dialog.cpp
index 8549d7cecc..1676198969 100644
--- a/protocols/Non-IM Contact/src/dialog.cpp
+++ b/protocols/Non-IM Contact/src/dialog.cpp
@@ -61,7 +61,7 @@ INT_PTR CALLBACK DlgProcNimcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 				g_plugin.setByte("AwayAsStatus", (uint8_t)IsDlgButtonChecked(hwnd, IDC_AWAYISNOTONLINE));
 				if (BST_UNCHECKED == IsDlgButtonChecked(hwnd, IDC_DISABLETIMER) && GetWindowTextLength(GetDlgItem(hwnd, IDC_TIMER_INT))) {
 					GetDlgItemText(hwnd, IDC_TIMER_INT, tmp, _countof(tmp));
-					g_plugin.setWord("Timer", (WORD)_wtoi(tmp));
+					g_plugin.setWord("Timer", (uint16_t)_wtoi(tmp));
 				}
 				else g_plugin.setWord("Timer", 0);
 				return TRUE;
@@ -217,22 +217,6 @@ INT_PTR LoadFilesDlg(WPARAM, LPARAM)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static int CALLBACK PropSheetProc(HWND, UINT uMsg, LPARAM lParam)
-{
-	if (uMsg == PSCB_PRECREATE) {
-		// Remove the DS_CONTEXTHELP style from the
-		// dialog box template
-		if (((DLGTEMPLATEEX*)lParam)->signature == 0xFFFF)
-			((DLGTEMPLATEEX*)lParam)->style &= ~DS_CONTEXTHELP;
-		else
-			((LPDLGTEMPLATE)lParam)->style &= ~DS_CONTEXTHELP;
-
-		return TRUE;
-	}
-
-	return 0;
-}
-
 void DoPropertySheet(MCONTACT hContact)
 {
 	char nick[256];
@@ -294,9 +278,6 @@ void DoPropertySheet(MCONTACT hContact)
 	}
 	psh.nPages = _countof(psp);
 	psh.ppsp = (LPCPROPSHEETPAGEA)&psp;
-	psh.pfnCallback = PropSheetProc;
-
-	// Now do it and return
 	PropertySheetA(&psh);
 }
 
diff --git a/protocols/Non-IM Contact/src/files.cpp b/protocols/Non-IM Contact/src/files.cpp
index 17a11edd3c..76302f3b9f 100644
--- a/protocols/Non-IM Contact/src/files.cpp
+++ b/protocols/Non-IM Contact/src/files.cpp
@@ -193,7 +193,7 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 									timer = atoi(text);
 								}
 								mir_snprintf(fn, "fn%d_timer", i);
-								g_plugin.setWord(fn, (WORD)timer);
+								g_plugin.setWord(fn, (uint16_t)timer);
 								SendMessage(hwnd, WM_RELOADWINDOW, 0, 0);
 							}
 							break;
@@ -302,7 +302,7 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				if (!db_get_static(NULL, MODNAME, fn, string, _countof(string)))
 					if (!strncmp("http://", string, mir_strlen("http://")) || !strncmp("https://", string, mir_strlen("https://"))) {
 						mir_snprintf(fn, "fn%d_timer", i);
-						g_plugin.setWord(fn, (WORD)timer);
+						g_plugin.setWord(fn, (uint16_t)timer);
 					}
 
 				return TRUE;
diff --git a/protocols/Non-IM Contact/src/namereplacing.cpp b/protocols/Non-IM Contact/src/namereplacing.cpp
index 00a9ca07ab..d1a678d446 100644
--- a/protocols/Non-IM Contact/src/namereplacing.cpp
+++ b/protocols/Non-IM Contact/src/namereplacing.cpp
@@ -306,7 +306,7 @@ void checkStringForSaveN(CMStringA &str)
 					break;
 				case '1':
 				case 'w':
-					db_set_w(0, A, B, (WORD)atoi(C));
+					db_set_w(0, A, B, (uint16_t)atoi(C));
 					break;
 				case '2':
 				case 'd':
@@ -433,7 +433,7 @@ void checkIcon(MCONTACT hContact, char* string)
 	if (str) {
 		int icon = getNumber(str + 5);
 		if (icon >= 0)
-			g_plugin.setWord(hContact, "Status", (WORD)(ID_STATUS_OFFLINE + icon));
+			g_plugin.setWord(hContact, "Status", (uint16_t)(ID_STATUS_OFFLINE + icon));
 	}
 }
 
@@ -606,7 +606,7 @@ void WriteSetting(MCONTACT hContact, char* module1, char* setting1, char* module
 		if ((status == ID_STATUS_ONLINE) || (status == ID_STATUS_AWAY) ||
 			 (status == g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE)) ||
 			 g_plugin.getByte(hContact, "AlwaysVisible", 0))
-			g_plugin.setWord(hContact, "Status", (WORD)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
+			g_plugin.setWord(hContact, "Status", (uint16_t)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
 		else
 			g_plugin.setWord(hContact, "Status", ID_STATUS_OFFLINE);
 	}
diff --git a/protocols/Non-IM Contact/src/services.cpp b/protocols/Non-IM Contact/src/services.cpp
index 4a584e653a..4fda75ac4a 100644
--- a/protocols/Non-IM Contact/src/services.cpp
+++ b/protocols/Non-IM Contact/src/services.cpp
@@ -55,7 +55,7 @@ int SetLCStatus(WPARAM wParam, LPARAM)
 {
 	int oldStatus = LCStatus;
 	LCStatus = wParam;
-	g_plugin.setWord("Status", (WORD)wParam);
+	g_plugin.setWord("Status", (uint16_t)wParam);
 	g_plugin.setWord("timerCount", 0);
 	if (LCStatus == ID_STATUS_OFFLINE || (LCStatus == ID_STATUS_AWAY && !g_plugin.getByte("AwayAsStatus", 0)) || !g_plugin.getWord("Timer", 1))
 		killTimer();
@@ -69,27 +69,27 @@ int SetLCStatus(WPARAM wParam, LPARAM)
 		switch (LCStatus) {
 		case ID_STATUS_OFFLINE:
 			if (g_plugin.getByte(hContact, "AlwaysVisible", 0) && !g_plugin.getByte(hContact, "VisibleUnlessOffline", 1))
-				g_plugin.setWord(hContact, "Status", (WORD)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
+				g_plugin.setWord(hContact, "Status", (uint16_t)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
 			else
 				g_plugin.setWord(hContact, "Status", ID_STATUS_OFFLINE);
 			break;
 
 		case ID_STATUS_ONLINE:
-			g_plugin.setWord(hContact, "Status", (WORD)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
+			g_plugin.setWord(hContact, "Status", (uint16_t)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
 			break;
 
 		case ID_STATUS_AWAY:
 			if (g_plugin.getByte("AwayAsStatus", 0) && (g_plugin.getByte(hContact, "AlwaysVisible", 0) || (g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE) == ID_STATUS_AWAY)))
-				g_plugin.setWord(hContact, "Status", (WORD)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
+				g_plugin.setWord(hContact, "Status", (uint16_t)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
 			else if (!g_plugin.getByte("AwayAsStatus", 0))
-				g_plugin.setWord(hContact, "Status", (WORD)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
+				g_plugin.setWord(hContact, "Status", (uint16_t)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
 			else
 				g_plugin.setWord(hContact, "Status", ID_STATUS_OFFLINE);
 			break;
 
 		default:
 			if (g_plugin.getByte(hContact, "AlwaysVisible", 0) || LCStatus == g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE))
-				g_plugin.setWord(hContact, "Status", (WORD)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
+				g_plugin.setWord(hContact, "Status", (uint16_t)g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE));
 			break;
 		}
 	}
diff --git a/protocols/Non-IM Contact/src/stdafx.h b/protocols/Non-IM Contact/src/stdafx.h
index d98b8e9607..eea3c27698 100644
--- a/protocols/Non-IM Contact/src/stdafx.h
+++ b/protocols/Non-IM Contact/src/stdafx.h
@@ -16,20 +16,6 @@
 #include <process.h>
 #include <string.h>
 
-struct DLGTEMPLATEEX
-{
-    WORD dlgVer;
-    WORD signature;
-    DWORD helpID;
-    DWORD exStyle;
-    DWORD style;
-    WORD cDlgItems;
-    short x;
-    short y;
-    short cx;
-    short cy;
-};
-
 #include <newpluginapi.h>
 #include <m_clistint.h>
 #include <m_skin.h>
@@ -50,7 +36,7 @@ struct DLGTEMPLATEEX
 //=======================================================
 //	Definitions
 //=======================================================
-#define MODNAME        "NIM_Contact"
+#define MODNAME           "NIM_Contact"
 #define modFullname       "Non-IM Contact"
 #define MAXLINES          10000
 #define MAX_STRING_LENGTH 10000
diff --git a/protocols/Non-IM Contact/src/timer.cpp b/protocols/Non-IM Contact/src/timer.cpp
index c0c292dcc9..91359ef387 100644
--- a/protocols/Non-IM Contact/src/timer.cpp
+++ b/protocols/Non-IM Contact/src/timer.cpp
@@ -19,7 +19,7 @@ void timerFunc(void*)
 		killTimer();
 		return;
 	}
-	g_plugin.setWord("timerCount", (WORD)timerCount);
+	g_plugin.setWord("timerCount", (uint16_t)timerCount);
 
 	/* update the web pages*/
 	for (int i = 0;; i++) {
diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp
index 44fddd4a4d..185e7d947e 100644
--- a/protocols/Sametime/src/options.cpp
+++ b/protocols/Sametime/src/options.cpp
@@ -100,14 +100,14 @@ static INT_PTR CALLBACK DlgProcOptNet(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
 		proto = (CSametimeProto*)lParam;
 
-		WORD client_ver = proto->GetClientVersion();
+		uint16_t client_ver = proto->GetClientVersion();
 		if (client_ver) {
 			wchar_t verbuf[100];
 			mir_snwprintf(verbuf, TranslateT("Client protocol version: %03d.%03d"), (client_ver & 0xFF00) >> 8, client_ver & 0xFF);
 			SetDlgItemText(hwndDlg, IDC_ST_CLIENTVER, verbuf);
 		}
 
-		WORD server_ver = proto->GetServerVersion();
+		uint16_t server_ver = proto->GetServerVersion();
 		if (server_ver) {
 			wchar_t verbuf[100];
 			mir_snwprintf(verbuf, TranslateT("Server protocol version: %03d.%03d"), (server_ver & 0xFF00) >> 8, server_ver & 0xFF);
diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index 2f1cf45750..d38daef4ae 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -108,8 +108,8 @@ struct CSametimeProto : public PROTO<CSametimeProto>
 	void UpdateSelfStatus();
 	int SetIdle(bool idle);
 	void SetSessionAwayMessage(int status, const wchar_t* msg);
-	WORD GetClientVersion();
-	WORD GetServerVersion();
+	uint16_t GetClientVersion();
+	uint16_t GetServerVersion();
 	INT_PTR __cdecl SessionAnnounce(WPARAM wParam, LPARAM lParam);
 	void InitAwayMsg();
 	void DeinitAwayMsg();
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp
index 2eef58c14a..925681abdd 100644
--- a/protocols/Sametime/src/sametime_session.cpp
+++ b/protocols/Sametime/src/sametime_session.cpp
@@ -449,21 +449,21 @@ void __cdecl CSametimeProto::SessionThread(LPVOID)
 	return;
 }
 
-WORD CSametimeProto::GetClientVersion()
+uint16_t CSametimeProto::GetClientVersion()
 {
 	if (!session) return 0;
 
-	WORD retval = 0;
+	uint16_t retval = 0;
 	retval = (UINT_PTR)mwSession_getProperty(session, mwSession_CLIENT_VER_MAJOR) << 8;
 	retval |= (UINT_PTR)mwSession_getProperty(session, mwSession_CLIENT_VER_MINOR);
 	return retval;
 }
 
-WORD CSametimeProto::GetServerVersion()
+uint16_t CSametimeProto::GetServerVersion()
 {
 	if (!session) return 0;
 
-	WORD retval = 0;
+	uint16_t retval = 0;
 	retval = (UINT_PTR)mwSession_getProperty(session, mwSession_SERVER_VER_MAJOR) << 8;
 	retval |= (UINT_PTR)mwSession_getProperty(session, mwSession_SERVER_VER_MINOR);
 	return retval;
diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp
index afca4738ae..24135327e2 100644
--- a/protocols/SkypeWeb/src/skype_contacts.cpp
+++ b/protocols/SkypeWeb/src/skype_contacts.cpp
@@ -17,14 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
 
-WORD CSkypeProto::GetContactStatus(MCONTACT hContact)
+uint16_t CSkypeProto::GetContactStatus(MCONTACT hContact)
 {
 	return getWord(hContact, "Status", ID_STATUS_OFFLINE);
 }
 
-void CSkypeProto::SetContactStatus(MCONTACT hContact, WORD status)
+void CSkypeProto::SetContactStatus(MCONTACT hContact, uint16_t status)
 {
-	WORD oldStatus = GetContactStatus(hContact);
+	uint16_t oldStatus = GetContactStatus(hContact);
 	if (oldStatus != status) {
 		setWord(hContact, "Status", status);
 		if (status == ID_STATUS_OFFLINE)
diff --git a/protocols/SkypeWeb/src/skype_db.cpp b/protocols/SkypeWeb/src/skype_db.cpp
index 9d30f6f8a6..9e3b013a20 100644
--- a/protocols/SkypeWeb/src/skype_db.cpp
+++ b/protocols/SkypeWeb/src/skype_db.cpp
@@ -38,7 +38,7 @@ MEVENT CSkypeProto::GetMessageFromDb(const char *messageId)
 	return db_event_getById(m_szModuleName, messageId);
 }
 
-MEVENT CSkypeProto::AddDbEvent(WORD type, MCONTACT hContact, DWORD timestamp, DWORD flags, const CMStringW &content, const CMStringA &msgId)
+MEVENT CSkypeProto::AddDbEvent(uint16_t type, MCONTACT hContact, DWORD timestamp, DWORD flags, const CMStringW &content, const CMStringA &msgId)
 {
 	if (MEVENT hDbEvent = GetMessageFromDb(msgId))
 		return hDbEvent;
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 4e0782f5a4..8720fa7a46 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -248,8 +248,8 @@ private:
 	void __cdecl CSkypeProto::SendFileThread(void *p);
 
 	// contacts
-	WORD GetContactStatus(MCONTACT hContact);
-	void SetContactStatus(MCONTACT hContact, WORD status);
+	uint16_t GetContactStatus(MCONTACT hContact);
+	void SetContactStatus(MCONTACT hContact, uint16_t status);
 
 	void SetAvatarUrl(MCONTACT hContact, CMStringW &tszUrl);
 	void ReloadAvatarInfo(MCONTACT hContact);
@@ -266,7 +266,7 @@ private:
 	std::map<ULONGLONG, HANDLE> m_mpOutMessagesIds;
 
 	MEVENT GetMessageFromDb(const char *messageId);
-	MEVENT AddDbEvent(WORD type, MCONTACT hContact, DWORD timestamp, DWORD flags, const CMStringW &content, const CMStringA &msgId);
+	MEVENT AddDbEvent(uint16_t type, MCONTACT hContact, DWORD timestamp, DWORD flags, const CMStringW &content, const CMStringA &msgId);
 	void EditEvent(MCONTACT hContact, MEVENT hEvent, const CMStringW &content, time_t edit_time);
 
 	int OnSendMessage(MCONTACT hContact, int flags, const char *message);
diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp
index 7f1862408a..987ad50528 100644
--- a/protocols/Steam/src/steam_contacts.cpp
+++ b/protocols/Steam/src/steam_contacts.cpp
@@ -6,12 +6,12 @@ void CSteamProto::SetAllContactStatuses(int status)
 		SetContactStatus(hContact, status);
 }
 
-void CSteamProto::SetContactStatus(MCONTACT hContact, WORD status)
+void CSteamProto::SetContactStatus(MCONTACT hContact, uint16_t status)
 {
 	if (!hContact)
 		return;
 
-	WORD oldStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);
+	uint16_t oldStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);
 	if (oldStatus == status)
 		return;
 
@@ -152,10 +152,10 @@ void CSteamProto::UpdateContactDetails(MCONTACT hContact, const JSONNode &data)
 	// status
 	// note: this here is often wrong info, probably depending on publicity of steam profile
 	// but sometimes polling does not get status at all
-	WORD oldStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);
+	uint16_t oldStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);
 	// so, set status only if contact is offline
 	if (oldStatus == ID_STATUS_OFFLINE) {
-		WORD status = SteamToMirandaStatus((PersonaState)data["personastate"].as_int());
+		uint16_t status = SteamToMirandaStatus((PersonaState)data["personastate"].as_int());
 		SetContactStatus(hContact, status);
 	}
 
@@ -165,7 +165,7 @@ void CSteamProto::UpdateContactDetails(MCONTACT hContact, const JSONNode &data)
 
 	if (stateflags == PersonaStateFlag::None) {
 		// nothing special, either standard client or in different status (only online, I want to play, I want to trade statuses support this flags)
-		WORD status = getWord(hContact, "Status", ID_STATUS_OFFLINE);
+		uint16_t status = getWord(hContact, "Status", ID_STATUS_OFFLINE);
 		if (status == ID_STATUS_ONLINE || status == ID_STATUS_FREECHAT)
 			setWString(hContact, "MirVer", L"Steam");
 	}
diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h
index 8e4596c8ae..4c72b97c57 100644
--- a/protocols/Steam/src/steam_proto.h
+++ b/protocols/Steam/src/steam_proto.h
@@ -153,7 +153,7 @@ protected:
 
 	// contacts
 	void SetAllContactStatuses(int status);
-	void SetContactStatus(MCONTACT hContact, WORD status);
+	void SetContactStatus(MCONTACT hContact, uint16_t status);
 
 	MCONTACT GetContactFromAuthEvent(MEVENT hEvent);
 
@@ -239,7 +239,7 @@ protected:
 	INT_PTR __cdecl OnAccountManagerInit(WPARAM wParam, LPARAM lParam);
 
 	// utils
-	static WORD SteamToMirandaStatus(PersonaState state);
+	static uint16_t SteamToMirandaStatus(PersonaState state);
 	static PersonaState MirandaToSteamState(int status);
 
 	static int RsaEncrypt(const char *pszModulus, DWORD &exponent, const char *data, uint8_t *encrypted, DWORD &encryptedSize);
diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp
index ad6b8b3732..7322aaf092 100644
--- a/protocols/Steam/src/steam_utils.cpp
+++ b/protocols/Steam/src/steam_utils.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-WORD CSteamProto::SteamToMirandaStatus(PersonaState state)
+uint16_t CSteamProto::SteamToMirandaStatus(PersonaState state)
 {
 	switch (state) {
 	case PersonaState::Offline:
diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp
index bf0ba87a1c..7f80531fee 100644
--- a/protocols/Tox/src/tox_contacts.cpp
+++ b/protocols/Tox/src/tox_contacts.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 
-WORD CToxProto::GetContactStatus(MCONTACT hContact)
+uint16_t CToxProto::GetContactStatus(MCONTACT hContact)
 {
 	return getWord(hContact, "Status", ID_STATUS_OFFLINE);
 }
 
-void CToxProto::SetContactStatus(MCONTACT hContact, WORD status)
+void CToxProto::SetContactStatus(MCONTACT hContact, uint16_t status)
 {
-	WORD oldStatus = GetContactStatus(hContact);
+	uint16_t oldStatus = GetContactStatus(hContact);
 	if (oldStatus != status)
 		setWord(hContact, "Status", status);
 }
diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 8367c8c71f..e3713c9de6 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -140,8 +140,8 @@ private:
 	int __cdecl OnUserInfoInit(WPARAM wParam, LPARAM lParam);
 
 	// contacts
-	WORD GetContactStatus(MCONTACT hContact);
-	void SetContactStatus(MCONTACT hContact, WORD status);
+	uint16_t GetContactStatus(MCONTACT hContact);
+	void SetContactStatus(MCONTACT hContact, uint16_t status);
 
 	MCONTACT GetContact(const Tox *tox, const int friendNumber);
 	MCONTACT GetContact(const char *pubKey);
@@ -236,7 +236,7 @@ private:
 
 	static bool IsFileExists(const wchar_t* path);
 
-	MEVENT AddEventToDb(MCONTACT hContact, WORD type, DWORD timestamp, DWORD flags, uint8_t *pBlob, size_t cbBlob);
+	MEVENT AddEventToDb(MCONTACT hContact, uint16_t type, DWORD timestamp, DWORD flags, uint8_t *pBlob, size_t cbBlob);
 };
 
 struct CMPlugin : public ACCPROTOPLUGIN<CToxProto>
diff --git a/protocols/Tox/src/tox_utils.cpp b/protocols/Tox/src/tox_utils.cpp
index 96e7934b2b..4620f5726c 100644
--- a/protocols/Tox/src/tox_utils.cpp
+++ b/protocols/Tox/src/tox_utils.cpp
@@ -126,7 +126,7 @@ bool CToxProto::IsFileExists(const wchar_t* path)
 	return _waccess(path, 0) == 0;
 }
 
-MEVENT CToxProto::AddEventToDb(MCONTACT hContact, WORD type, DWORD timestamp, DWORD flags, uint8_t *pBlob, size_t cbBlob)
+MEVENT CToxProto::AddEventToDb(MCONTACT hContact, uint16_t type, DWORD timestamp, DWORD flags, uint8_t *pBlob, size_t cbBlob)
 {
 	DBEVENTINFO dbei = {};
 	dbei.szModule = this->m_szModuleName;
diff --git a/protocols/Weather/src/stdafx.h b/protocols/Weather/src/stdafx.h
index bb8f288541..5d8597247e 100644
--- a/protocols/Weather/src/stdafx.h
+++ b/protocols/Weather/src/stdafx.h
@@ -187,16 +187,16 @@ struct MYOPTIONS
 	uint8_t RemoveOldData;
 	uint8_t MakeItalic;
 
-	WORD UpdateTime;
-	WORD AvatarSize;
+	uint16_t UpdateTime;
+	uint16_t AvatarSize;
 
 	// units
-	WORD tUnit;
-	WORD wUnit;
-	WORD vUnit;
-	WORD pUnit;
-	WORD dUnit;
-	WORD eUnit;
+	uint16_t tUnit;
+	uint16_t wUnit;
+	uint16_t vUnit;
+	uint16_t pUnit;
+	uint16_t dUnit;
+	uint16_t eUnit;
 	wchar_t DegreeSign[4];
 	uint8_t DoNotAppendUnit;
 	uint8_t NoFrac;
@@ -407,7 +407,7 @@ int MapCondToStatus(MCONTACT hContact);
 HICON GetStatusIcon(MCONTACT hContact);
 HICON GetStatusIconBig(MCONTACT hContact);
 
-WORD GetIcon(const wchar_t* cond, WIDATA *Data);
+uint16_t GetIcon(const wchar_t* cond, WIDATA *Data);
 void CaseConv(wchar_t *str);
 void TrimString(char *str);
 void TrimString(wchar_t *str);
@@ -437,7 +437,7 @@ void wSetData(wchar_t *&Data, const wchar_t *Value);
 void wfree(char *&Data);
 void wfree(wchar_t *&Data);
 
-void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM lParam);
+void DBDataManage(MCONTACT hContact, uint16_t Mode, WPARAM wParam, LPARAM lParam);
 
 // functions in weather_http.c
 int InternetDownloadFile (char *szUrl, char *cookie, char *userAgent, wchar_t** szData);
@@ -471,7 +471,7 @@ const wchar_t* GetDefaultText(int c);
 // functions in weather_popup.c
 int WeatherPopup(WPARAM wParam, LPARAM lParam);
 int WeatherError(WPARAM wParam, LPARAM lParam);
-int WPShowMessage(const wchar_t* lpzText, WORD kind);
+int WPShowMessage(const wchar_t* lpzText, uint16_t kind);
 
 LRESULT CALLBACK PopupWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
diff --git a/protocols/Weather/src/weather_conv.cpp b/protocols/Weather/src/weather_conv.cpp
index 2c29e1865f..dc1dfa4f03 100644
--- a/protocols/Weather/src/weather_conv.cpp
+++ b/protocols/Weather/src/weather_conv.cpp
@@ -317,9 +317,9 @@ void GetElev(wchar_t *tempchar, wchar_t *unit, wchar_t *str)
 // return value = status for the icon (ONLINE, OFFLINE, etc)
 
 static const wchar_t *statusStr[MAX_COND] = { L"Lightning", L"Fog", L"Snow", L"Rain", L"Partly Cloudy", L"Cloudy", L"Sunny", L"N/A", L"Rain Shower", L"Snow Shower"};
-static const WORD statusValue[MAX_COND] = { LIGHT, FOG, SNOW, RAIN, PCLOUDY, CLOUDY, SUNNY, NA, RSHOWER, SSHOWER };
+static const uint16_t statusValue[MAX_COND] = { LIGHT, FOG, SNOW, RAIN, PCLOUDY, CLOUDY, SUNNY, NA, RSHOWER, SSHOWER };
 
-WORD GetIcon(const wchar_t *cond, WIDATA *Data)
+uint16_t GetIcon(const wchar_t *cond, WIDATA *Data)
 {
 	// set the icon using ini
 	for (int i = 0; i < _countof(statusValue); i++)
diff --git a/protocols/Weather/src/weather_data.cpp b/protocols/Weather/src/weather_data.cpp
index 69c92d8cda..0f3cf9ccc9 100644
--- a/protocols/Weather/src/weather_data.cpp
+++ b/protocols/Weather/src/weather_data.cpp
@@ -402,7 +402,7 @@ int GetWeatherDataFromDB(const char *szSetting, void *lparam)
 // remove or display the weather information for a contact
 // hContact - the contact in which the info is going to be removed
 //
-void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM)
+void DBDataManage(MCONTACT hContact, uint16_t Mode, WPARAM wParam, LPARAM)
 {
 	// get all the settings and store them in a temporary list
 	LIST<char> arSettings(10);
diff --git a/protocols/Weather/src/weather_opt.cpp b/protocols/Weather/src/weather_opt.cpp
index 3a8d7f26dd..9dd186f751 100644
--- a/protocols/Weather/src/weather_opt.cpp
+++ b/protocols/Weather/src/weather_opt.cpp
@@ -268,7 +268,7 @@ static INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM l
 
 			// get update time and remove the old timer
 			GetDlgItemText(hdlg, IDC_UPDATETIME, str, _countof(str));
-			opt.UpdateTime = (WORD)_wtoi(str);
+			opt.UpdateTime = (uint16_t)_wtoi(str);
 			if (opt.UpdateTime < 1)	opt.UpdateTime = 1;
 			KillTimer(nullptr, timerId);
 			timerId = SetTimer(nullptr, 0, opt.UpdateTime * 60000, timerProc);
diff --git a/protocols/Weather/src/weather_popup.cpp b/protocols/Weather/src/weather_popup.cpp
index 94ed3508a4..f0be40f798 100644
--- a/protocols/Weather/src/weather_popup.cpp
+++ b/protocols/Weather/src/weather_popup.cpp
@@ -81,7 +81,7 @@ int WeatherError(WPARAM wParam, LPARAM lParam)
 //  (threaded)
 // lpzText = error text
 // kind = display type (see m_popup.h)
-int WPShowMessage(const wchar_t* lpzText, WORD kind)
+int WPShowMessage(const wchar_t* lpzText, uint16_t kind)
 {
 	NotifyEventHooks(hHookWeatherError, (WPARAM)lpzText, (LPARAM)kind);
 	return 0;
diff --git a/protocols/Weather/src/weather_update.cpp b/protocols/Weather/src/weather_update.cpp
index 93a519f495..37d75a01f8 100644
--- a/protocols/Weather/src/weather_update.cpp
+++ b/protocols/Weather/src/weather_update.cpp
@@ -398,7 +398,7 @@ int GetWeatherData(MCONTACT hContact)
 	if (Data == nullptr)
 		return SVC_NOT_FOUND;	// the ini for the station cannot be found
 
-	WORD cond = NA;
+	uint16_t cond = NA;
 	char loc[256];
 	for (int i = 0; i < 4; ++i) {
 		// generate update URL
diff --git a/protocols/WebView/src/main.cpp b/protocols/WebView/src/main.cpp
index 48411337cc..2c5c97fc9a 100644
--- a/protocols/WebView/src/main.cpp
+++ b/protocols/WebView/src/main.cpp
@@ -71,7 +71,7 @@ void InitServices()
 
 void ChangeContactStatus(int con_stat)
 {
-   WORD status_code = 0;
+   uint16_t status_code = 0;
    if (con_stat == 0)
       status_code = ID_STATUS_OFFLINE;
    if (con_stat == 1)
diff --git a/protocols/YAMN/src/account.cpp b/protocols/YAMN/src/account.cpp
index 43af27579c..302249841e 100644
--- a/protocols/YAMN/src/account.cpp
+++ b/protocols/YAMN/src/account.cpp
@@ -505,8 +505,8 @@ DWORD ReadAccountFromMemory(CAccount *Which, char **Parser, char *End)
 	if (Stat = ReadStringFromMemory(Parser, End, &Which->Server->Name))
 #endif
 		return Stat;
-	Which->Server->Port = *(WORD *)(*Parser);
-	(*Parser) += sizeof(WORD);
+	Which->Server->Port = *(uint16_t *)(*Parser);
+	(*Parser) += sizeof(uint16_t);
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef	DEBUG_FILEREAD
@@ -550,9 +550,9 @@ DWORD ReadAccountFromMemory(CAccount *Which, char **Parser, char *End)
 #endif
 
 	//Read account miscellaneous parameters
-	Which->Interval = *(WORD *)(*Parser);
+	Which->Interval = *(uint16_t *)(*Parser);
 	Which->TimeLeft = Which->Interval;		//check on loading
-	(*Parser) += sizeof(WORD);
+	(*Parser) += sizeof(uint16_t);
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
@@ -885,7 +885,7 @@ static INT_PTR PerformAccountWriting(HYAMNPROTOPLUGIN Plugin, HANDLE File)
 				(!WriteFile(File, (char *)&ActualAccount->PluginFlags, sizeof(DWORD), &WrittenBytes, nullptr))))
 				throw (DWORD)EACC_SYSTEM;
 
-			if (!WriteFile(File, (char *)&ActualAccount->Interval, sizeof(WORD), &WrittenBytes, nullptr))
+			if (!WriteFile(File, (char *)&ActualAccount->Interval, sizeof(uint16_t), &WrittenBytes, nullptr))
 				throw (DWORD)EACC_SYSTEM;
 
 			if ((!WriteFile(File, (char *)&ActualAccount->NewMailN.Flags, sizeof(DWORD), &WrittenBytes, nullptr)) ||
diff --git a/protocols/YAMN/src/browser/mailbrowser.cpp b/protocols/YAMN/src/browser/mailbrowser.cpp
index 4c0b3c285f..80b379d2f2 100644
--- a/protocols/YAMN/src/browser/mailbrowser.cpp
+++ b/protocols/YAMN/src/browser/mailbrowser.cpp
@@ -1084,7 +1084,7 @@ void FileTimeToLocalizedDateTime(LONGLONG filetime, wchar_t *dateout, int lendat
 		return;
 	}
 	SYSTEMTIME st;
-	WORD wTodayYear = 0, wTodayMonth = 0, wTodayDay = 0;
+	uint16_t wTodayYear = 0, wTodayMonth = 0, wTodayDay = 0;
 	FILETIME ft;
 	BOOL willShowDate = !(optDateTime&SHOWDATENOTODAY);
 	if (!willShowDate) {
diff --git a/protocols/YAMN/src/proto/pop3/pop3comm.cpp b/protocols/YAMN/src/proto/pop3/pop3comm.cpp
index 526ffaad03..bd6b72bd11 100644
--- a/protocols/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3comm.cpp
@@ -354,7 +354,7 @@ DWORD WINAPI WritePOP3Options(HANDLE File, CAccount *Which)
 	DWORD Ver = POP3_FILEVERSION;
 
 	if ((!WriteFile(File, (char *)&Ver, sizeof(DWORD), &WrittenBytes, nullptr)) ||
-		(!WriteFile(File, (char *)&((HPOP3ACCOUNT)Which)->CP, sizeof(WORD), &WrittenBytes, nullptr)))
+		(!WriteFile(File, (char *)&((HPOP3ACCOUNT)Which)->CP, sizeof(uint16_t), &WrittenBytes, nullptr)))
 		return EACC_SYSTEM;
 	return 0;
 }
@@ -372,8 +372,8 @@ DWORD WINAPI ReadPOP3Options(CAccount *Which, char **Parser, char *End)
 	if (Ver != POP3_FILEVERSION)
 		return EACC_FILECOMPATIBILITY;
 
-	((HPOP3ACCOUNT)Which)->CP = *(WORD *)(*Parser);
-	(*Parser) += sizeof(WORD);
+	((HPOP3ACCOUNT)Which)->CP = *(uint16_t *)(*Parser);
+	(*Parser) += sizeof(uint16_t);
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
diff --git a/protocols/YAMN/src/proto/pop3/pop3comm.h b/protocols/YAMN/src/proto/pop3/pop3comm.h
index 3d98675d3c..4abae49281 100644
--- a/protocols/YAMN/src/proto/pop3/pop3comm.h
+++ b/protocols/YAMN/src/proto/pop3/pop3comm.h
@@ -15,7 +15,7 @@ typedef struct CPOP3Account: public CAccount
 	class CPop3Client Client;
 
 // This member is usefull for MIME headers. It is default codepage, if no other codepage found
-	WORD CP;				//access only through AccountAccessSO
+	uint16_t CP;				//access only through AccountAccessSO
 
 // In this memeber last error code is stored
 	DWORD SystemError;			//access through UseInternetFree
diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index a24eba24e2..dd85484a37 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
@@ -78,7 +78,7 @@ INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM)
 
 	case WM_COMMAND:
 		{
-			WORD wNotifyCode = HIWORD(wParam);
+			uint16_t wNotifyCode = HIWORD(wParam);
 			switch (LOWORD(wParam)) {
 			case IDC_COMBOPLUGINS:
 				if (wNotifyCode == CBN_SELCHANGE) {
@@ -1158,7 +1158,7 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 
 	case WM_COMMAND:
 		{
-			WORD wNotifyCode = HIWORD(wParam);
+			uint16_t wNotifyCode = HIWORD(wParam);
 			switch (LOWORD(wParam)) {
 				LONG Result;
 			case IDC_COMBOACCOUNT:
diff --git a/protocols/YAMN/src/stdafx.h b/protocols/YAMN/src/stdafx.h
index 3c9f07cd79..1925042acb 100644
--- a/protocols/YAMN/src/stdafx.h
+++ b/protocols/YAMN/src/stdafx.h
@@ -134,7 +134,7 @@ INT_PTR UnloadMailDataSvc(WPARAM wParam, LPARAM);
 INT_PTR SaveMailDataSvc(WPARAM wParam, LPARAM lParam);
 
 //From mime.cpp
-//void WINAPI ExtractHeaderFcn(char *,int,WORD,HYAMNMAIL);	//already in MailExported
+//void WINAPI ExtractHeaderFcn(char *,int,uint16_t,HYAMNMAIL);	//already in MailExported
 struct _tcptable
 {
 	char *NameBase, *NameSub;
diff --git a/protocols/YAMN/src/synchro.cpp b/protocols/YAMN/src/synchro.cpp
index 433f0768b6..b6007d992d 100644
--- a/protocols/YAMN/src/synchro.cpp
+++ b/protocols/YAMN/src/synchro.cpp
@@ -59,7 +59,7 @@ void WINAPI ReadDoneFcn(PSWMRG SObject);
 // Note you must not read the number from memory directly, because
 // CPU can stop reading thread when it has read HI-Word, then another thread
 // can change the value and then OS starts the previous thread, that reads the
-// LO-WORD of DWORD. And the return value HI+LO-WORD is corrupted
+// LO-uint16_t of DWORD. And the return value HI+LO-uint16_t is corrupted
 DWORD WINAPI SCGetNumberFcn(PSCOUNTER SCounter);
 
 // Increments SCOUNTER and unsets event
diff --git a/protocols/YAMN/src/yamn.cpp b/protocols/YAMN/src/yamn.cpp
index d355ed3b13..ff5ddfceee 100644
--- a/protocols/YAMN/src/yamn.cpp
+++ b/protocols/YAMN/src/yamn.cpp
@@ -224,7 +224,7 @@ ChangeIsCountingStatusLabel:
 #endif
 			if (((ActualAccount->isCounting) != 0) != isAccountCounting) {
 				ActualAccount->isCounting=isAccountCounting;
-				WORD cStatus = g_plugin.getWord(ActualAccount->hContact, "Status");
+				uint16_t cStatus = g_plugin.getWord(ActualAccount->hContact, "Status");
 				switch (cStatus) {
 					case ID_STATUS_ONLINE:
 					case ID_STATUS_OFFLINE:
diff --git a/src/core/stdautoaway/src/options.cpp b/src/core/stdautoaway/src/options.cpp
index 608f626753..5f176ab467 100644
--- a/src/core/stdautoaway/src/options.cpp
+++ b/src/core/stdautoaway/src/options.cpp
@@ -24,9 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-static const WORD aa_Status[] = { ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND };
+static const uint16_t aa_Status[] = { ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND };
 
-int IdleGetStatusIndex(WORD status)
+int IdleGetStatusIndex(uint16_t status)
 {
 	for (int j = 0; j < _countof(aa_Status); j++)
 		if (aa_Status[j] == status)
diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h
index 1e820ab127..4471a6ddf2 100644
--- a/src/core/stdautoaway/src/stdafx.h
+++ b/src/core/stdautoaway/src/stdafx.h
@@ -79,7 +79,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	CMOption<uint8_t> bIdleCheck, bIdleMethod, bIdleOnSaver, bIdleOnFullScr, bIdleOnLock;
 	CMOption<uint8_t> bIdlePrivate, bIdleSoundsOff, bIdleOnTerminal, bIdleStatusLock;
 	CMOption<uint8_t> bAAEnable;
-	CMOption<WORD> bAAStatus;
+	CMOption<uint16_t> bAAStatus;
 	CMOption<DWORD> iIdleTime1st;
 };
 
diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp
index 6d72b72b6b..d0db6e96e8 100644
--- a/src/core/stdaway/src/awaymsg.cpp
+++ b/src/core/stdaway/src/awaymsg.cpp
@@ -90,7 +90,7 @@ public:
 
 		wchar_t *contactName = Clist_GetContactDisplayName(m_hContact);
 		char *szProto = Proto_GetBaseAccountName(m_hContact);
-		WORD dwStatus = db_get_w(m_hContact, szProto, "Status", ID_STATUS_OFFLINE);
+		uint16_t dwStatus = db_get_w(m_hContact, szProto, "Status", ID_STATUS_OFFLINE);
 		wchar_t *status = Clist_GetStatusModeDescription(dwStatus, 0);
 
 		wchar_t str[256], format[128];
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 49c9d76abd..24ebb16c9f 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -233,7 +233,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 				}
 				db_set_b(0, "CLC", "ShowIdle", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0));
 				db_set_b(0, "CLC", "LeftMargin", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0));
-				db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
+				db_set_w(0, "CLC", "ScrollTime", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
 				db_set_b(0, "CLC", "GroupIndent", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0));
 				db_set_b(0, "CLC", "NoVScrollBar", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0));
 				db_set_b(0, "CLC", "RowHeight", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_GETPOS, 0, 0));
@@ -280,7 +280,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 			}
 		}
 		{
-			WORD bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
+			uint16_t bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
 			CheckDlgButton(hwndDlg, IDC_STRETCHH, bmpUse & CLB_STRETCHH ? BST_CHECKED : BST_UNCHECKED);
 			CheckDlgButton(hwndDlg, IDC_STRETCHV, bmpUse & CLB_STRETCHV ? BST_CHECKED : BST_UNCHECKED);
 			CheckDlgButton(hwndDlg, IDC_TILEH, bmpUse & CLBF_TILEH ? BST_CHECKED : BST_UNCHECKED);
@@ -371,7 +371,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 						db_set_s(0, "CLC", "BkBitmap", str);
 				}
 				{
-					WORD flags = 0;
+					uint16_t flags = 0;
 					if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHH))
 						flags |= CLB_STRETCHH;
 					if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHV))
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index 536fa29a97..61e29dfbf7 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -153,7 +153,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			db_set_b(0, "CLUI", "MaxSizeHeight", (uint8_t)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, nullptr, FALSE));
 			db_set_b(0, "CLUI", "AutoSizeUpward", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD));
 			g_plugin.setByte("AutoHide", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));
-			g_plugin.setWord("HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
+			g_plugin.setWord("HideTime", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
 			g_plugin.setByte("Transparent", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT));
 			g_plugin.setByte("Alpha", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0));
 			g_plugin.setByte("AutoAlpha", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0));
diff --git a/src/core/stdcrypt/src/encrypt.cpp b/src/core/stdcrypt/src/encrypt.cpp
index 3b8d173229..44bdec84d1 100644
--- a/src/core/stdcrypt/src/encrypt.cpp
+++ b/src/core/stdcrypt/src/encrypt.cpp
@@ -148,7 +148,7 @@ uint8_t* CStdCrypt::encodeBuffer(const void *src, size_t cbLen, size_t *cbResult
 		return nullptr;
 
 	uint8_t *tmpBuf = (uint8_t*)_alloca(cbLen + 2);
-	*(PWORD)tmpBuf = (WORD)cbLen;
+	*(PWORD)tmpBuf = (uint16_t)cbLen;
 	memcpy(tmpBuf + 2, src, cbLen);
 	cbLen += 2;
 	size_t rest = cbLen % BLOCK_SIZE;
@@ -199,7 +199,7 @@ void* CStdCrypt::decodeBuffer(const uint8_t *pBuf, size_t bufLen, size_t *cbResu
 	}
 
 	result[bufLen] = 0;
-	WORD cbLen = *(PWORD)result;
+	uint16_t cbLen = *(PWORD)result;
 	if (cbLen > bufLen) {
 		mir_free(result);
 		return nullptr;
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index 1e6b22b57d..ed445a5907 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -281,7 +281,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		dat->hIcon = nullptr;
 		{
 			char *szProto = Proto_GetBaseAccountName(dat->hContact);
-			WORD status = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_ONLINE);
+			uint16_t status = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_ONLINE);
 			SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadProtoIcon(szProto, status));
 		}
 
diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index 0cf8673da1..0623a7ecd7 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -236,8 +236,8 @@ void Load_ChatModule()
 
 void Unload_ChatModule()
 {
-	db_set_w(0, CHAT_MODULE, "SplitterX", (WORD)g_Settings.iSplitterX);
-	db_set_w(0, CHAT_MODULE, "SplitterY", (WORD)g_Settings.iSplitterY);
+	db_set_w(0, CHAT_MODULE, "SplitterX", (uint16_t)g_Settings.iSplitterX);
+	db_set_w(0, CHAT_MODULE, "SplitterY", (uint16_t)g_Settings.iSplitterY);
 	db_set_dw(0, CHAT_MODULE, "roomx", g_Settings.iX);
 	db_set_dw(0, CHAT_MODULE, "roomy", g_Settings.iY);
 	db_set_dw(0, CHAT_MODULE, "roomwidth", g_Settings.iWidth);
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp
index d94f9133fc..62936a6fdb 100644
--- a/src/core/stdmsg/src/chat_options.cpp
+++ b/src/core/stdmsg/src/chat_options.cpp
@@ -529,7 +529,7 @@ public:
 
 		iLen = SendDlgItemMessage(m_hwnd, IDC_SPIN1, UDM_GETPOS, 0, 0);
 		g_Settings.iPopupTimeout = iLen;
-		db_set_w(0, CHAT_MODULE, "PopupTimeout", (WORD)iLen);
+		db_set_w(0, CHAT_MODULE, "PopupTimeout", (uint16_t)iLen);
 
 		db_set_dw(0, CHAT_MODULE, "PopupColorBG", g_Settings.crPUBkgColour = clrBack.GetColor());
 		db_set_dw(0, CHAT_MODULE, "PopupColorText", g_Settings.crPUTextColour = clrText.GetColor());
diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h
index 7207ccb9c3..12d06a65cf 100644
--- a/src/core/stdmsg/src/globals.h
+++ b/src/core/stdmsg/src/globals.h
@@ -55,7 +55,7 @@ struct GlobalMessageData
 	CMOption<bool> bUseStatusWinIcon;
 
 	CMOption<bool> bLimitAvatarHeight;
-	CMOption<WORD> iAvatarHeight;
+	CMOption<uint16_t> iAvatarHeight;
 
 	CMOption<DWORD> popupFlags;
 	CMOption<DWORD> msgTimeout;
@@ -63,7 +63,7 @@ struct GlobalMessageData
 	CMOption<uint8_t>  iGap;
 
 	CMOption<uint8_t>  iLoadHistory;
-	CMOption<WORD>  nLoadCount, nLoadTime;
+	CMOption<uint16_t>  nLoadCount, nLoadTime;
 
 	bool bSmileyInstalled = false;
 };
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index b5ddbf823d..304ada7afb 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -97,8 +97,8 @@ class CMsgDialog : public CSrmmBaseDialog
 	int m_limitAvatarH = 0;
 	DWORD m_lastMessage = 0;
 	HANDLE m_hTimeZone = 0;
-	WORD m_wStatus = ID_STATUS_OFFLINE, m_wOldStatus = ID_STATUS_OFFLINE;
-	WORD m_wMinute = 0;
+	uint16_t m_wStatus = ID_STATUS_OFFLINE, m_wOldStatus = ID_STATUS_OFFLINE;
+	uint16_t m_wMinute = 0;
 	bool m_bIsMeta = false, m_bWindowCascaded = false, m_bNoActivate = false;
 
 public:
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 18df3dee7f..2a88e29ba1 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -597,7 +597,7 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 				TranslateMenu(hSubMenu);
 
 				if (si != nullptr) {
-					WORD w = db_get_w(si->hContact, si->pszModule, "TabPosition", 0);
+					uint16_t w = db_get_w(si->hContact, si->pszModule, "TabPosition", 0);
 					if (w == 0)
 						CheckMenuItem(hSubMenu, ID_LOCKPOSITION, MF_BYCOMMAND | MF_UNCHECKED);
 					else
@@ -614,7 +614,7 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 					if (si != nullptr) {
 						if (!(GetMenuState(hSubMenu, ID_LOCKPOSITION, MF_BYCOMMAND)&MF_CHECKED)) {
 							if (si->hContact)
-								db_set_w(si->hContact, si->pszModule, "TabPosition", (WORD)(i + 1));
+								db_set_w(si->hContact, si->pszModule, "TabPosition", (uint16_t)(i + 1));
 						}
 						else db_unset(si->hContact, si->pszModule, "TabPosition");
 					}
diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp
index 52bdcd5dbc..e6a1be8e7b 100644
--- a/src/core/stdpopup/src/services.cpp
+++ b/src/core/stdpopup/src/services.cpp
@@ -304,7 +304,7 @@ static INT_PTR RegisterPopupClass(WPARAM, LPARAM lParam)
 	char setting[256];
 	mir_snprintf(setting, "%s/Timeout", pc->pszName);
 	pc->iSeconds = g_plugin.getWord(setting, pc->iSeconds);
-	if (pc->iSeconds == (WORD)-1) pc->iSeconds = -1;
+	if (pc->iSeconds == (uint16_t)-1) pc->iSeconds = -1;
 	mir_snprintf(setting, "%s/TextCol", pc->pszName);
 	pc->colorText = (COLORREF)g_plugin.getDword(setting, (DWORD)pc->colorText);
 	mir_snprintf(setting, "%s/BgCol", pc->pszName);
diff --git a/src/core/stduserinfo/src/stdinfo.cpp b/src/core/stduserinfo/src/stdinfo.cpp
index e6c28b3828..e93a697c24 100644
--- a/src/core/stduserinfo/src/stdinfo.cpp
+++ b/src/core/stduserinfo/src/stdinfo.cpp
@@ -121,8 +121,8 @@ static void SetValue(HWND hwndDlg, int idCtrl, MCONTACT hContact, char *szModule
 
 		case DBVT_WORD:
 			if (special == SVS_COUNTRY) {
-				WORD wSave = dbv.wVal;
-				if (wSave == (WORD)-1) {
+				uint16_t wSave = dbv.wVal;
+				if (wSave == (uint16_t)-1) {
 					char szSettingName[100];
 					mir_snprintf(szSettingName, "%sName", szSetting);
 					if (!db_get_ws(hContact, szModule, szSettingName, &dbv)) {
diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp
index ae2d1221bd..173269f7f4 100644
--- a/src/core/stduseronline/src/useronline.cpp
+++ b/src/core/stduseronline/src/useronline.cpp
@@ -34,7 +34,7 @@ static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
 
 	int newStatus = cws->value.wVal;
 	int oldStatus = g_plugin.getWord(hContact, "OldStatus", ID_STATUS_OFFLINE);
-	g_plugin.setWord(hContact, "OldStatus", (WORD)newStatus);
+	g_plugin.setWord(hContact, "OldStatus", (uint16_t)newStatus);
 	if (Ignore_IsIgnored(hContact, IGNOREEVENT_USERONLINE)) return 0;
 	if (Contact_IsHidden(hContact)) return 0;
 	if (newStatus == ID_STATUS_OFFLINE && oldStatus != ID_STATUS_OFFLINE) {
diff --git a/src/mir_app/src/FontOptions.cpp b/src/mir_app/src/FontOptions.cpp
index e3bf4f335a..8f7b4d0582 100644
--- a/src/mir_app/src/FontOptions.cpp
+++ b/src/mir_app/src/FontOptions.cpp
@@ -560,10 +560,10 @@ static void sttSaveFontData(HWND hwndDlg, FontInternal &F)
 	db_set_dw(0, F.dbSettingsGroup, str, F.value.colour);
 	if (F.flags & FIDF_NOAS) {
 		mir_snprintf(str, "%sAs", F.setting);
-		db_set_w(0, F.dbSettingsGroup, str, (WORD)0x00FF);
+		db_set_w(0, F.dbSettingsGroup, str, (uint16_t)0x00FF);
 	}
 	mir_snprintf(str, "%sFlags", F.setting);
-	db_set_w(0, F.dbSettingsGroup, str, (WORD)F.flags);
+	db_set_w(0, F.dbSettingsGroup, str, (uint16_t)F.flags);
 }
 
 static void RebuildTree(HWND hwndDlg)
diff --git a/src/mir_app/src/MDatabaseCommon.cpp b/src/mir_app/src/MDatabaseCommon.cpp
index 698f264065..5f61dd1ad5 100644
--- a/src/mir_app/src/MDatabaseCommon.cpp
+++ b/src/mir_app/src/MDatabaseCommon.cpp
@@ -406,10 +406,10 @@ LBL_Seek:
 			if (isStatic) {
 				dbv->cchVal--;
 				if (realLen < dbv->cchVal)
-					dbv->cchVal = WORD(realLen);
+					dbv->cchVal = uint16_t(realLen);
 				memcpy(dbv->pszVal, decoded, dbv->cchVal);
 				dbv->pszVal[dbv->cchVal] = 0;
-				dbv->cchVal = WORD(realLen);
+				dbv->cchVal = uint16_t(realLen);
 			}
 			else {
 				dbv->pszVal = (char *)mir_alloc(1 + realLen);
@@ -491,13 +491,13 @@ STDMETHODIMP_(BOOL) MDatabaseCommon::WriteContactSetting(MCONTACT contactID, DBC
 		if (dbcwWork.value.pszVal == nullptr)
 			return 1;
 
-		dbcwWork.value.cchVal = (WORD)strlen(dbcwWork.value.pszVal);
+		dbcwWork.value.cchVal = (uint16_t)strlen(dbcwWork.value.pszVal);
 		if (bIsEncrypted && m_crypto) {
 			size_t len;
 			uint8_t *pResult = m_crypto->encodeString(dbcwWork.value.pszVal, &len);
 			if (pResult != nullptr) {
 				pEncoded = dbcwWork.value.pbVal = pResult;
-				dbcwWork.value.cpbVal = (WORD)len;
+				dbcwWork.value.cpbVal = (uint16_t)len;
 				dbcwWork.value.type = DBVT_ENCRYPTED;
 			}
 		}
diff --git a/src/mir_app/src/chat.h b/src/mir_app/src/chat.h
index 37aac65bb0..62a826cb7e 100644
--- a/src/mir_app/src/chat.h
+++ b/src/mir_app/src/chat.h
@@ -69,7 +69,7 @@ BOOL          SM_GiveStatus(const wchar_t *pszID, const char *pszModule, const w
 void          SM_RemoveAll(void);
 int           SM_RemoveSession(const wchar_t *pszID, const char *pszModule, bool removeContact);
 BOOL          SM_RemoveUser(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID);
-BOOL          SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, WORD wStatus);
+BOOL          SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, uint16_t wStatus);
 BOOL          SM_SetOffline(const char *pszModule, SESSION_INFO *si);
 BOOL          SM_SetStatus(const char *pszModule, SESSION_INFO *si, int wStatus);
 BOOL          SM_TakeStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, const wchar_t *pszStatus);
@@ -79,7 +79,7 @@ SESSION_INFO* SM_FindSession(const wchar_t *pszID, const char *pszModule);
 SESSION_INFO* SM_FindSessionByIndex(const char *pszModule, int iItem);
 
 STATUSINFO*   TM_AddStatus(STATUSINFO **ppStatusList, const wchar_t *pszStatus, int *iCount);
-WORD          TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus);
+uint16_t          TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus);
 
 BOOL          UM_RemoveAll(SESSION_INFO *si);
 BOOL          UM_SetStatusEx(SESSION_INFO *si, const wchar_t* pszText, int flags);
diff --git a/src/mir_app/src/chat_log.cpp b/src/mir_app/src/chat_log.cpp
index 33d97cc08c..c34c7de691 100644
--- a/src/mir_app/src/chat_log.cpp
+++ b/src/mir_app/src/chat_log.cpp
@@ -173,7 +173,7 @@ static int Log_AppendRTF(LOGSTREAMDATA *streamData, bool simpleMode, CMStringA &
 		else if (*line > 0 && *line < 128) {
 			buf.AppendChar(*line);
 		}
-		else buf.AppendFormat("\\u%u ?", (WORD)*line);
+		else buf.AppendFormat("\\u%u ?", (uint16_t)*line);
 	}
 
 	return textCharsCount;
diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index 7d2d0b3b70..d12fa0f5d4 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -371,7 +371,7 @@ BOOL SM_GiveStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *p
 	return TRUE;
 }
 
-BOOL SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, WORD wStatus)
+BOOL SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, uint16_t wStatus)
 {
 	SESSION_INFO *si = SM_FindSession(pszID, pszModule);
 	if (si == nullptr)
@@ -416,7 +416,7 @@ BOOL SM_SetStatus(const char *pszModule, SESSION_INFO *si, int wStatus)
 
 	si->wStatus = wStatus;
 	if (si->hContact)
-		db_set_w(si->hContact, si->pszModule, "Status", (WORD)wStatus);
+		db_set_w(si->hContact, si->pszModule, "Status", (uint16_t)wStatus);
 
 	if (g_chatApi.OnSetStatus)
 		g_chatApi.OnSetStatus(si, wStatus);
@@ -632,7 +632,7 @@ static STATUSINFO* TM_FindStatus(STATUSINFO *pStatusList, const wchar_t *pszStat
 	return nullptr;
 }
 
-WORD TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus)
+uint16_t TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus)
 {
 	if (!pStatusList || !pszStatus)
 		return 0;
@@ -647,7 +647,7 @@ WORD TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus)
 	return 0;
 }
 
-static wchar_t* TM_WordToString(STATUSINFO *pStatusList, WORD Status)
+static wchar_t* TM_WordToString(STATUSINFO *pStatusList, uint16_t Status)
 {
 	if (!pStatusList)
 		return nullptr;
@@ -717,7 +717,7 @@ void UM_SortUser(SESSION_INFO *si)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-USERINFO* UM_AddUser(SESSION_INFO *si, const wchar_t *pszUID, const wchar_t *pszNick, WORD wStatus)
+USERINFO* UM_AddUser(SESSION_INFO *si, const wchar_t *pszUID, const wchar_t *pszNick, uint16_t wStatus)
 {
 	if (pszNick == nullptr)
 		return nullptr;
@@ -737,8 +737,8 @@ USERINFO* UM_AddUser(SESSION_INFO *si, const wchar_t *pszUID, const wchar_t *psz
 
 static int UM_CompareItem(const USERINFO *u1, const USERINFO *u2)
 {
-	WORD dw1 = u1->Status;
-	WORD dw2 = u2->Status;
+	uint16_t dw1 = u1->Status;
+	uint16_t dw2 = u2->Status;
 
 	for (int i = 0; i < 8; i++) {
 		if ((dw1 & 1) && !(dw2 & 1))
@@ -768,7 +768,7 @@ static USERINFO* UM_FindUserFromIndex(SESSION_INFO *si, int index)
 	return nullptr;
 }
 
-static USERINFO* UM_GiveStatus(SESSION_INFO *si, const wchar_t *pszUID, WORD status)
+static USERINFO* UM_GiveStatus(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status)
 {
 	USERINFO *ui = UM_FindUser(si, pszUID);
 	if (ui == nullptr)
@@ -778,7 +778,7 @@ static USERINFO* UM_GiveStatus(SESSION_INFO *si, const wchar_t *pszUID, WORD sta
 	return ui;
 }
 
-static USERINFO* UM_SetContactStatus(SESSION_INFO *si, const wchar_t *pszUID, WORD status)
+static USERINFO* UM_SetContactStatus(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status)
 {
 	USERINFO *ui = UM_FindUser(si, pszUID);
 	if (ui == nullptr)
@@ -820,7 +820,7 @@ BOOL UM_SetStatusEx(SESSION_INFO *si, const wchar_t* pszText, int flags)
 	return TRUE;
 }
 
-static USERINFO* UM_TakeStatus(SESSION_INFO *si, const wchar_t *pszUID, WORD status)
+static USERINFO* UM_TakeStatus(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status)
 {
 	USERINFO *ui = UM_FindUser(si, pszUID);
 	if (ui == nullptr)
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index b28b31d15a..760377423c 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -368,7 +368,7 @@ static void AddUser(GCEVENT *gce)
 	if (si == nullptr)
 		return;
 
-	WORD status = TM_StringToWord(si->pStatuses, gce->pszStatus.w);
+	uint16_t status = TM_StringToWord(si->pStatuses, gce->pszStatus.w);
 
 	USERINFO *ui = g_chatApi.UM_AddUser(si, gce->pszUID.w, gce->pszNick.w, status);
 	if (ui == nullptr)
@@ -444,7 +444,7 @@ static INT_PTR CALLBACK sttEventStub(void *_param)
 	// Do different things according to type of event
 	switch (gce.iType) {
 	case GC_EVENT_SETCONTACTSTATUS:
-		return SM_SetContactStatus(gce.pszID.w, gce.pszModule, gce.pszUID.w, (WORD)gce.dwItemData);
+		return SM_SetContactStatus(gce.pszID.w, gce.pszModule, gce.pszUID.w, (uint16_t)gce.dwItemData);
 
 	case GC_EVENT_TOPIC:
 		if (SESSION_INFO *si = SM_FindSession(gce.pszID.w, gce.pszModule)) {
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index 709f983806..1231260de1 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -169,7 +169,7 @@ static int ClcIconsChanged(WPARAM, LPARAM)
 
 static INT_PTR SetInfoTipHoverTime(WPARAM wParam, LPARAM)
 {
-	db_set_w(0, "CLC", "InfoTipHoverTime", (WORD)wParam);
+	db_set_w(0, "CLC", "InfoTipHoverTime", (uint16_t)wParam);
 	Clist_Broadcast(INTM_SETINFOTIPHOVERTIME, wParam, 0);
 	return 0;
 }
@@ -434,7 +434,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 
 	case INTM_GROUPCHANGED:
 		{
-			WORD iExtraImage[EXTRA_ICON_COUNT];
+			uint16_t iExtraImage[EXTRA_ICON_COUNT];
 			uint8_t flags = 0;
 			if (!Clist_FindItem(hwnd, dat, wParam, &contact))
 				memset(iExtraImage, 0xFF, sizeof(iExtraImage));
@@ -465,7 +465,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 
 	case INTM_ICONCHANGED:
 		{
-			WORD status;
+			uint16_t status;
 			MCONTACT hSelItem = 0;
 			ClcContact *selcontact = nullptr;
 
@@ -489,14 +489,14 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 					g_clistApi.pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0);
 					Clist_FindItem(hwnd, dat, wParam, &contact);
 					if (contact) {
-						contact->iImage = (WORD)lParam;
+						contact->iImage = (uint16_t)lParam;
 						Clist_NotifyNewContact(hwnd, wParam);
 						dat->bNeedsResort = true;
 					}
 				}
 			}
 			else { // item in list already
-				if (contact->iImage == (WORD)lParam)
+				if (contact->iImage == (uint16_t)lParam)
 					break;
 				if (!shouldShow && !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline)) {
 					if (dat->selection >= 0 && g_clistApi.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) != -1)
@@ -504,7 +504,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 					Clist_RemoveItemFromGroup(hwnd, group, contact, (style & CLS_CONTACTLIST) == 0);
 				}
 				else {
-					contact->iImage = (WORD)lParam;
+					contact->iImage = (uint16_t)lParam;
 					if (!Clist_IsHiddenMode(dat, status))
 						contact->flags |= CONTACTF_ONLINE;
 					else
@@ -566,7 +566,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 			if (szProto == nullptr)
 				break;
 
-			WORD apparentMode = db_get_w(wParam, szProto, "ApparentMode", 0);
+			uint16_t apparentMode = db_get_w(wParam, szProto, "ApparentMode", 0);
 			contact->flags &= ~(CONTACTF_INVISTO | CONTACTF_VISTO);
 			if (apparentMode == ID_STATUS_OFFLINE)
 				contact->flags |= CONTACTF_INVISTO;
diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp
index b22ab4c6e5..f4ed57079c 100644
--- a/src/mir_app/src/clcitems.cpp
+++ b/src/mir_app/src/clcitems.cpp
@@ -68,7 +68,7 @@ ClcGroup* fnAddGroup(HWND hwnd, ClcData *dat, const wchar_t *szName, DWORD flags
 			compareResult = mir_wstrcmp(pThisField, cc->szText);
 			if (compareResult == 0) {
 				if (pNextField == nullptr && flags != (DWORD)-1) {
-					cc->groupId = (WORD)groupId;
+					cc->groupId = (uint16_t)groupId;
 					group = cc->group;
 					group->expanded = (flags & GROUPF_EXPANDED) != 0;
 					group->hideOffline = (flags & GROUPF_HIDEOFFLINE) != 0;
@@ -90,7 +90,7 @@ ClcGroup* fnAddGroup(HWND hwnd, ClcData *dat, const wchar_t *szName, DWORD flags
 			ClcContact *cc = g_clistApi.pfnAddItemToGroup(group, i);
 			cc->type = CLCIT_GROUP;
 			mir_wstrncpy(cc->szText, pThisField, _countof(cc->szText));
-			cc->groupId = (WORD)(pNextField ? 0 : groupId);
+			cc->groupId = (uint16_t)(pNextField ? 0 : groupId);
 			cc->group = new ClcGroup(10);
 			cc->group->parent = group;
 			group = cc->group;
@@ -194,7 +194,7 @@ ClcContact* fnAddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hContact
 	cc->pce = pce;
 	if (szProto != nullptr && !Clist_IsHiddenMode(dat, db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE)))
 		cc->flags |= CONTACTF_ONLINE;
-	WORD apparentMode = szProto != nullptr ? db_get_w(hContact, szProto, "ApparentMode", 0) : 0;
+	uint16_t apparentMode = szProto != nullptr ? db_get_w(hContact, szProto, "ApparentMode", 0) : 0;
 	if (apparentMode == ID_STATUS_OFFLINE)
 		cc->flags |= CONTACTF_INVISTO;
 	else if (apparentMode == ID_STATUS_ONLINE)
@@ -213,7 +213,7 @@ ClcContact* fnAddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hContact
 void fnAddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline)
 {
 	DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);
-	WORD status = ID_STATUS_OFFLINE;
+	uint16_t status = ID_STATUS_OFFLINE;
 	char *szProto = Proto_GetBaseAccountName(hContact);
 
 	dat->bNeedsResort = true;
@@ -600,7 +600,7 @@ void fnSortCLC(HWND hwnd, ClcData *dat, int useInsertionSort)
 struct SavedContactState_t
 {
 	MCONTACT hContact;
-	WORD iExtraImage[EXTRA_ICON_COUNT];
+	uint16_t iExtraImage[EXTRA_ICON_COUNT];
 	int checked;
 };
 
diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp
index c6d7c4828d..f7321ed37c 100644
--- a/src/mir_app/src/db_ini.cpp
+++ b/src/mir_app/src/db_ini.cpp
@@ -394,7 +394,7 @@ LBL_NewLine:
 			break;
 		case 'w':
 		case 'W':
-			db_set_w(0, szSection, szName, (WORD)strtol(szValue + 1, nullptr, 0));
+			db_set_w(0, szSection, szName, (uint16_t)strtol(szValue + 1, nullptr, 0));
 			break;
 		case 'd':
 		case 'D':
diff --git a/src/mir_app/src/dll_sniffer.cpp b/src/mir_app/src/dll_sniffer.cpp
index a1bf510baa..4f676d0410 100644
--- a/src/mir_app/src/dll_sniffer.cpp
+++ b/src/mir_app/src/dll_sniffer.cpp
@@ -143,7 +143,7 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin)
 					uint8_t *pSecStart = ptr + pISH->PointerToRawData - pISH->VirtualAddress;
 					IMAGE_EXPORT_DIRECTORY *pED = (PIMAGE_EXPORT_DIRECTORY)&pSecStart[expAddr];
 					DWORD *ptrRVA = (DWORD*)&pSecStart[pED->AddressOfNames];
-					WORD  *ptrOrdRVA = (WORD*)&pSecStart[pED->AddressOfNameOrdinals];
+					uint16_t  *ptrOrdRVA = (uint16_t*)&pSecStart[pED->AddressOfNameOrdinals];
 					DWORD *ptrFuncList = (DWORD*)&pSecStart[pED->AddressOfFunctions];
 
 					MUUID *pIds = nullptr;
@@ -181,7 +181,7 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin)
 					// patch version
 					if (dwVersion) {
 						uint8_t *pVersionRes = &pSecStart[dwVersion];
-						size_t cbLen = *(WORD*)pVersionRes;
+						size_t cbLen = *(uint16_t*)pVersionRes;
 						mir_ptr<uint8_t> pData((uint8_t*)mir_alloc(cbLen));
 						memcpy(pData, pVersionRes, cbLen);
 
diff --git a/src/mir_app/src/ei_options.cpp b/src/mir_app/src/ei_options.cpp
index c055785739..dc8a9681f2 100644
--- a/src/mir_app/src/ei_options.cpp
+++ b/src/mir_app/src/ei_options.cpp
@@ -347,7 +347,7 @@ public:
 
 			char setting[512];
 			mir_snprintf(setting, "%d_count", k);
-			db_set_w(0, EI_MODULE_NAME "Groups", setting, (WORD)group->m_items.getCount());
+			db_set_w(0, EI_MODULE_NAME "Groups", setting, (uint16_t)group->m_items.getCount());
 
 			for (int j = 0; j < group->m_items.getCount(); j++) {
 				BaseExtraIcon *extra = group->m_items[j];
diff --git a/src/mir_app/src/extracticon.cpp b/src/mir_app/src/extracticon.cpp
index 3a563ac7c8..b20e4ad1e8 100644
--- a/src/mir_app/src/extracticon.cpp
+++ b/src/mir_app/src/extracticon.cpp
@@ -31,21 +31,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // http://msdn.microsoft.com/library/default.asp?url = /library/en-us/winui/winui/windowsuserinterface/resources/introductiontoresources/resourcereference/resourcestructures/newheader.asp
 typedef struct
 {
-	WORD    Reserved;
-	WORD    ResType;
-	WORD    ResCount;
+	uint16_t    Reserved;
+	uint16_t    ResType;
+	uint16_t    ResCount;
 }
 	NEWHEADER;
 
 #define MAGIC_ICON       0
 #define MAGIC_ICO1       1
 #define MAGIC_CUR        2
-#define MAGIC_BMP        ((WORD)'B'+((WORD)'M'<<8))
+#define MAGIC_BMP        ((uint16_t)'B'+((uint16_t)'M'<<8))
 
-#define MAGIC_ANI1       ((WORD)'R'+((WORD)'I'<<8))
-#define MAGIC_ANI2       ((WORD)'F'+((WORD)'F'<<8))
-#define MAGIC_ANI3       ((WORD)'A'+((WORD)'C'<<8))
-#define MAGIC_ANI4       ((WORD)'O'+((WORD)'N'<<8))
+#define MAGIC_ANI1       ((uint16_t)'R'+((uint16_t)'I'<<8))
+#define MAGIC_ANI2       ((uint16_t)'F'+((uint16_t)'F'<<8))
+#define MAGIC_ANI3       ((uint16_t)'A'+((uint16_t)'C'<<8))
+#define MAGIC_ANI4       ((uint16_t)'O'+((uint16_t)'N'<<8))
 
 #define VER30            0x00030000
 
@@ -236,7 +236,7 @@ UINT _ExtractIconEx(LPCTSTR lpszFile, int iconIndex, int cxIcon, int cyIcon, HIC
 
 	// failed to read file signature
 	DWORD read = 0;
-	WORD magic[6];
+	uint16_t magic[6];
 	if (!ReadFile(hFile, &magic, sizeof(magic), &read, nullptr) || (read != sizeof(magic))) {
 		CloseHandle(hFile);
 		return 0;
diff --git a/src/mir_app/src/hotkey_opts.cpp b/src/mir_app/src/hotkey_opts.cpp
index 4ccea79193..60e2f57c97 100644
--- a/src/mir_app/src/hotkey_opts.cpp
+++ b/src/mir_app/src/hotkey_opts.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_hotkeys.h>
 #include "skin.h"
 
-static wchar_t* sttHokeyVkToName(WORD vkKey)
+static wchar_t* sttHokeyVkToName(uint16_t vkKey)
 {
 	static wchar_t buf[256] = { 0 };
 	DWORD code = MapVirtualKey(vkKey, 0) << 16;
@@ -459,7 +459,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 {
 	static BOOL initialized = FALSE;
 	static int colWidth = 0;
-	static WORD currentLanguage = 0;
+	static uint16_t currentLanguage = 0;
 
 	HWND hwndHotkey = GetDlgItem(hwndDlg, IDC_LV_HOTKEYS);
 
@@ -547,7 +547,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 
 	case WM_TIMER:
 		if (initialized) {
-			WORD newLanguage = LOWORD(GetKeyboardLayout(0));
+			uint16_t newLanguage = LOWORD(GetKeyboardLayout(0));
 			if (newLanguage == currentLanguage)
 				break;
 
@@ -638,7 +638,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 		if ((LOWORD(wParam) == IDC_HOTKEY) && ((HIWORD(wParam) == EN_KILLFOCUS) || (HIWORD(wParam) == 0))) {
 			LVITEM lvi;
 			THotkeyItem *item;
-			WORD wHotkey = (WORD)SendDlgItemMessage(hwndDlg, IDC_HOTKEY, HKM_GETHOTKEY, 0, 0);
+			uint16_t wHotkey = (uint16_t)SendDlgItemMessage(hwndDlg, IDC_HOTKEY, HKM_GETHOTKEY, 0, 0);
 
 			ShowWindow(GetDlgItem(hwndDlg, IDC_HOTKEY), SW_HIDE);
 			SetFocus(hwndHotkey);
diff --git a/src/mir_app/src/hotkeys.cpp b/src/mir_app/src/hotkeys.cpp
index 3b4501bb5b..5011732232 100644
--- a/src/mir_app/src/hotkeys.cpp
+++ b/src/mir_app/src/hotkeys.cpp
@@ -48,7 +48,7 @@ HANDLE hEvChanged = nullptr;
 static BOOL bModuleInitialized = FALSE;
 static HHOOK hhkKeyboard = nullptr;
 
-WORD GetHotkeyValue(INT_PTR idHotkey)
+uint16_t GetHotkeyValue(INT_PTR idHotkey)
 {
 	for (auto &it : hotkeys)
 		if (it->idHotkey == idHotkey)
@@ -57,7 +57,7 @@ WORD GetHotkeyValue(INT_PTR idHotkey)
 	return 0;
 }
 
-static void sttWordToModAndVk(WORD w, uint8_t *mod, uint8_t *vk)
+static void sttWordToModAndVk(uint16_t w, uint8_t *mod, uint8_t *vk)
 {
 	*mod = 0;
 	if (HIBYTE(w) & HOTKEYF_CONTROL) *mod |= MOD_CONTROL;
@@ -337,7 +337,7 @@ int LoadSkinHotkeys(void)
 		char szSetting[100];
 		mir_snprintf(szSetting, "HK%s", oldSettings[i]);
 
-		WORD key;
+		uint16_t key;
 		if ((key = db_get_w(0, "Clist", szSetting, 0))) {
 			db_unset(0, "Clist", szSetting);
 			db_set_w(0, DBMODULENAME, newSettings[i], key);
diff --git a/src/mir_app/src/langpack.h b/src/mir_app/src/langpack.h
index 0ab5d403bb..eddbd7dd29 100644
--- a/src/mir_app/src/langpack.h
+++ b/src/mir_app/src/langpack.h
@@ -41,7 +41,7 @@ struct LANGPACK_INFO
 {
 	wchar_t tszLanguage[64];
 	LCID Locale;
-	WORD codepage;
+	uint16_t codepage;
 	CMStringA szAuthors, szLastModifiedUsing;
 	FILETIME ftFileDate;
 	wchar_t tszFileName[MAX_PATH]; /* just the file name itself */
diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp
index 7856789ed4..e357d3df88 100644
--- a/src/mir_app/src/menu_clist.cpp
+++ b/src/mir_app/src/menu_clist.cpp
@@ -565,7 +565,7 @@ static INT_PTR StatusMenuExecService(WPARAM wParam, LPARAM)
 		Proto_SetStatus(pa->szModuleName, g_clistApi.currentDesiredStatusMode);
 	}
 	NotifyEventHooks(hStatusModeChangeEvent, g_clistApi.currentDesiredStatusMode, 0);
-	db_set_w(0, "CList", "Status", (WORD)g_clistApi.currentDesiredStatusMode);
+	db_set_w(0, "CList", "Status", (uint16_t)g_clistApi.currentDesiredStatusMode);
 	return 1;
 }
 
@@ -817,7 +817,7 @@ void RebuildMenuOrder(void)
 			smep->status = it.iStatus;
 			{
 				wchar_t buf[256], hotkeyName[100];
-				WORD hotKey = GetHotkeyValue(it.iHotKey);
+				uint16_t hotKey = GetHotkeyValue(it.iHotKey);
 				HotkeyToName(hotkeyName, _countof(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey));
 				mir_snwprintf(buf, L"%s\t%s", Clist_GetStatusModeDescription(it.iStatus, 0), hotkeyName);
 				mi.name.w = buf;
@@ -874,7 +874,7 @@ static int sttRebuildHotkeys(WPARAM, LPARAM)
 			continue;
 
 		wchar_t buf[256], hotkeyName[100];
-		WORD hotKey = GetHotkeyValue(it.iHotKey);
+		uint16_t hotKey = GetHotkeyValue(it.iHotKey);
 		HotkeyToName(hotkeyName, _countof(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey));
 		mir_snwprintf(buf, L"%s\t%s", Clist_GetStatusModeDescription(it.iStatus, 0), hotkeyName);
 		Menu_ModifyItem(it.hStatusMenu, buf);
diff --git a/src/mir_app/src/meta_options.cpp b/src/mir_app/src/meta_options.cpp
index 8d4e767ab6..d11562c131 100644
--- a/src/mir_app/src/meta_options.cpp
+++ b/src/mir_app/src/meta_options.cpp
@@ -29,9 +29,9 @@ MetaOptions g_metaOptions;
 int Meta_WriteOptions()
 {
 	db_set_b(0, META_PROTO, "LockHandle", g_metaOptions.bLockHandle);
-	db_set_w(0, META_PROTO, "MenuContactLabel", (WORD)g_metaOptions.menu_contact_label);
-	db_set_w(0, META_PROTO, "MenuContactFunction", (WORD)g_metaOptions.menu_function);
-	db_set_w(0, META_PROTO, "CListContactName", (WORD)g_metaOptions.clist_contact_name);
+	db_set_w(0, META_PROTO, "MenuContactLabel", (uint16_t)g_metaOptions.menu_contact_label);
+	db_set_w(0, META_PROTO, "MenuContactFunction", (uint16_t)g_metaOptions.menu_function);
+	db_set_w(0, META_PROTO, "CListContactName", (uint16_t)g_metaOptions.clist_contact_name);
 	db_set_dw(0, META_PROTO, "SetStatusFromOfflineDelay", (DWORD)(g_metaOptions.set_status_from_offline_delay));
 	return 0;
 }
diff --git a/src/mir_app/src/meta_utils.cpp b/src/mir_app/src/meta_utils.cpp
index f21b97da3b..f26a0a9e21 100644
--- a/src/mir_app/src/meta_utils.cpp
+++ b/src/mir_app/src/meta_utils.cpp
@@ -128,7 +128,7 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, bool set_as_default)
 	db_set_ws(hMeta, META_PROTO, buffer, Clist_GetContactDisplayName(hSub));
 
 	// Get the status
-	WORD status = db_get_w(hSub, szProto, "Status", ID_STATUS_OFFLINE);
+	uint16_t status = db_get_w(hSub, szProto, "Status", ID_STATUS_OFFLINE);
 
 	// write the status
 	mir_snprintf(buffer, "Status%d", ccDest->nSubs);
@@ -345,7 +345,7 @@ int Meta_HideLinkedContacts(void)
 		// prepare to update metacontact record of subcontat status
 		char *szProto = Proto_GetBaseAccountName(hContact);
 
-		WORD status = (!szProto) ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
+		uint16_t status = (!szProto) ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
 		db_set_w(ccMeta->contactID, META_PROTO, buffer, status);
 
 		// update metacontact's record of nick for this contact
@@ -518,7 +518,7 @@ void Meta_GetSubNick(MCONTACT hMeta, int i, CMStringW &tszDest)
 
 void Meta_FixStatus(DBCachedContact *ccMeta)
 {
-	WORD status = ID_STATUS_OFFLINE;
+	uint16_t status = ID_STATUS_OFFLINE;
 
 	MCONTACT most_online = db_mc_getMostOnline(ccMeta->contactID);
 	if (most_online) {
diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h
index 320456e9cf..f4ba40f671 100644
--- a/src/mir_app/src/miranda.h
+++ b/src/mir_app/src/miranda.h
@@ -181,7 +181,7 @@ bool ProcessFileDrop(HDROP hDrop, MCONTACT hContact);
 void RegisterModule(CMPluginBase*);
 
 void HotkeyToName(wchar_t *buf, int size, uint8_t shift, uint8_t key);
-WORD GetHotkeyValue(INT_PTR idHotkey);
+uint16_t GetHotkeyValue(INT_PTR idHotkey);
 
 HBITMAP ConvertIconToBitmap(HIMAGELIST hIml, int iconId);
 MBaseProto* Proto_GetProto(const char *szProtoName);
diff --git a/src/mir_app/src/netlib.h b/src/mir_app/src/netlib.h
index d8ed8a3418..59fa02940c 100644
--- a/src/mir_app/src/netlib.h
+++ b/src/mir_app/src/netlib.h
@@ -95,7 +95,7 @@ struct NetlibConnection : public MZeroedObject
 	NetlibHTTPProxyPacketQueue *pHttpProxyPacketQueue;
 	int proxyType;
 	char *szProxyServer;
-	WORD wProxyPort;
+	uint16_t wProxyPort;
 	CMStringA szProxyBuf;
 
 	int pollingTimeout;
@@ -114,8 +114,8 @@ struct NetlibBoundPort : public MZeroedObject
 	int handleType;
 	SOCKET s;
 	SOCKET s6;
-	WORD wPort;
-	WORD wExPort;
+	uint16_t wPort;
+	uint16_t wExPort;
 	NetlibUser *nlu;
 	NETLIBNEWCONNECTIONPROC pfnNewConnection;
 	HANDLE hThread;
@@ -186,8 +186,8 @@ bool OpenSsl_Init();
 void OpenSsl_Unload();
 
 // netlibupnp.cpp
-bool NetlibUPnPAddPortMapping(WORD intport, char *proto, WORD *extport, DWORD *extip, bool search);
-void NetlibUPnPDeletePortMapping(WORD extport, char* proto);
+bool NetlibUPnPAddPortMapping(uint16_t intport, char *proto, uint16_t *extport, DWORD *extip, bool search);
+void NetlibUPnPDeletePortMapping(uint16_t extport, char* proto);
 void NetlibUPnPCleanup(void*);
 void NetlibUPnPInit(void);
 void NetlibUPnPDestroy(void);
diff --git a/src/mir_app/src/netlib_bind.cpp b/src/mir_app/src/netlib_bind.cpp
index a6d3029e97..62a2042c0c 100644
--- a/src/mir_app/src/netlib_bind.cpp
+++ b/src/mir_app/src/netlib_bind.cpp
@@ -40,8 +40,8 @@ bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn)
 		if (*portn == 0)
 			return false;
 
-		WORD num;
-		Utils_GetRandom(&num, sizeof(WORD));
+		uint16_t num;
+		Utils_GetRandom(&num, sizeof(uint16_t));
 		*portn = num % *portn;
 	}
 
@@ -82,10 +82,10 @@ bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn)
 					if (before  && portnum >= *portn)
 						return false;
 
-					sin.sin_port = htons((WORD)port);
+					sin.sin_port = htons((uint16_t)port);
 					bool bV4Mapped = s == INVALID_SOCKET || bind(s, (SOCKADDR*)&sin, sizeof(sin)) == 0;
 
-					sin6.sin6_port = htons((WORD)port);
+					sin6.sin6_port = htons((uint16_t)port);
 					bool bV6Mapped = s6 == INVALID_SOCKET || bind(s6, (PSOCKADDR)&sin6, sizeof(sin6)) == 0;
 
 					if (bV4Mapped && bV6Mapped) {
diff --git a/src/mir_app/src/netlib_http.cpp b/src/mir_app/src/netlib_http.cpp
index 11336b7ac7..48d2153710 100644
--- a/src/mir_app/src/netlib_http.cpp
+++ b/src/mir_app/src/netlib_http.cpp
@@ -159,7 +159,7 @@ void NetlibConnFromUrl(const char *szUrl, bool secur, NETLIBOPENCONNECTION &nloc
 	char* pcolon = strrchr(szHost, ':');
 	if (pcolon) {
 		*pcolon = '\0';
-		nloc.wPort = (WORD)strtol(pcolon+1, nullptr, 10);
+		nloc.wPort = (uint16_t)strtol(pcolon+1, nullptr, 10);
 	}
 	else nloc.wPort = secur ? 443 : 80;
 	nloc.flags = (secur ? NLOCF_SSL : 0);
diff --git a/src/mir_app/src/netlib_opts.cpp b/src/mir_app/src/netlib_opts.cpp
index c364314bd1..77f5d55613 100644
--- a/src/mir_app/src/netlib_opts.cpp
+++ b/src/mir_app/src/netlib_opts.cpp
@@ -68,7 +68,7 @@ static const UINT specifyPortsControls[] = {
 	IDC_STATIC52};
 
 static const wchar_t* szProxyTypes[] = {LPGENW("<mixed>"), L"SOCKS4", L"SOCKS5", L"HTTP", L"HTTPS", L"Internet Explorer"};
-static const WORD oftenProxyPorts[] = {1080, 1080, 1080, 8080, 8080, 8080};
+static const uint16_t oftenProxyPorts[] = {1080, 1080, 1080, 8080, 8080, 8080};
 
 #define M_REFRESHALL      (WM_USER+100)
 #define M_REFRESHENABLING (WM_USER+101)
@@ -202,7 +202,7 @@ static void WriteSettingsStructToDb(const char *szSettingsModule, NETLIBUSERSETT
 		db_set_b(0, szSettingsModule, "NLUseProxy", (uint8_t)settings->useProxy);
 		db_set_b(0, szSettingsModule, "NLProxyType", (uint8_t)settings->proxyType);
 		db_set_s(0, szSettingsModule, "NLProxyServer", settings->szProxyServer ? settings->szProxyServer : "");
-		db_set_w(0, szSettingsModule, "NLProxyPort", (WORD)settings->wProxyPort);
+		db_set_w(0, szSettingsModule, "NLProxyPort", (uint16_t)settings->wProxyPort);
 		db_set_b(0, szSettingsModule, "NLUseProxyAuth", (uint8_t)settings->useProxyAuth);
 		db_set_s(0, szSettingsModule, "NLProxyAuthUser", settings->szProxyAuthUser ? settings->szProxyAuthUser : "");
 		db_set_s(0, szSettingsModule, "NLProxyAuthPassword", settings->szProxyAuthPassword ? settings->szProxyAuthPassword : "");
diff --git a/src/mir_app/src/netlib_security.cpp b/src/mir_app/src/netlib_security.cpp
index ed3de5cd15..4ac932190b 100644
--- a/src/mir_app/src/netlib_security.cpp
+++ b/src/mir_app/src/netlib_security.cpp
@@ -43,8 +43,8 @@ struct NtlmHandleType
 
 struct NTLM_String
 {
-	WORD     len;
-	WORD     allocedSpace;
+	uint16_t     len;
+	uint16_t     allocedSpace;
 	DWORD    offset;
 };
 
diff --git a/src/mir_app/src/netlib_upnp.cpp b/src/mir_app/src/netlib_upnp.cpp
index 862d3989a2..0ccd7b6c6c 100644
--- a/src/mir_app/src/netlib_upnp.cpp
+++ b/src/mir_app/src/netlib_upnp.cpp
@@ -109,7 +109,7 @@ static SOCKET sock = INVALID_SOCKET;
 static char szConnHost[256];
 static unsigned short sConnPort;
 
-static WORD *portList;
+static uint16_t *portList;
 static unsigned numports, numportsAlloc;
 static HANDLE portListMutex;
 
@@ -664,7 +664,7 @@ static bool findUPnPGateway(void)
 	return gatewayFound;
 }
 
-bool NetlibUPnPAddPortMapping(WORD intport, char *proto, WORD *extport, DWORD *extip, bool search)
+bool NetlibUPnPAddPortMapping(uint16_t intport, char *proto, uint16_t *extport, DWORD *extip, bool search)
 {
 	int res = 0, i = 5;
 
@@ -693,7 +693,7 @@ bool NetlibUPnPAddPortMapping(WORD intport, char *proto, WORD *extport, DWORD *e
 			if (ip) *extip = ip;
 
 			if (numports >= numportsAlloc)
-				mir_realloc(portList, sizeof(WORD)*(numportsAlloc += 10));
+				mir_realloc(portList, sizeof(uint16_t)*(numportsAlloc += 10));
 			portList[numports++] = *extport;
 		}
 
@@ -703,7 +703,7 @@ bool NetlibUPnPAddPortMapping(WORD intport, char *proto, WORD *extport, DWORD *e
 	return res == 200;
 }
 
-void NetlibUPnPDeletePortMapping(WORD extport, char* proto)
+void NetlibUPnPDeletePortMapping(uint16_t extport, char* proto)
 {
 	if (extport == 0)
 		return;
@@ -720,7 +720,7 @@ void NetlibUPnPDeletePortMapping(WORD extport, char* proto)
 
 		for (i = 0; i < numports; i++)
 			if (portList[i] == extport && --numports > 0)
-				memmove(&portList[i], &portList[i + 1], (numports - i) * sizeof(WORD));
+				memmove(&portList[i], &portList[i + 1], (numports - i) * sizeof(uint16_t));
 
 		mir_free(szData);
 		ReleaseMutex(portListMutex);
@@ -759,7 +759,7 @@ void NetlibUPnPCleanup(void*)
 			txtParseParam(szData, "QueryStateVariableResponse", "<return>", "<", buf, sizeof(buf)))
 			num = atol(buf);
 
-		WORD ports[30];
+		uint16_t ports[30];
 		for (unsigned i = 0; i < num && !Miranda_IsTerminated(); i++) {
 			mir_snprintf(szData, 4096, get_port_mapping, i);
 
@@ -776,7 +776,7 @@ void NetlibUPnPCleanup(void*)
 				continue;
 
 			if (txtParseParam(szData, "<NewExternalPort", ">", "<", buf, sizeof(buf))) {
-				WORD mport = (WORD)atol(buf);
+				uint16_t mport = (uint16_t)atol(buf);
 
 				if (j >= _countof(ports))
 					break;
@@ -801,7 +801,7 @@ void NetlibUPnPInit(void)
 {
 	numports = 0;
 	numportsAlloc = 10;
-	portList = (WORD*)mir_alloc(sizeof(WORD)*numportsAlloc);
+	portList = (uint16_t*)mir_alloc(sizeof(uint16_t)*numportsAlloc);
 
 	portListMutex = CreateMutex(nullptr, FALSE, nullptr);
 }
diff --git a/src/mir_app/src/searchresults.cpp b/src/mir_app/src/searchresults.cpp
index 7a1b17fb45..4278978600 100644
--- a/src/mir_app/src/searchresults.cpp
+++ b/src/mir_app/src/searchresults.cpp
@@ -48,7 +48,7 @@ void SaveColumnSizes(HWND hwndResults)
 		mir_snprintf(szSetting, "ColOrder%d", i);
 		db_set_b(0, "FindAdd", szSetting, (uint8_t)columnOrder[i]);
 		mir_snprintf(szSetting, "ColWidth%d", i);
-		db_set_w(0, "FindAdd", szSetting, (WORD)ListView_GetColumnWidth(hwndResults, i));
+		db_set_w(0, "FindAdd", szSetting, (uint16_t)ListView_GetColumnWidth(hwndResults, i));
 	}
 	db_set_b(0, "FindAdd", "SortColumn", (uint8_t)dat->iLastColumnSortIndex);
 	db_set_b(0, "FindAdd", "SortAscending", (uint8_t)dat->bSortAscending);
diff --git a/src/mir_app/src/skin.h b/src/mir_app/src/skin.h
index 7d739e7b9f..6436694728 100644
--- a/src/mir_app/src/skin.h
+++ b/src/mir_app/src/skin.h
@@ -42,7 +42,7 @@ struct THotkeyItem
 	char        *pszService, *pszName; // pszName is valid _only_ for "root" hotkeys
 	wchar_t     *pwszSection, *pwszDescription;
 	LPARAM       lParam;
-	WORD         DefHotkey, Hotkey;
+	uint16_t         DefHotkey, Hotkey;
 	bool         Enabled;
 	HPLUGIN      pPlugin;
 	ATOM         idHotkey;
@@ -52,7 +52,7 @@ struct THotkeyItem
 	bool         allowSubHotkeys;
 
 	bool         OptChanged, OptDeleted, OptNew;
-	WORD         OptHotkey;
+	uint16_t         OptHotkey;
 	THotkeyType  OptType;
 	bool         OptEnabled;
 
diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp
index ad38733155..97bd6146d9 100644
--- a/src/mir_app/src/srmm_toolbar.cpp
+++ b/src/mir_app/src/srmm_toolbar.cpp
@@ -640,7 +640,7 @@ public:
 		SaveTree();               // save the whole tree then
 		CB_ReInitCustomButtons();
 
-		WORD newGap = m_gap.GetPosition();
+		uint16_t newGap = m_gap.GetPosition();
 		if (newGap != db_get_b(0, BB_MODULE_NAME, "ButtonsBarGap", 1)) {
 			WindowList_BroadcastAsync(g_hWindowList, WM_SIZE, 0, 0);
 			db_set_b(0, BB_MODULE_NAME, "ButtonsBarGap", newGap);
diff --git a/src/mir_app/src/visibility.cpp b/src/mir_app/src/visibility.cpp
index e64d9ed4da..ad3af25f07 100644
--- a/src/mir_app/src/visibility.cpp
+++ b/src/mir_app/src/visibility.cpp
@@ -106,7 +106,7 @@ static void SetAllContactIcons(HWND hwndList)
 			continue;
 
 		DWORD flags;
-		WORD status;
+		uint16_t status;
 		char *szProto = Proto_GetBaseAccountName(hContact);
 		if (szProto == nullptr) {
 			flags = 0;
diff --git a/src/mir_core/src/Windows/CCtrlButton.cpp b/src/mir_core/src/Windows/CCtrlButton.cpp
index d86ba2e0ad..d1d78e21cd 100644
--- a/src/mir_core/src/Windows/CCtrlButton.cpp
+++ b/src/mir_core/src/Windows/CCtrlButton.cpp
@@ -29,7 +29,7 @@ CCtrlButton::CCtrlButton(CDlgBase* wnd, int idCtrl)
 	: CCtrlBase(wnd, idCtrl)
 {}
 
-BOOL CCtrlButton::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlButton::OnCommand(HWND, uint16_t, uint16_t idCode)
 {
 	if (idCode == BN_CLICKED)
 		OnClick(this);
diff --git a/src/mir_core/src/Windows/CCtrlCheck.cpp b/src/mir_core/src/Windows/CCtrlCheck.cpp
index 0315e1601b..7eda4f73d6 100644
--- a/src/mir_core/src/Windows/CCtrlCheck.cpp
+++ b/src/mir_core/src/Windows/CCtrlCheck.cpp
@@ -31,7 +31,7 @@ CCtrlCheck::CCtrlCheck(CDlgBase *dlg, int ctrlId)
 	m_bNotifiable = true;
 }
 
-BOOL CCtrlCheck::OnCommand(HWND, WORD, WORD)
+BOOL CCtrlCheck::OnCommand(HWND, uint16_t, uint16_t)
 {
 	NotifyChange();
 	return TRUE;
diff --git a/src/mir_core/src/Windows/CCtrlColor.cpp b/src/mir_core/src/Windows/CCtrlColor.cpp
index dcd841b213..47a49308df 100644
--- a/src/mir_core/src/Windows/CCtrlColor.cpp
+++ b/src/mir_core/src/Windows/CCtrlColor.cpp
@@ -29,7 +29,7 @@ CCtrlColor::CCtrlColor(CDlgBase *dlg, int ctrlId) :
 	CCtrlData(dlg, ctrlId)
 {}
 
-BOOL CCtrlColor::OnCommand(HWND, WORD, WORD)
+BOOL CCtrlColor::OnCommand(HWND, uint16_t, uint16_t)
 {
 	NotifyChange();
 	return TRUE;
diff --git a/src/mir_core/src/Windows/CCtrlCombo.cpp b/src/mir_core/src/Windows/CCtrlCombo.cpp
index f481b1554d..f4b37a0b31 100644
--- a/src/mir_core/src/Windows/CCtrlCombo.cpp
+++ b/src/mir_core/src/Windows/CCtrlCombo.cpp
@@ -29,7 +29,7 @@ CCtrlCombo::CCtrlCombo(CDlgBase *dlg, int ctrlId)
 	: CCtrlData(dlg, ctrlId)
 {}
 
-BOOL CCtrlCombo::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlCombo::OnCommand(HWND, uint16_t, uint16_t idCode)
 {
 	switch (idCode) {
 	case CBN_CLOSEUP:  OnCloseup(this); break;
diff --git a/src/mir_core/src/Windows/CCtrlEdit.cpp b/src/mir_core/src/Windows/CCtrlEdit.cpp
index 4395af9419..6d1ac26ddd 100644
--- a/src/mir_core/src/Windows/CCtrlEdit.cpp
+++ b/src/mir_core/src/Windows/CCtrlEdit.cpp
@@ -29,7 +29,7 @@ CCtrlEdit::CCtrlEdit(CDlgBase *dlg, int ctrlId)
 	: CCtrlData(dlg, ctrlId)
 {}
 
-BOOL CCtrlEdit::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlEdit::OnCommand(HWND, uint16_t, uint16_t idCode)
 {
 	if (idCode == EN_CHANGE)
 		NotifyChange();
diff --git a/src/mir_core/src/Windows/CCtrlHyperlink.cpp b/src/mir_core/src/Windows/CCtrlHyperlink.cpp
index f63e87ed8e..c081972066 100644
--- a/src/mir_core/src/Windows/CCtrlHyperlink.cpp
+++ b/src/mir_core/src/Windows/CCtrlHyperlink.cpp
@@ -32,7 +32,7 @@ CCtrlHyperlink::CCtrlHyperlink(CDlgBase* wnd, int idCtrl, const char* url)
 	OnClick = Callback(this, &CCtrlHyperlink::Default_OnClick);
 }
 
-BOOL CCtrlHyperlink::OnCommand(HWND, WORD, WORD)
+BOOL CCtrlHyperlink::OnCommand(HWND, uint16_t, uint16_t)
 {
 	OnClick(this);
 	return FALSE;
diff --git a/src/mir_core/src/Windows/CCtrlListBox.cpp b/src/mir_core/src/Windows/CCtrlListBox.cpp
index 71519a96ca..b575ebe069 100644
--- a/src/mir_core/src/Windows/CCtrlListBox.cpp
+++ b/src/mir_core/src/Windows/CCtrlListBox.cpp
@@ -29,7 +29,7 @@ CCtrlListBox::CCtrlListBox(CDlgBase *dlg, int ctrlId)
 	: CCtrlBase(dlg, ctrlId)
 {}
 
-BOOL CCtrlListBox::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlListBox::OnCommand(HWND, uint16_t, uint16_t idCode)
 {
 	switch (idCode) {
 		case LBN_DBLCLK:    OnDblClick(this); break;
diff --git a/src/mir_core/src/Windows/CCtrlRichEdit.cpp b/src/mir_core/src/Windows/CCtrlRichEdit.cpp
index 44d965a682..3f0f96fc1c 100644
--- a/src/mir_core/src/Windows/CCtrlRichEdit.cpp
+++ b/src/mir_core/src/Windows/CCtrlRichEdit.cpp
@@ -171,7 +171,7 @@ struct CREOleCallback : public IRichEditOleCallback
 	{ return E_NOTIMPL; }
 	STDMETHOD(GetDragDropEffect)(BOOL, DWORD, LPDWORD)
 	{ return S_OK; }
-	STDMETHOD(GetContextMenu)(WORD, LPOLEOBJECT, CHARRANGE*, HMENU*)
+	STDMETHOD(GetContextMenu)(uint16_t, LPOLEOBJECT, CHARRANGE*, HMENU*)
 	{ return E_INVALIDARG; }
 };
 
diff --git a/src/mir_core/src/Windows/CCtrlSlider.cpp b/src/mir_core/src/Windows/CCtrlSlider.cpp
index 4adbd45506..04c2e0c112 100644
--- a/src/mir_core/src/Windows/CCtrlSlider.cpp
+++ b/src/mir_core/src/Windows/CCtrlSlider.cpp
@@ -33,7 +33,7 @@ CCtrlSlider::CCtrlSlider(CDlgBase *dlg, int ctrlId, int wMax, int wMin) :
 	m_bNotifiable = true;
 }
 
-BOOL CCtrlSlider::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlSlider::OnCommand(HWND, uint16_t, uint16_t idCode)
 {
 	if (idCode == WM_HSCROLL) {
 		NotifyChange();
diff --git a/src/mir_core/src/Windows/CCtrlSpin.cpp b/src/mir_core/src/Windows/CCtrlSpin.cpp
index bf75a67c91..381555dcd9 100644
--- a/src/mir_core/src/Windows/CCtrlSpin.cpp
+++ b/src/mir_core/src/Windows/CCtrlSpin.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /////////////////////////////////////////////////////////////////////////////////////////
 // CCtrlSpin class
 
-CCtrlSpin::CCtrlSpin(CDlgBase *dlg, int ctrlId, WORD wMax, WORD wMin) :
+CCtrlSpin::CCtrlSpin(CDlgBase *dlg, int ctrlId, uint16_t wMax, uint16_t wMin) :
 	CCtrlData(dlg, ctrlId),
 	m_wMin(wMin),
 	m_wMax(wMax),
@@ -70,12 +70,12 @@ void CCtrlSpin::OnReset()
 		SetPosition(LoadInt());
 }
 
-WORD CCtrlSpin::GetPosition()
+uint16_t CCtrlSpin::GetPosition()
 {
 	return m_wCurr;
 }
 
-void CCtrlSpin::SetPosition(WORD wPos)
+void CCtrlSpin::SetPosition(uint16_t wPos)
 {
 	SendMsg(UDM_SETPOS, 0, m_wCurr = wPos);
 }
diff --git a/src/mir_core/src/Windows/CDbLink.cpp b/src/mir_core/src/Windows/CDbLink.cpp
index b8719fd677..4712550170 100644
--- a/src/mir_core/src/Windows/CDbLink.cpp
+++ b/src/mir_core/src/Windows/CDbLink.cpp
@@ -68,7 +68,7 @@ void CDbLink::SaveInt(DWORD value)
 {
 	switch (m_type) {
 		case DBVT_BYTE:  db_set_b(0, m_szModule, m_szSetting, (uint8_t)value); break;
-		case DBVT_WORD:  db_set_w(0, m_szModule, m_szSetting, (WORD)value); break;
+		case DBVT_WORD:  db_set_w(0, m_szModule, m_szSetting, (uint16_t)value); break;
 		case DBVT_DWORD: db_set_dw(0, m_szModule, m_szSetting, value); break;
 	}
 }
diff --git a/src/mir_core/src/Windows/CDlgBase.cpp b/src/mir_core/src/Windows/CDlgBase.cpp
index 99854ac47d..2a1dfd4140 100644
--- a/src/mir_core/src/Windows/CDlgBase.cpp
+++ b/src/mir_core/src/Windows/CDlgBase.cpp
@@ -279,8 +279,8 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 	case WM_COMMAND:
 		{
 			HWND hwndCtrl = (HWND)lParam;
-			WORD idCtrl = LOWORD(wParam);
-			WORD idCode = HIWORD(wParam);
+			uint16_t idCtrl = LOWORD(wParam);
+			uint16_t idCode = HIWORD(wParam);
 			if (CCtrlBase *ctrl = FindControl(idCtrl)) {
 				BOOL result = ctrl->OnCommand(hwndCtrl, idCtrl, idCode);
 				if (result != FALSE)
diff --git a/src/mir_core/src/Windows/CProgress.cpp b/src/mir_core/src/Windows/CProgress.cpp
index acc4773aff..f00126b854 100644
--- a/src/mir_core/src/Windows/CProgress.cpp
+++ b/src/mir_core/src/Windows/CProgress.cpp
@@ -30,22 +30,22 @@ CCtrlProgress::CCtrlProgress(CDlgBase *wnd, int idCtrl)
 {
 }
 
-void CCtrlProgress::SetRange(WORD max, WORD min)
+void CCtrlProgress::SetRange(uint16_t max, uint16_t min)
 {
 	SendMsg(PBM_SETRANGE, 0, MAKELPARAM(min, max));
 }
 
-void CCtrlProgress::SetPosition(WORD value)
+void CCtrlProgress::SetPosition(uint16_t value)
 {
 	SendMsg(PBM_SETPOS, value, 0);
 }
 
-void CCtrlProgress::SetStep(WORD value)
+void CCtrlProgress::SetStep(uint16_t value)
 {
 	SendMsg(PBM_SETSTEP, value, 0);
 }
 
-WORD CCtrlProgress::Move(WORD delta)
+uint16_t CCtrlProgress::Move(uint16_t delta)
 {
 	return delta == 0
 		? SendMsg(PBM_STEPIT, 0, 0)
diff --git a/src/mir_core/src/Windows/resizer.cpp b/src/mir_core/src/Windows/resizer.cpp
index a8a6be41e4..1c4ed5631e 100644
--- a/src/mir_core/src/Windows/resizer.cpp
+++ b/src/mir_core/src/Windows/resizer.cpp
@@ -37,12 +37,12 @@ struct START_OF_DLGITEMTEMPLATEEX
 
 struct START_OF_DLGTEMPLATEEX
 {
-	WORD   dlgVer;
-	WORD   signature;
+	uint16_t   dlgVer;
+	uint16_t   signature;
 	DWORD  helpID;
 	DWORD  exStyle;
 	DWORD  style;
-	WORD   cDlgItems;
+	uint16_t   cDlgItems;
 	short  x, y, cx, cy;
 };
 
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp
index 2b2b41ebcd..439f5313c4 100644
--- a/src/mir_core/src/db.cpp
+++ b/src/mir_core/src/db.cpp
@@ -126,7 +126,7 @@ MIR_CORE_DLL(int) db_get_w(MCONTACT hContact, const char *szModule, const char *
 			switch(dbv.type) {
 				case DBVT_BYTE:	return dbv.bVal;
 				case DBVT_WORD:   return dbv.wVal;
-				case DBVT_DWORD:	return WORD(dbv.dVal);
+				case DBVT_DWORD:	return uint16_t(dbv.dVal);
 			}
 			g_pCurrDb->FreeVariant(&dbv);
 		}
@@ -290,7 +290,7 @@ MIR_CORE_DLL(INT_PTR) db_set_b(MCONTACT hContact, const char *szModule, const ch
 	return g_pCurrDb->WriteContactSetting(hContact, &cws);
 }
 
-MIR_CORE_DLL(INT_PTR) db_set_w(MCONTACT hContact, const char *szModule, const char *szSetting, WORD val)
+MIR_CORE_DLL(INT_PTR) db_set_w(MCONTACT hContact, const char *szModule, const char *szSetting, uint16_t val)
 {
 	if (g_pCurrDb == nullptr) return 1;
 
@@ -358,7 +358,7 @@ MIR_CORE_DLL(INT_PTR) db_set_blob(MCONTACT hContact, const char *szModule, const
 	cws.szModule = szModule;
 	cws.szSetting = szSetting;
 	cws.value.type = DBVT_BLOB;
-	cws.value.cpbVal = (WORD)len;
+	cws.value.cpbVal = (uint16_t)len;
 	cws.value.pbVal = (unsigned char*)val;
 	return g_pCurrDb->WriteContactSetting(hContact, &cws);
 }
diff --git a/src/mir_core/src/utils.cpp b/src/mir_core/src/utils.cpp
index 0d773d10bc..0e6dfec6ab 100644
--- a/src/mir_core/src/utils.cpp
+++ b/src/mir_core/src/utils.cpp
@@ -558,7 +558,7 @@ MIR_CORE_DLL(bool) Utils_IsRtl(const wchar_t *pszwText)
 {
    #ifdef _MSC_VER
       size_t iLen = mir_wstrlen(pszwText);
-      mir_ptr<WORD> infoTypeC2((WORD*)mir_calloc(sizeof(WORD) * (iLen + 2)));
+      mir_ptr<uint16_t> infoTypeC2((uint16_t*)mir_calloc(sizeof(uint16_t) * (iLen + 2)));
       GetStringTypeW(CT_CTYPE2, pszwText, (int)iLen, infoTypeC2);
 
       for (size_t i = 0; i < iLen; i++)
diff --git a/utils/mir_options.cpp b/utils/mir_options.cpp
index cc20034688..7f64f3b43c 100644
--- a/utils/mir_options.cpp
+++ b/utils/mir_options.cpp
@@ -107,7 +107,7 @@ static void LoadOpt(OptPageControl *ctrl, char *module)
 		break;
 
 	case CONTROL_SPIN:
-		*((WORD *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue);
+		*((uint16_t *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue);
 		break;
 
 	case CONTROL_COLOR:
@@ -115,11 +115,11 @@ static void LoadOpt(OptPageControl *ctrl, char *module)
 		break;
 
 	case CONTROL_RADIO:
-		*((WORD *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue);
+		*((uint16_t *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue);
 		break;
 
 	case CONTROL_COMBO:
-		*((WORD *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue);
+		*((uint16_t *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue);
 		break;
 
 	case CONTROL_PROTOCOL_LIST:
@@ -317,7 +317,7 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 						break;
 
 					case CONTROL_SPIN:
-						db_set_w(0, module, ctrl->setting, (WORD)SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_GETPOS, 0, 0));
+						db_set_w(0, module, ctrl->setting, (uint16_t)SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_GETPOS, 0, 0));
 						break;
 
 					case CONTROL_COLOR:
@@ -330,7 +330,7 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
 						break;
 
 					case CONTROL_COMBO:
-						db_set_w(0, module, ctrl->setting, (WORD)SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETCURSEL, 0, 0));
+						db_set_w(0, module, ctrl->setting, (uint16_t)SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETCURSEL, 0, 0));
 						break;
 
 					case CONTROL_PROTOCOL_LIST:
diff --git a/utils/mir_options.h b/utils/mir_options.h
index e0c43d8457..bd66914e63 100644
--- a/utils/mir_options.h
+++ b/utils/mir_options.h
@@ -55,8 +55,8 @@ typedef struct {
 		FPAllowProtocol allowProtocol;
 		unsigned int checkboxID;
 	};
-	WORD min;
-	WORD max;
+	uint16_t min;
+	uint16_t max;
 } OptPageControl;
 
 INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, char *module, HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
diff --git a/utils/std_string_utils.cpp b/utils/std_string_utils.cpp
index b7024bedcf..5b7ddd5822 100644
--- a/utils/std_string_utils.cpp
+++ b/utils/std_string_utils.cpp
@@ -72,7 +72,7 @@ time_t utils::time::from_string(const std::string &data)
 	return (time_t)timestamp;
 }
 
-std::string utils::conversion::to_string(void* data, WORD type)
+std::string utils::conversion::to_string(void* data, uint16_t type)
 {
 	std::stringstream out;