diff --git a/Contrib/Makensisw/toolbar.cpp b/Contrib/Makensisw/toolbar.cpp
index 43f9a59a..d47f2790 100644
--- a/Contrib/Makensisw/toolbar.cpp
+++ b/Contrib/Makensisw/toolbar.cpp
@@ -33,9 +33,9 @@ extern NTOOLTIP g_tip;
 
 typedef struct {
   BYTE Style, State;
-  UINT8 ImgIdx;
-  UINT8 TTip;
-  UINT16 CmdId;
+  BYTE ImgIdx;
+  BYTE TTip;
+  WORD CmdId;
 } TBBTNDESC;
 #define MKNAMEDTBBTNDESC(id, sta, sty) sty, sta, IDB_##id, IDS_##id, IDM_##id
 
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index 23e1d2b6..ee9dd1a9 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -27,7 +27,7 @@
 #include "toolbar.h"
 #include <shlwapi.h>
 
-typedef UINT8 PACKEDCMDID_T;
+typedef BYTE PACKEDCMDID_T;
 #define PACKCMDID(id) ( PACKEDCMDID_T((id) - IDM_CMDBASE) )
 #define UNPACKCMDID(id) ( IDM_CMDBASE + (id) )