[Scummvm-git-logs] scummvm master -> a1b6d4bfd454f394bbd748f8018c7835097f7b86

bluegr noreply at scummvm.org
Sat Sep 6 23:30:25 UTC 2025


This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
e801b4e658 BAGEL: BYTE/UBYTE -> byte, WORD/USHORT -> uint16, LPLONG -> long *
89ee4b14b9 BAGEL: Switch more variable types to the ScummVM ones
5cb3810845 BAGEL: Remove unused typedefs
2aa1b77ced BAGEL: Use built-in boolean types
782c9d0923 BAGEL: Remove unused typedefs
3accfdcea2 BAGEL: Switch more types to the ScummVM ones
a1b6d4bfd4 BAGEL: Remove redundant C-style void params


Commit: e801b4e658fecbd6bb3310f4f890cfabaa6c898a
    https://github.com/scummvm/scummvm/commit/e801b4e658fecbd6bb3310f4f890cfabaa6c898a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T02:29:21+03:00

Commit Message:
BAGEL: BYTE/UBYTE -> byte, WORD/USHORT -> uint16, LPLONG -> long *

Changed paths:
    engines/bagel/boflib/sound.cpp
    engines/bagel/boflib/sound.h
    engines/bagel/hodjnpodj/battlefish/bfish.cpp
    engines/bagel/hodjnpodj/battlefish/bfish.h
    engines/bagel/hodjnpodj/beacon/beacon.cpp
    engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
    engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
    engines/bagel/hodjnpodj/hnplibs/dibapi.h
    engines/bagel/hodjnpodj/hnplibs/sprite.cpp
    engines/bagel/hodjnpodj/hnplibs/stdinc.h
    engines/bagel/hodjnpodj/mankala/mnk.h
    engines/bagel/hodjnpodj/mankala/mnklog.cpp
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
    engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
    engines/bagel/hodjnpodj/novacancy/main.cpp
    engines/bagel/hodjnpodj/novacancy/main.h
    engines/bagel/hodjnpodj/pdq/game.cpp
    engines/bagel/hodjnpodj/riddles/riddles.h
    engines/bagel/hodjnpodj/wordsearch/wordlist.cpp
    engines/bagel/mfc/afxmsg.h
    engines/bagel/mfc/afxwin.h
    engines/bagel/mfc/atltime.h
    engines/bagel/mfc/dialog.cpp
    engines/bagel/mfc/font.cpp
    engines/bagel/mfc/gfx/dialog_template.cpp
    engines/bagel/mfc/gfx/dialog_template.h
    engines/bagel/mfc/minwindef.h
    engines/bagel/mfc/wingdi.cpp
    engines/bagel/mfc/wingdi.h
    engines/bagel/mfc/winnt.h
    engines/bagel/spacebar/sraf_computer.cpp


diff --git a/engines/bagel/boflib/sound.cpp b/engines/bagel/boflib/sound.cpp
index 772d9dd5999..64f7a387e39 100644
--- a/engines/bagel/boflib/sound.cpp
+++ b/engines/bagel/boflib/sound.cpp
@@ -75,7 +75,7 @@ void CBofSound::addToSoundChain() {
 	}
 }
 
-void CBofSound::initialize(void *pWnd, const char *pszPathName, WORD wFlags) {
+void CBofSound::initialize(void *pWnd, const char *pszPathName, uint16 wFlags) {
 	// Validate input
 	assert(pszPathName != nullptr);
 	assert(strlen(pszPathName) < MAX_FNAME);
diff --git a/engines/bagel/boflib/sound.h b/engines/bagel/boflib/sound.h
index 9df74e4b2ab..6e3f61945f0 100644
--- a/engines/bagel/boflib/sound.h
+++ b/engines/bagel/boflib/sound.h
@@ -83,10 +83,10 @@ public:
 	virtual ~CBofSound();
 	void addToSoundChain();
 
-	void initialize(const char *pszPathName, WORD wFlags) {
+	void initialize(const char *pszPathName, uint16 wFlags) {
 		initialize(nullptr, pszPathName, wFlags);
 	}
-	void initialize(void *pWnd, const char *pszPathName, WORD wFlags);
+	void initialize(void *pWnd, const char *pszPathName, uint16 wFlags);
 	void setDrivePath(const char *path) {}
 	bool midiLoopPlaySegment(uint32 LoopBegin, uint32 LoopEnd = 0L, uint32 FirstPassBegin = 0L, uint32 TimeFmt = FMT_MILLISEC);
 	bool play(uint32 StartOfPlay = 0L, uint32 TimeFmtFlag = FMT_MILLISEC);
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.cpp b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
index 58a26b34d77..9e19b525ce3 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
@@ -319,8 +319,8 @@ CBFishWindow::CBFishWindow(void) {
 
 	// Init the player grids
 	//
-	memset(m_nUserGrid, EMPTY, sizeof(UBYTE) * GRID_ROWS * GRID_COLS);
-	memset(m_nEnemyGrid, EMPTY, sizeof(UBYTE) * GRID_ROWS * GRID_COLS);
+	memset(m_nUserGrid, EMPTY, sizeof(byte) * GRID_ROWS * GRID_COLS);
+	memset(m_nEnemyGrid, EMPTY, sizeof(byte) * GRID_ROWS * GRID_COLS);
 
 	// Set the coordinates for the "Start New Game" button
 	//
@@ -863,7 +863,7 @@ ERROR_CODE CBFishWindow::RepaintSpriteList(CDC *pDC) {
 *
 *  FORMAL PARAMETERS:
 *
-*       WPARAM = WORD parameter for this message
+*       WPARAM = uint16 parameter for this message
 *       LPARAM = long parameter for this message
 *
 *  RETURN VALUE:
@@ -1271,7 +1271,7 @@ void CBFishWindow::PlaceEnemyFish(void) {
 						rowTmp = m_aEnemyFishInfo[i].nLoc[k].x;
 						colTmp = m_aEnemyFishInfo[i].nLoc[k].y;
 
-						m_nEnemyGrid[rowTmp][colTmp] = (UBYTE)IndexToId(i);
+						m_nEnemyGrid[rowTmp][colTmp] = (byte)IndexToId(i);
 					}
 					break;
 				}
@@ -1446,8 +1446,8 @@ void CBFishWindow::GameReset(void) {
 
 	// reset the play grids
 	//
-	memset(m_nUserGrid, EMPTY, sizeof(UBYTE) * GRID_ROWS * GRID_COLS);
-	memset(m_nEnemyGrid, EMPTY, sizeof(UBYTE) * GRID_ROWS * GRID_COLS);
+	memset(m_nUserGrid, EMPTY, sizeof(byte) * GRID_ROWS * GRID_COLS);
+	memset(m_nEnemyGrid, EMPTY, sizeof(byte) * GRID_ROWS * GRID_COLS);
 
 	// make a copy of the fish sizes
 	memcpy(&m_aUserFishInfo, &gFishSizes, sizeof(FISH) * MAX_FISH);
@@ -1626,9 +1626,9 @@ void CBFishWindow::AssignFishToGrid(int nFishIndex) {
 		assert(nColTmp >= 0 && nColTmp < GRID_COLS);
 
 		// this square must be empty (or can contain parts of same fish)
-		assert(m_nUserGrid[nRowTmp][nColTmp] == EMPTY || m_nUserGrid[nRowTmp][nColTmp] == (UBYTE)IndexToId(nFishIndex));
+		assert(m_nUserGrid[nRowTmp][nColTmp] == EMPTY || m_nUserGrid[nRowTmp][nColTmp] == (byte)IndexToId(nFishIndex));
 
-		m_nUserGrid[nRowTmp][nColTmp] = (UBYTE)IndexToId(nFishIndex);
+		m_nUserGrid[nRowTmp][nColTmp] = (byte)IndexToId(nFishIndex);
 	}
 }
 
@@ -2079,7 +2079,7 @@ BOOL CBFishWindow::OkToPlaceFish(int nFishIndex, CPoint point, BOOL bRotated) {
 
 			// can't put the new fish into a non-empty square
 			//
-			if ((m_nUserGrid[nRow][nCol] != EMPTY) && (m_nUserGrid[nRow][nCol] != (UBYTE)nID)) {
+			if ((m_nUserGrid[nRow][nCol] != EMPTY) && (m_nUserGrid[nRow][nCol] != (byte)nID)) {
 				bOk = FALSE;
 				break;
 			}
@@ -2121,7 +2121,7 @@ void CBFishWindow::PlaceFish(int nFishIndex, CPoint point) {
 			nCol = (nGridIndex % GRID_COLS) + m_aUserFishInfo[nFishIndex].nLoc[i].y;
 		}
 
-		m_nUserGrid[nRow][nCol] = (UBYTE)nID;
+		m_nUserGrid[nRow][nCol] = (byte)nID;
 	}
 }
 
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.h b/engines/bagel/hodjnpodj/battlefish/bfish.h
index 9038e23487b..86486eb8f49 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.h
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.h
@@ -42,7 +42,7 @@ namespace Battlefish {
 
 typedef struct {
 	POINT nLoc[MAX_FISH_SIZE + 1];
-	UBYTE life;
+	byte life;
 } FISH;
 
 class CBFishWindow : public CFrameWnd {
@@ -111,8 +111,8 @@ protected:
 
 	// Data Members
 	//
-	UBYTE       m_nUserGrid[GRID_ROWS][GRID_COLS];
-	UBYTE       m_nEnemyGrid[GRID_ROWS][GRID_COLS];
+	byte       m_nUserGrid[GRID_ROWS][GRID_COLS];
+	byte       m_nEnemyGrid[GRID_ROWS][GRID_COLS];
 	FISH        m_aEnemyFishInfo[MAX_FISH];
 	FISH        m_aUserFishInfo[MAX_FISH];
 	CRect       m_rNewGameButton;
diff --git a/engines/bagel/hodjnpodj/beacon/beacon.cpp b/engines/bagel/hodjnpodj/beacon/beacon.cpp
index e87f8022022..af1aee77b78 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.cpp
+++ b/engines/bagel/hodjnpodj/beacon/beacon.cpp
@@ -209,7 +209,7 @@ CMainWindow::CMainWindow() {
 		colorBlock[i].nColorIndex = BUTTON_ENTRY + i;
 
 		pMyBrush = new CBrush();                        // Construct new brush
-		(*pMyBrush).CreateSolidBrush(PALETTEINDEX((WORD)(colorBlock[i].nColorIndex)));
+		(*pMyBrush).CreateSolidBrush(PALETTEINDEX((uint16)(colorBlock[i].nColorIndex)));
 
 		(*pArtDC).FillRect(colorBlock[i].rLocation, pMyBrush);
 
@@ -389,10 +389,10 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 		End.y = Center.y + (int)(y * radius);
 
 		pMyPen = new CPen();                            // Construct new pen
-		(*pMyPen).CreatePen(PS_SOLID, 1, PALETTEINDEX((WORD)(i + START_ENTRY)));
+		(*pMyPen).CreatePen(PS_SOLID, 1, PALETTEINDEX((uint16)(i + START_ENTRY)));
 		pOldPen = (*pBigDC).SelectObject(pMyPen);
 		pMyBrush = new CBrush();                        // Construct new brush
-		(*pMyBrush).CreateSolidBrush(PALETTEINDEX((WORD)(i + START_ENTRY)));
+		(*pMyBrush).CreateSolidBrush(PALETTEINDEX((uint16)(i + START_ENTRY)));
 		pOldBrush = (*pBigDC).SelectObject(pMyBrush);
 
 		(*pBigDC).Pie(&rect, End, Start);
@@ -1029,7 +1029,7 @@ void CALLBACK StepAlongLine(int xpos, int ypos, CDC *cdc) {
 BOOL CMainWindow::CompareColors(CDC *pDC, CPoint point) {
 	CPoint      square;
 	COLORREF    test;
-	BYTE        ar, ag, ab, br, bg, bb;
+	byte        ar, ag, ab, br, bg, bb;
 	PALETTEENTRY    tempent[1];
 	UINT        index;
 
@@ -1300,7 +1300,7 @@ BOOL CMainWindow::LoadArtWork(CDC *pDC) {
 	for (i = 0; i < NUM_BUTTONS; i++) {
 		CBrush  *pMyBrush = nullptr;
 		pMyBrush = new CBrush();                                // Construct new brush
-		(*pMyBrush).CreateSolidBrush(PALETTEINDEX((WORD)(colorBlock[i].nColorIndex)));
+		(*pMyBrush).CreateSolidBrush(PALETTEINDEX((uint16)(colorBlock[i].nColorIndex)));
 
 		(*pArtDC).FillRect(colorBlock[i].rLocation, pMyBrush);
 
@@ -1438,10 +1438,10 @@ void MyFocusRect(CDC *pDC, CRect rect, BOOL nPressed) {
 	pDarkPen = new CPen();                          // Construct new pen
 	pLitePen = new CPen();                          // Construct new pen
 	pLitePen->CreatePen(PS_INSIDEFRAME, HILITE_BORDER,
-	                    PALETTEINDEX((WORD)(LITE_TRIM)));        // Create a new pen
+	                    PALETTEINDEX((uint16)(LITE_TRIM)));        // Create a new pen
 
 	pDarkPen->CreatePen(PS_INSIDEFRAME, HILITE_BORDER,
-	                    PALETTEINDEX((WORD)(DARK_TRIM)));        // Create a new pen
+	                    PALETTEINDEX((uint16)(DARK_TRIM)));        // Create a new pen
 
 	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);     // Select in game palette
 	(*pDC).RealizePalette();                                // Use it
diff --git a/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp b/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
index 177ed5d4b5e..d75575a8a12 100644
--- a/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
@@ -1102,13 +1102,13 @@ BOOL PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette* pPalette, int nBlock
 			continue;
 		y = (value / width) * nBlockSize;
 		x = (value % width) * nBlockSize;
-		(*pDC).BitBlt((WORD) x,
-		              (WORD) y,
+		(*pDC).BitBlt((uint16) x,
+		              (uint16) y,
 		              nBlockSize,
 		              nBlockSize,
 		              pMemDC,
-		              (WORD) x,
-		              (WORD) y,
+		              (uint16) x,
+		              (uint16) y,
 		              SRCCOPY);
 	}
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
index 6893933e11c..b874cf95efe 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
@@ -181,7 +181,7 @@ BOOL PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
 }
 
 BOOL CreateDIBPalette(HDIB hDIB, CPalette *pPal) {
-	WORD wNumColors;
+	uint16 wNumColors;
 	HANDLE hLogPal;
 	LPLOGPALETTE lpPal;
 	BOOL bResult = false;
@@ -230,7 +230,7 @@ CPalette *DuplicatePalette(CPalette *pOrigPal) {
 	CPalette *pPal;
 	LPLOGPALETTE lpPal;      // pointer to a logical palette
 	HANDLE hLogPal;          // handle to a logical palette
-	WORD wNumColors;         // number of colors in color table
+	uint16 wNumColors;         // number of colors in color table
 	BOOL bResult;
 
 	wNumColors = pOrigPal->GetPaletteEntries(0, 0, nullptr);
@@ -247,7 +247,7 @@ CPalette *DuplicatePalette(CPalette *pOrigPal) {
 
 	/* set version and number of palette entries */
 	lpPal->palVersion = PALVERSION;
-	lpPal->palNumEntries = (WORD)wNumColors;
+	lpPal->palNumEntries = (uint16)wNumColors;
 
 	(*pOrigPal).GetPaletteEntries(0, wNumColors - 1, &lpPal->palPalEntry[0]);
 
@@ -278,12 +278,12 @@ uint32 DIBHeight(HDIB hDIB) {
 	return hDIB->h;
 }
 
-WORD PaletteSize(HDIB hDIB) {
+uint16 PaletteSize(HDIB hDIB) {
 	const Graphics::Palette *pal = hDIB->grabPalette();
 	return pal->size() * 3;
 }
 
-WORD DIBNumColors(HDIB lpDIB) {
+uint16 DIBNumColors(HDIB lpDIB) {
 	const Graphics::Palette *pal = lpDIB->grabPalette();
 	return pal->size();
 }
@@ -413,8 +413,8 @@ void WINAPI InitBitmapInfoHeader(LPBITMAPINFOHEADER lpBmInfoHdr,
 //---------------------------------------------------------------------
 
 HANDLE WINAPI CopyHandle(HANDLE h) {
-	BYTE *lpCopy;
-	BYTE *lp;
+	byte *lpCopy;
+	byte *lp;
 	HANDLE hCopy;
 	uint32 dwLen;
 
@@ -424,8 +424,8 @@ HANDLE WINAPI CopyHandle(HANDLE h) {
 	dwLen = GlobalSize((HGLOBAL)h);
 
 	if ((hCopy = (HANDLE) GlobalAlloc(GHND, dwLen)) != nullptr) {
-		lpCopy = (BYTE *) GlobalLock((HGLOBAL)hCopy);
-		lp = (BYTE *) GlobalLock((HGLOBAL)h);
+		lpCopy = (byte *) GlobalLock((HGLOBAL)hCopy);
+		lp = (byte *) GlobalLock((HGLOBAL)h);
 
 		while (dwLen--)
 			*lpCopy++ = *lp++;
diff --git a/engines/bagel/hodjnpodj/hnplibs/dibapi.h b/engines/bagel/hodjnpodj/hnplibs/dibapi.h
index f35717284ce..a695c0fb66e 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibapi.h
+++ b/engines/bagel/hodjnpodj/hnplibs/dibapi.h
@@ -92,14 +92,14 @@ extern uint32 DIBHeight(HDIB lpDIB);
  * @param lpbi		Pointer to packed-DIB memory block
  * @return		Size of the color palette of the DIB
  */
-extern WORD PaletteSize(HDIB lpDIB);
+extern uint16 PaletteSize(HDIB lpDIB);
 
 /**
  * Gets the number of colors in the palette
  * @param lpbi		Pointer to packed-DIB memory block
  * @return		Number of the palette colors.
  */
-extern WORD DIBNumColors(HDIB lpDIB);
+extern uint16 DIBNumColors(HDIB lpDIB);
 
 HANDLE    CopyHandle(HANDLE h);
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
index 4c5a97caf61..8b986385a50 100644
--- a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
@@ -2207,7 +2207,7 @@ BOOL CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint *pPoint) {
 	         *pBitmap2 = nullptr,                           // bitmap for context 2
 	          *pBitmap1Old = nullptr,                        // bitmap previously mapped to context 1
 	           *pBitmap2Old = nullptr;                        // bitmap previously mapped to context 2
-	BYTE    *chPixels = nullptr;                           // buffer for holding pixel values
+	byte    *chPixels = nullptr;                           // buffer for holding pixel values
 	int     dx, dy,                                     // dimensions of context bitmaps
 	        i, j;
 	size_t  stN;
@@ -2226,7 +2226,7 @@ BOOL CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint *pPoint) {
 	dy = unionRect.bottom - unionRect.top;              // ... and the bitmap area where it will be next
 
 	dwN = stN = ((dx + 15) >> 3) * dy;                    // calculate the amount of memory that a bitmap mask
-	chPixels = (BYTE *) calloc((size_t) 1, stN);        // ... will occupy and allocation that amount of space
+	chPixels = (byte *) calloc((size_t) 1, stN);        // ... will occupy and allocation that amount of space
 	if (!chPixels)
 		return FALSE;
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/stdinc.h b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
index ae401ab6ff9..bd0a80f75f8 100644
--- a/engines/bagel/hodjnpodj/hnplibs/stdinc.h
+++ b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
@@ -58,11 +58,11 @@ namespace HodjNPodj {
 #endif
 #define char char
 typedef unsigned char UCHAR;
-typedef byte UBYTE;
+typedef byte byte;
 #define int int
 typedef short SHORT;
-typedef uint16 USHORT;
-#define WORD USHORT
+typedef uint16 uint16;
+#define uint16 uint16
 #define long long
 typedef unsigned long ULONG;
 #define float float
diff --git a/engines/bagel/hodjnpodj/mankala/mnk.h b/engines/bagel/hodjnpodj/mankala/mnk.h
index 28379dbbd97..f1c0e4e1666 100644
--- a/engines/bagel/hodjnpodj/mankala/mnk.h
+++ b/engines/bagel/hodjnpodj/mankala/mnk.h
@@ -386,7 +386,7 @@ typedef class FAR CMnkData {
 	// p pits.
 
 	HGLOBAL m_hBestWin; // Windows handle for best win table
-	BYTE *m_hpcBestWin; // pointer to array
+	byte *m_hpcBestWin; // pointer to array
 	// of 5 bit values.  The subscripts are integers
 	// 0 <= subscript <= NUMCONFIGS, and the array element
 	// specifies the number of stones (-15 to +15, with -16
diff --git a/engines/bagel/hodjnpodj/mankala/mnklog.cpp b/engines/bagel/hodjnpodj/mankala/mnklog.cpp
index b516b24b250..bedc3de70ad 100644
--- a/engines/bagel/hodjnpodj/mankala/mnklog.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnklog.cpp
@@ -307,8 +307,8 @@ BOOL CMnk::InitData(BOOL bInit)
 //    long lTableSize ;     // size of lookup table
 	long lK ;       // loop variable
 	int iJ ;        // loop variable
-	BYTE *hpcTab;    // table pointer for initialization
-	BYTE *xpcFive;        // ptr to Five structure
+	byte *hpcTab;    // table pointer for initialization
+	byte *xpcFive;        // ptr to Five structure
 	struct FIVE stFive = {TABLEUNDEF,           // 0
 		       TABLEUNDEF >> 2, TABLEUNDEF & 3, TABLEUNDEF, // 1-2
 		       TABLEUNDEF >> 4, TABLEUNDEF & 15,       // 3
@@ -339,14 +339,14 @@ BOOL CMnk::InitData(BOOL bInit)
 			goto cleanup ;
 		}
 		if (!(m_lpCMnkData->m_hpcBestWin
-		        = (BYTE *)GlobalLock(m_lpCMnkData->m_hBestWin))) {
+		        = (byte *)GlobalLock(m_lpCMnkData->m_hBestWin))) {
 			iError = 111 ;  // Windows GlobalLock failure
 			goto cleanup ;
 		}
 
 		#if 0
 		if (!(m_lpCMnkData->m_hpcBestWin =
-		            new BYTE[m_lTableSize + 8])) {
+		            new byte[m_lTableSize + 8])) {
 			iError = 101 ;  // can't allocate best win array
 			goto cleanup ;
 		}
@@ -357,7 +357,7 @@ BOOL CMnk::InitData(BOOL bInit)
 			for (lK = m_lTableSize / sizeof(struct FIVE),
 			        hpcTab = m_lpCMnkData->m_hpcBestWin ; lK-- > 0 ;)
 				for (iJ = sizeof(struct FIVE),
-				        xpcFive = (BYTE *)&stFive ; iJ-- > 0 ;)
+				        xpcFive = (byte *)&stFive ; iJ-- > 0 ;)
 					*hpcTab++ = *xpcFive++ ;
 
 			PopulateTable() ;   // populate the best win table
@@ -1627,14 +1627,14 @@ int CMnk::ExtendedStaticEvaluation(MOVE *pMove, MOVE *pParentMove,  signed char
 #define MAKEWORD(L, H)          ((L)||(H<<8))
 #define CreateMoveChainWord(Gain, Flag, Pit)    (MAKEWORD((Flag) ||(Pit), Gain))
 
-WORD Type(BYTE pit, CONFIG* pStoneCfg){
+uint16 Type(byte pit, CONFIG* pStoneCfg){
 
 //returns F/C/T/N in the lowbyte    and the amount of gain/save in the high byte.
 }
 
-BOOL CMnk::LookAheadEvaluation(CONFIG* pStoneConfig, int iPlayer,   WORD* pwMoveChain){
+BOOL CMnk::LookAheadEvaluation(CONFIG* pStoneConfig, int iPlayer,   uint16* pwMoveChain){
     static BOOL bLocked;
-    BYTE Pit;
+    byte Pit;
 
     for(Pit=0; Pit<NUMPITS; Pit++){
         switch(LOBYTE(u=Type(iPit, pStoneConfig))){
@@ -1853,7 +1853,7 @@ cleanup:
 //
 //  if (lIndex >= THRESHHOLD)
 //  {
-//  static BYTE FAR cBuffer[BUFSIZE] ;
+//  static byte FAR cBuffer[BUFSIZE] ;
 //
 //  if (lIndex == THRESHHOLD)
 //  {
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index b0e941f517b..6b1636fade4 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -141,7 +141,7 @@ long    lChallengeScore = 0;
 CSound  *pBackgroundMidi = nullptr;
 
 #define BELLCURVE   100
-UBYTE     anBellCurve[BELLCURVE] = {
+byte     anBellCurve[BELLCURVE] = {
 	1,
 	2, 2,
 	3, 3, 3,
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
index dfd6e8d790e..2d10f9b9e3f 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
@@ -365,13 +365,13 @@ BOOL CGtlData::ParseLine(void)
 			case KT_WEIGHT:
 				lpNode->m_bWgtSpec = TRUE ;
 				xpLxel = ParseInteger(xpLxel, LXT_IDENT, iTmp) ;
-				lpNode->m_iWeight = (UBYTE)iTmp;
+				lpNode->m_iWeight = (byte)iTmp;
 				break ;
 
 			case KT_SENSITIVITY:
 				lpNode->m_bSenSpec = TRUE ;
 				xpLxel = ParseInteger(xpLxel, LXT_IDENT, iTmp);
-				lpNode->m_iSensitivity = (UBYTE)iTmp;
+				lpNode->m_iSensitivity = (byte)iTmp;
 				break ;
 
 			case KT_SECTOR:
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
index 9361f73c6ee..7a0fa5b546b 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
@@ -215,8 +215,8 @@ public:
 	bool m_bWgtSpec : 1;				// weight specified
 	bool m_bSenSpec : 1;				// sensitivity specified
 	bool m_bMenu : 1;					// TRUE if menu
-	UBYTE m_iWeight = 0;				// node weight
-	UBYTE m_iSensitivity = 0;			// distance to accept clickb
+	byte m_iWeight = 0;				// node weight
+	byte m_iSensitivity = 0;			// distance to accept clickb
 
 	CNode();
 
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h b/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
index 10f257f01a7..97ed55e8ebb 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
@@ -107,7 +107,7 @@ struct PLAYER_INFO {
  */
 struct SAVEGAME_INFO {
 	ULONG   m_lBoffoGameID = 0;
-	USHORT  m_nFixedRecordSize = 0;
+	uint16  m_nFixedRecordSize = 0;
 	BOOL    m_bUsed = false;
 	//	char    m_szSaveGameDescription[40];    // description of this saved game
 
@@ -119,7 +119,7 @@ struct SAVEGAME_INFO {
 
 	int     m_iMishMoshLoc = 0;		// MG_LOC_xxxx -- Mish/Mosh location
 
-	UBYTE   m_chJunk[80] = { 0 };	// for future use so the .SAV file size
+	byte   m_chJunk[80] = { 0 };	// for future use so the .SAV file size
 	// does not have to change
 
 	BOOL    m_bSoundEffectsEnabled = false;
diff --git a/engines/bagel/hodjnpodj/novacancy/main.cpp b/engines/bagel/hodjnpodj/novacancy/main.cpp
index 27587837a62..6a1011c6d53 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.cpp
+++ b/engines/bagel/hodjnpodj/novacancy/main.cpp
@@ -552,8 +552,8 @@ void CMainWindow::PlayGame() {
 
 		AnimateDice();
 #pragma warning(disable: 4135)
-		m_LDie = (BYTE)(((uint32)(UINT)brand() * 6L) / ((uint32)(UINT)RAND_MAX + 1L)) + 1;
-		m_RDie = (BYTE)(((uint32)(UINT)brand() * 6L) / ((uint32)(UINT)RAND_MAX + 1L)) + 1;
+		m_LDie = (byte)(((uint32)(UINT)brand() * 6L) / ((uint32)(UINT)RAND_MAX + 1L)) + 1;
+		m_RDie = (byte)(((uint32)(UINT)brand() * 6L) / ((uint32)(UINT)RAND_MAX + 1L)) + 1;
 #pragma warning(default: 4135)
 		PaintMaskedBitmap(pDC, m_pGamePalette, pCRDieBmp[m_RDie], \
 		                  m_rRDie.left, m_rRDie.top, (int) m_rRDie.Width(), (int) m_rRDie.Height());
@@ -793,7 +793,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 				*/
 				for (i = 7, AllFxd = TRUE; i < 13; i++) {            // i<13 because i==12 is the max doable throw with two dice.
 					/***** note that this was a bug in versions 1.0 thru 1.5 ******/
-					if (AllFxd) AllFxd = !IsThrowDoable((BYTE)i);
+					if (AllFxd) AllFxd = !IsThrowDoable((byte)i);
 					else  break;
 				}
 				m_bOneDieCase = AllFxd;
@@ -801,8 +801,8 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 				/* randomise throws */
 #pragma warning(disable: 4135)
 				V = (uint32)((UINT)RAND_MAX + 1);
-				m_LDie = (BYTE)(((uint32)(UINT)brand() * 6L) / V) +1;                                    //  left Die
-				m_RDie = m_bOneDieCase ? 0 : (BYTE)(((uint32)(UINT)brand() * 6) / V) +1;       //    right Die
+				m_LDie = (byte)(((uint32)(UINT)brand() * 6L) / V) +1;                                    //  left Die
+				m_RDie = m_bOneDieCase ? 0 : (byte)(((uint32)(UINT)brand() * 6) / V) +1;       //    right Die
 #pragma warning(default: 4135)
 
 				pDC = GetDC();
@@ -826,7 +826,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 				    Bring up MessageBox to that effect and in case it's 3 throws terminate current
 				    game. If the throw is doable reset the count of undoable throws to 0.
 				 */
-				if (!IsThrowDoable((BYTE)(m_LDie + m_RDie))) {
+				if (!IsThrowDoable((byte)(m_LDie + m_RDie))) {
 					/*
 					if the #of successive undoable throws is 3 then you 've lost game.
 					Else: display message box and continue
@@ -970,7 +970,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 							} //end if m_iDoorStatus==Open.
 
 
-							m_cActiveDoor = (BYTE)i;         //set active door.     //this flag is now obsolete, but retained only for compatibility.
+							m_cActiveDoor = (byte)i;         //set active door.     //this flag is now obsolete, but retained only for compatibility.
 						} else {   //if m_iMoveValid ==-1 i.e. invalid move
 							sndPlaySound(GetStringFromResource(IDS_NOPE), SND_ASYNC);
 							if ((m_iMoveValid = LegalizeMove(0)) == 1);
@@ -1302,7 +1302,7 @@ short CMainWindow::LegalizeMove(short  j) {
 	*   LegalizeMove keeps track of the number of open doors.
 	***********************************************************************************************************************************
 	*/
-	static BYTE DoorSum,
+	static byte DoorSum,
 	       DiceSum;
 	short int ReadyForDiceClick = 0;
 
@@ -1312,12 +1312,12 @@ short CMainWindow::LegalizeMove(short  j) {
 		m_bDiceJustThrown = FALSE;
 	}
 
-	DiceSum = (BYTE)(m_LDie + m_RDie);
+	DiceSum = (byte)(m_LDie + m_RDie);
 	if (m_iDoorStatus[j] == OPEN) {
 		//increment  door count  if  the door is initially open (i.e. the mouse is clicked on an open door) and decrement otherwise
 
-		if ((DoorSum += (BYTE)j) > DiceSum) {
-			DoorSum -= (BYTE)j;                                     // disallow clicking on such a door so as to exceed door sum.
+		if ((DoorSum += (byte)j) > DiceSum) {
+			DoorSum -= (byte)j;                                     // disallow clicking on such a door so as to exceed door sum.
 			return -1;
 		} else {
 			if (DoorSum == DiceSum)    ReadyForDiceClick = 1;
@@ -1325,9 +1325,9 @@ short CMainWindow::LegalizeMove(short  j) {
 			return (ReadyForDiceClick);        // return (1) if all set, 0 if door sum < dice sum.
 		}
 	} else {                   // if door is initially closed decrement doorsum.
-		DoorSum -= (BYTE)j;
+		DoorSum -= (byte)j;
 		if (DoorSum > DiceSum) {
-			DoorSum += (BYTE)j;
+			DoorSum += (byte)j;
 			return -1;
 		}
 		if (DoorSum == DiceSum)    ReadyForDiceClick = 1;
@@ -1337,7 +1337,7 @@ short CMainWindow::LegalizeMove(short  j) {
 }
 
 
-BOOL CMainWindow::IsThrowDoable(BYTE DiceSum) {
+BOOL CMainWindow::IsThrowDoable(byte DiceSum) {
 	/*****************************************************************************************************************
 	*   [IsThrowDoable]
 	*
@@ -1347,7 +1347,7 @@ BOOL CMainWindow::IsThrowDoable(BYTE DiceSum) {
 	*   combination just rolled in is a member of this set; if yes, the throw is doable, else not.
 	*
 	*   CALLING SEQUENCE:
-	*   BOOL _pascal IsThrowDoable(BYTE DiceSum)
+	*   BOOL _pascal IsThrowDoable(byte DiceSum)
 	*
 	*   FORMAL PARAMETERS:
 	*   DiceSum is the current throw of the dice.
@@ -1369,8 +1369,8 @@ BOOL CMainWindow::IsThrowDoable(BYTE DiceSum) {
 	*/
 
 #pragma warning(disable: 4135)
-	BYTE s[9];                                                       //Open doors.
-	BYTE Count,                                               //# of open doors.
+	byte s[9];                                                       //Open doors.
+	byte Count,                                               //# of open doors.
 	     i,
 	     k,
 	     sum,
diff --git a/engines/bagel/hodjnpodj/novacancy/main.h b/engines/bagel/hodjnpodj/novacancy/main.h
index b849bd40b9c..6e717375b5a 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.h
+++ b/engines/bagel/hodjnpodj/novacancy/main.h
@@ -86,17 +86,17 @@ protected:
 	BOOL m_bDoorBmpLoaded[10];
 	BOOL m_bGameLoadUp;
 
-	BYTE m_cDoorToOpen;
-	BYTE m_LDie;
-	BYTE m_RDie;
-	BYTE m_cUnDoableThrows;
+	byte m_cDoorToOpen;
+	byte m_LDie;
+	byte m_RDie;
+	byte m_cUnDoableThrows;
 
 	short m_iMoveValid;             //    flag to indicate the legal status of the last move. It is a ternary indicator :
 	//      1 => Perfectly legal move, and the dice van be rolled if desired.
 	//      0 => Legal move but not complete to roll the dice. The dice are disabled.
 	//      -1=> Illegal move; stop and correct yourself. The dice are disabled.
-	BYTE m_cDoorCount;            //    keeps track of all closed doors, irrespective of the  validity of  the move
-	BYTE m_cActiveDoor;           //    the door whose status has just been changed (as result of mouse action).
+	byte m_cDoorCount;            //    keeps track of all closed doors, irrespective of the  validity of  the move
+	byte m_cActiveDoor;           //    the door whose status has just been changed (as result of mouse action).
 	BOOL m_bOneDieCase;        //   this variable is always FALSE unless doors 7, 8, and 9 are FIEXD.
 
 	//other objects for animation...
@@ -126,7 +126,7 @@ private:
 
 	void AnimateDice(void);
 	short LegalizeMove(short i);
-	BOOL IsThrowDoable(BYTE dice_sum);
+	BOOL IsThrowDoable(byte dice_sum);
 };
 
 
diff --git a/engines/bagel/hodjnpodj/pdq/game.cpp b/engines/bagel/hodjnpodj/pdq/game.cpp
index 36dc3d0efba..3cf0816e52d 100644
--- a/engines/bagel/hodjnpodj/pdq/game.cpp
+++ b/engines/bagel/hodjnpodj/pdq/game.cpp
@@ -43,7 +43,7 @@ namespace PDQ {
 */
 typedef struct {
 	char   text[MAX_PLENGTH_S + 1];
-	UBYTE  order[MAX_PLENGTH];
+	byte  order[MAX_PLENGTH];
 } PHRASES;
 
 typedef struct {
@@ -250,7 +250,7 @@ ERROR_CODE LoadNewPhrase(void) {
 *
 **/
 void BuildRandomPhraseOrder() {
-	UBYTE *curPhraseOrder;
+	byte *curPhraseOrder;
 	int i, j, n, newIndex;
 	bool use;
 
@@ -261,7 +261,7 @@ void BuildRandomPhraseOrder() {
 
 		curPhraseOrder = curPhrase->order;
 
-		memset(curPhraseOrder, 0, MAX_PLENGTH * sizeof(UBYTE));
+		memset(curPhraseOrder, 0, MAX_PLENGTH * sizeof(byte));
 
 		/*
 		* each entry must be a unique index into the spriteList
@@ -279,7 +279,7 @@ void BuildRandomPhraseOrder() {
 				}
 			} while (!use);
 
-			curPhraseOrder[i] = (UBYTE)newIndex;
+			curPhraseOrder[i] = (byte)newIndex;
 		}
 	}
 }
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.h b/engines/bagel/hodjnpodj/riddles/riddles.h
index a90ecaa8d9a..e53ee637a9a 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.h
+++ b/engines/bagel/hodjnpodj/riddles/riddles.h
@@ -104,7 +104,7 @@ namespace Riddles {
 
 #include "common/pack-start.h"  // START STRUCT PACKING
 struct RIDDLE {
-	USHORT nSoundId;
+	uint16 nSoundId;
 	char text[MAX_RIDDLE_LENGTH + 1];
 	char answers[MAX_ANSWERS][MAX_ANSWER_LENGTH + 1];
 } PACKED_STRUCT;
diff --git a/engines/bagel/hodjnpodj/wordsearch/wordlist.cpp b/engines/bagel/hodjnpodj/wordsearch/wordlist.cpp
index 23b744ac35f..294cba30387 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordlist.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/wordlist.cpp
@@ -428,7 +428,7 @@ char    acList[NUMBEROFLISTS][WORDSPERLIST][20] = {
 		{ "MOUSE" },    //18
 		{ "PIXEL" },    //19
 		{ "CRASH" },    //6
-		{ "BYTE" }, //3
+		{ "byte" }, //3
 		{ "BUG" },  //4
 	},
 	{
diff --git a/engines/bagel/mfc/afxmsg.h b/engines/bagel/mfc/afxmsg.h
index 35034453251..d6a93fc6457 100644
--- a/engines/bagel/mfc/afxmsg.h
+++ b/engines/bagel/mfc/afxmsg.h
@@ -206,13 +206,13 @@ namespace MFC {
 #define MM_WOM_DONE                     0x3BD
 
 #define ON_COMMAND(id, memberFxn) \
-	{ WM_COMMAND, CN_COMMAND, (WORD)id, (WORD)id, AfxSigCmd_v, \
+	{ WM_COMMAND, CN_COMMAND, (uint16)id, (uint16)id, AfxSigCmd_v, \
 		static_cast<AFX_PMSG> (&memberFxn) },
 // ON_COMMAND(id, OnBar) is the same as
 //   ON_CONTROL(0, id, OnBar) or ON_BN_CLICKED(0, id, OnBar)
 
 #define ON_COMMAND_RANGE(id, idLast, memberFxn) \
-	{ WM_COMMAND, CN_COMMAND, (WORD)id, (WORD)idLast, AfxSigCmd_RANGE, \
+	{ WM_COMMAND, CN_COMMAND, (uint16)id, (uint16)idLast, AfxSigCmd_RANGE, \
 		(AFX_PMSG) \
 		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(UINT) > \
 		 (memberFxn)) },
@@ -220,61 +220,61 @@ namespace MFC {
 //   ON_CONTROL_RANGE(0, id, idLast, OnBar)
 
 #define ON_COMMAND_EX(id, memberFxn) \
-	{ WM_COMMAND, CN_COMMAND, (WORD)id, (WORD)id, AfxSigCmd_EX, \
+	{ WM_COMMAND, CN_COMMAND, (uint16)id, (uint16)id, AfxSigCmd_EX, \
 		(AFX_PMSG) \
 		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(UINT) > \
 		 (memberFxn)) },
 
 #define ON_COMMAND_EX_RANGE(id, idLast, memberFxn) \
-	{ WM_COMMAND, CN_COMMAND, (WORD)id, (WORD)idLast, AfxSigCmd_EX, \
+	{ WM_COMMAND, CN_COMMAND, (uint16)id, (uint16)idLast, AfxSigCmd_EX, \
 		(AFX_PMSG) \
 		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(UINT) > \
 		 (memberFxn)) },
 
 // update ui's are listed as WM_COMMAND's so they get routed like commands
 #define ON_UPDATE_COMMAND_UI(id, memberFxn) \
-	{ WM_COMMAND, CN_UPDATE_COMMAND_UI, (WORD)id, (WORD)id, AfxSigCmdUI, \
+	{ WM_COMMAND, CN_UPDATE_COMMAND_UI, (uint16)id, (uint16)id, AfxSigCmdUI, \
 		(AFX_PMSG) \
 		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(CCmdUI*) > \
 		 (memberFxn)) },
 
 #define ON_UPDATE_COMMAND_UI_RANGE(id, idLast, memberFxn) \
-	{ WM_COMMAND, CN_UPDATE_COMMAND_UI, (WORD)id, (WORD)idLast, AfxSigCmdUI, \
+	{ WM_COMMAND, CN_UPDATE_COMMAND_UI, (uint16)id, (uint16)idLast, AfxSigCmdUI, \
 		(AFX_PMSG) \
 		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(CCmdUI*) > \
 		 (memberFxn)) },
 
 #define ON_NOTIFY(wNotifyCode, id, memberFxn) \
-	{ WM_NOTIFY, (WORD)(int)wNotifyCode, (WORD)id, (WORD)id, AfxSigNotify_v, \
+	{ WM_NOTIFY, (uint16)(int)wNotifyCode, (uint16)id, (uint16)id, AfxSigNotify_v, \
 		(AFX_PMSG) \
 		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 #define ON_NOTIFY_RANGE(wNotifyCode, id, idLast, memberFxn) \
-	{ WM_NOTIFY, (WORD)(int)wNotifyCode, (WORD)id, (WORD)idLast, AfxSigNotify_RANGE, \
+	{ WM_NOTIFY, (uint16)(int)wNotifyCode, (uint16)id, (uint16)idLast, AfxSigNotify_RANGE, \
 		(AFX_PMSG) \
 		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(UINT, NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 #define ON_NOTIFY_EX(wNotifyCode, id, memberFxn) \
-	{ WM_NOTIFY, (WORD)(int)wNotifyCode, (WORD)id, (WORD)id, AfxSigNotify_EX, \
+	{ WM_NOTIFY, (uint16)(int)wNotifyCode, (uint16)id, (uint16)id, AfxSigNotify_EX, \
 		(AFX_PMSG) \
 		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(UINT, NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 #define ON_NOTIFY_EX_RANGE(wNotifyCode, id, idLast, memberFxn) \
-	{ WM_NOTIFY, (WORD)(int)wNotifyCode, (WORD)id, (WORD)idLast, AfxSigNotify_EX, \
+	{ WM_NOTIFY, (uint16)(int)wNotifyCode, (uint16)id, (uint16)idLast, AfxSigNotify_EX, \
 		(AFX_PMSG) \
 		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(UINT, NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 // for general controls
 #define ON_CONTROL(wNotifyCode, id, memberFxn) \
-	{ WM_COMMAND, (WORD)wNotifyCode, (WORD)id, (WORD)id, AfxSigCmd_v, \
+	{ WM_COMMAND, (uint16)wNotifyCode, (uint16)id, (uint16)id, AfxSigCmd_v, \
 		(static_cast< AFX_PMSG > (&memberFxn)) },
 
 #define ON_CONTROL_RANGE(wNotifyCode, id, idLast, memberFxn) \
-	{ WM_COMMAND, (WORD)wNotifyCode, (WORD)id, (WORD)idLast, AfxSigCmd_RANGE, \
+	{ WM_COMMAND, (uint16)wNotifyCode, (uint16)id, (uint16)idLast, AfxSigCmd_RANGE, \
 		(AFX_PMSG) \
 		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(UINT) > (memberFxn)) },
 
@@ -282,28 +282,28 @@ namespace MFC {
 
 // for control notification reflection
 #define ON_CONTROL_REFLECT(wNotifyCode, memberFxn) \
-	{ WM_COMMAND+WM_REFLECT_BASE, (WORD)wNotifyCode, 0, 0, AfxSigCmd_v, \
+	{ WM_COMMAND+WM_REFLECT_BASE, (uint16)wNotifyCode, 0, 0, AfxSigCmd_v, \
 		(static_cast<AFX_PMSG> (memberFxn)) },
 
 #define ON_CONTROL_REFLECT_EX(wNotifyCode, memberFxn) \
-	{ WM_COMMAND+WM_REFLECT_BASE, (WORD)wNotifyCode, 0, 0, AfxSigCmd_b, \
+	{ WM_COMMAND+WM_REFLECT_BASE, (uint16)wNotifyCode, 0, 0, AfxSigCmd_b, \
 		(AFX_PMSG) \
 		(static_cast<BOOL (AFX_MSG_CALL CCmdTarget::*)(void)> (memberFxn)) },
 
 #define ON_NOTIFY_REFLECT(wNotifyCode, memberFxn) \
-	{ WM_NOTIFY+WM_REFLECT_BASE, (WORD)(int)wNotifyCode, 0, 0, AfxSigNotify_v, \
+	{ WM_NOTIFY+WM_REFLECT_BASE, (uint16)(int)wNotifyCode, 0, 0, AfxSigNotify_v, \
 		(AFX_PMSG) \
 		(static_cast<void (AFX_MSG_CALL CCmdTarget::*)(NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 #define ON_NOTIFY_REFLECT_EX(wNotifyCode, memberFxn) \
-	{ WM_NOTIFY+WM_REFLECT_BASE, (WORD)(int)wNotifyCode, 0, 0, AfxSigNotify_b, \
+	{ WM_NOTIFY+WM_REFLECT_BASE, (uint16)(int)wNotifyCode, 0, 0, AfxSigNotify_b, \
 		(AFX_PMSG) \
 		(static_cast<BOOL (AFX_MSG_CALL CCmdTarget::*)(NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 #define ON_UPDATE_COMMAND_UI_REFLECT(memberFxn) \
-	{ WM_COMMAND+WM_REFLECT_BASE, (WORD)CN_UPDATE_COMMAND_UI, 0, 0, AfxSigCmdUI, \
+	{ WM_COMMAND+WM_REFLECT_BASE, (uint16)CN_UPDATE_COMMAND_UI, 0, 0, AfxSigCmdUI, \
 		(AFX_PMSG) \
 		(static_cast<void (AFX_MSG_CALL CCmdTarget::*)(CCmdUI*) > \
 		 (memberFxn)) },
diff --git a/engines/bagel/mfc/afxwin.h b/engines/bagel/mfc/afxwin.h
index 75516a1e736..4cb75691b6b 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/engines/bagel/mfc/afxwin.h
@@ -591,9 +591,9 @@ public:
 	~CFont() override {}
 
 	BOOL CreateFont(int nHeight, int nWidth, int nEscapement,
-	    int nOrientation, int nWeight, BYTE bItalic, BYTE bUnderline,
-	    BYTE cStrikeOut, BYTE nCharSet, BYTE nOutPrecision,
-	    BYTE nClipPrecision, BYTE nQuality, BYTE nPitchAndFamily,
+	    int nOrientation, int nWeight, byte bItalic, byte bUnderline,
+	    byte cStrikeOut, byte nCharSet, byte nOutPrecision,
+	    byte nClipPrecision, byte nQuality, byte nPitchAndFamily,
 	    const char *lpszFacename);
 	BOOL CreateFontIndirect(const LOGFONT *lpLogFont);
 };
@@ -2037,9 +2037,9 @@ public:
 		return _fonts.removeFontResource(fontName);
 	}
 	HFONT createFont(int nHeight, int nWidth, int nEscapement,
-			int nOrientation, int nWeight, BYTE bItalic, BYTE bUnderline,
-			BYTE cStrikeOut, BYTE nCharSet, BYTE nOutPrecision,
-			BYTE nClipPrecision, BYTE nQuality, BYTE nPitchAndFamily,
+			int nOrientation, int nWeight, byte bItalic, byte bUnderline,
+			byte cStrikeOut, byte nCharSet, byte nOutPrecision,
+			byte nClipPrecision, byte nQuality, byte nPitchAndFamily,
 			const char *lpszFacename) {
 		return _fonts.createFont(nHeight, nWidth,
 			nEscapement, nOrientation, nWeight, bItalic,
diff --git a/engines/bagel/mfc/atltime.h b/engines/bagel/mfc/atltime.h
index 2b9f40116c1..a1ce2a98be4 100644
--- a/engines/bagel/mfc/atltime.h
+++ b/engines/bagel/mfc/atltime.h
@@ -85,8 +85,8 @@ public:
 	    int nSec,
 	    int nDST = -1);
 	CTime(
-	    WORD wDosDate,
-	    WORD wDosTime,
+	    uint16 wDosDate,
+	    uint16 wDosTime,
 	    int nDST = -1);
 	CTime(
 	    const SYSTEMTIME &st,
diff --git a/engines/bagel/mfc/dialog.cpp b/engines/bagel/mfc/dialog.cpp
index 146b4942e8b..b3d4c3be6ce 100644
--- a/engines/bagel/mfc/dialog.cpp
+++ b/engines/bagel/mfc/dialog.cpp
@@ -141,7 +141,7 @@ BOOL CDialog::CreateDlgIndirect(LPCDLGTEMPLATE lpDialogTemplate,
 #if 0
 	// If no font specified, set the system font.
 	CString strFace;
-	WORD wSize = 0;
+	uint16 wSize = 0;
 	BOOL bSetSysFont = !CDialogTemplate::GetFont(lpDialogTemplate, strFace,
 		wSize);
 	if (bSetSysFont) {
diff --git a/engines/bagel/mfc/font.cpp b/engines/bagel/mfc/font.cpp
index 262f073aa70..a4d9f6901ee 100644
--- a/engines/bagel/mfc/font.cpp
+++ b/engines/bagel/mfc/font.cpp
@@ -26,9 +26,9 @@ namespace Bagel {
 namespace MFC {
 
 BOOL CFont::CreateFont(int nHeight, int nWidth, int nEscapement,
-        int nOrientation, int nWeight, BYTE bItalic, BYTE bUnderline,
-        BYTE cStrikeOut, BYTE nCharSet, BYTE nOutPrecision,
-        BYTE nClipPrecision, BYTE nQuality, BYTE nPitchAndFamily,
+        int nOrientation, int nWeight, byte bItalic, byte bUnderline,
+        byte cStrikeOut, byte nCharSet, byte nOutPrecision,
+        byte nClipPrecision, byte nQuality, byte nPitchAndFamily,
         const char *lpszFacename) {
 	m_hObject = AfxGetApp()->createFont(nHeight, nWidth,
 		nEscapement, nOrientation, nWeight, bItalic,
diff --git a/engines/bagel/mfc/gfx/dialog_template.cpp b/engines/bagel/mfc/gfx/dialog_template.cpp
index 706e4e96229..46a7913e794 100644
--- a/engines/bagel/mfc/gfx/dialog_template.cpp
+++ b/engines/bagel/mfc/gfx/dialog_template.cpp
@@ -54,15 +54,15 @@ BOOL CDialogTemplate::HasFont() const {
 	return false;
 }
 
-BOOL CDialogTemplate::SetFont(const char *lpFaceName, WORD nFontSize) {
+BOOL CDialogTemplate::SetFont(const char *lpFaceName, uint16 nFontSize) {
 	return false;
 }
 
-BOOL CDialogTemplate::SetSystemFont(WORD nFontSize) {
+BOOL CDialogTemplate::SetSystemFont(uint16 nFontSize) {
 	return false;
 }
 
-BOOL CDialogTemplate::GetFont(CString &strFaceName, WORD &nFontSize) const {
+BOOL CDialogTemplate::GetFont(CString &strFaceName, uint16 &nFontSize) const {
 	return false;
 }
 
@@ -73,7 +73,7 @@ void CDialogTemplate::GetSizeInPixels(SIZE *pSize) const {
 }
 
 BOOL CDialogTemplate::GetFont(LPCDLGTEMPLATE pTemplate,
-		CString &strFaceName, WORD &nFontSize) {
+		CString &strFaceName, uint16 &nFontSize) {
 	return false;
 }
 
diff --git a/engines/bagel/mfc/gfx/dialog_template.h b/engines/bagel/mfc/gfx/dialog_template.h
index 8132f2213c6..0fcd36bbf3f 100644
--- a/engines/bagel/mfc/gfx/dialog_template.h
+++ b/engines/bagel/mfc/gfx/dialog_template.h
@@ -89,7 +89,7 @@ private:
 	Common::Array<Item> _items;
 
 private:
-	static BYTE *GetFontSizeField(LPCDLGTEMPLATE pTemplate);
+	static byte *GetFontSizeField(LPCDLGTEMPLATE pTemplate);
 	static UINT GetTemplateSize(LPCDLGTEMPLATE *pTemplate);
 	bool setTemplate(LPCDLGTEMPLATE pTemplate);
 
@@ -116,14 +116,14 @@ public:
 	void loadTemplate(CDialog *dialog);
 
 	BOOL HasFont() const;
-	BOOL SetFont(const char *lpFaceName, WORD nFontSize);
-	BOOL SetSystemFont(WORD nFontSize = 0);
-	BOOL GetFont(CString &strFaceName, WORD &nFontSize) const;
+	BOOL SetFont(const char *lpFaceName, uint16 nFontSize);
+	BOOL SetSystemFont(uint16 nFontSize = 0);
+	BOOL GetFont(CString &strFaceName, uint16 &nFontSize) const;
 	void GetSizeInDialogUnits(SIZE *pSize) const;
 	void GetSizeInPixels(SIZE *pSize) const;
 
 	static BOOL GetFont(LPCDLGTEMPLATE pTemplate,
-		CString &strFaceName, WORD &nFontSize);
+		CString &strFaceName, uint16 &nFontSize);
 };
 
 } // namespace Gfx
diff --git a/engines/bagel/mfc/minwindef.h b/engines/bagel/mfc/minwindef.h
index 58642560d7a..47f29304e27 100644
--- a/engines/bagel/mfc/minwindef.h
+++ b/engines/bagel/mfc/minwindef.h
@@ -120,12 +120,12 @@ typedef INT_PTR(CALLBACK *DLGPROC)(HWND, UINT, WPARAM, LPARAM);
 	#define min(a,b)            (((a) < (b)) ? (a) : (b))
 #endif
 
-#define MAKEWORD(a, b)      ((WORD)(((BYTE)(((DWORD_PTR)(a)) & 0xff)) | ((WORD)((BYTE)(((DWORD_PTR)(b)) & 0xff))) << 8))
-#define MAKELONG(a, b)      ((long)(((WORD)(((DWORD_PTR)(a)) & 0xffff)) | ((uint32)((WORD)(((DWORD_PTR)(b)) & 0xffff))) << 16))
-#define LOWORD(l)           ((WORD)(((DWORD_PTR)(l)) & 0xffff))
+#define MAKEWORD(a, b)      ((uint16)(((byte)(((DWORD_PTR)(a)) & 0xff)) | ((uint16)((byte)(((DWORD_PTR)(b)) & 0xff))) << 8))
+#define MAKELONG(a, b)      ((long)(((uint16)(((DWORD_PTR)(a)) & 0xffff)) | ((uint32)((uint16)(((DWORD_PTR)(b)) & 0xffff))) << 16))
+#define LOWORD(l)           ((uint16)(((DWORD_PTR)(l)) & 0xffff))
 #define HIWORD(l)           ((((DWORD_PTR)(l)) >> 16))
-#define LOBYTE(w)           ((BYTE)(((DWORD_PTR)(w)) & 0xff))
-#define HIBYTE(w)           ((BYTE)((((DWORD_PTR)(w)) >> 8) & 0xff))
+#define LOBYTE(w)           ((byte)(((DWORD_PTR)(w)) & 0xff))
+#define HIBYTE(w)           ((byte)((((DWORD_PTR)(w)) >> 8) & 0xff))
 
 #define POINTTOPOINTS(pt)      (MAKELONG((short)((pt).x), (short)((pt).y)))
 #define MAKEWPARAM(l, h)      ((WPARAM)(uint32)MAKELONG(l, h))
@@ -142,7 +142,7 @@ typedef HANDLE LOCALHANDLE;
 
 #define DECLARE_HANDLE(name) struct name##__{int unused;}; typedef struct name##__ *name
 
-typedef WORD                ATOM;   //BUGBUG - might want to remove this from minwin
+typedef uint16                ATOM;   //BUGBUG - might want to remove this from minwin
 
 DECLARE_HANDLE(HKEY);
 typedef HKEY *PHKEY;
@@ -235,14 +235,14 @@ typedef struct _FILETIME {
 } FILETIME, *PFILETIME, *LPFILETIME;
 
 typedef struct _SYSTEMTIME {
-	WORD wYear;
-	WORD wMonth;
-	WORD wDayOfWeek;
-	WORD wDay;
-	WORD wHour;
-	WORD wMinute;
-	WORD wSecond;
-	WORD wMilliseconds;
+	uint16 wYear;
+	uint16 wMonth;
+	uint16 wDayOfWeek;
+	uint16 wDay;
+	uint16 wHour;
+	uint16 wMinute;
+	uint16 wSecond;
+	uint16 wMilliseconds;
 } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
 
 typedef struct tagPAINTSTRUCT {
@@ -251,7 +251,7 @@ typedef struct tagPAINTSTRUCT {
 	RECT        rcPaint;
 	BOOL        fRestore;
 	BOOL        fIncUpdate;
-	BYTE        rgbReserved[32];
+	byte        rgbReserved[32];
 } PAINTSTRUCT, *PPAINTSTRUCT, *NPPAINTSTRUCT, *LPPAINTSTRUCT;
 
 /*
diff --git a/engines/bagel/mfc/wingdi.cpp b/engines/bagel/mfc/wingdi.cpp
index a9efc6af34a..f37929f0a8c 100644
--- a/engines/bagel/mfc/wingdi.cpp
+++ b/engines/bagel/mfc/wingdi.cpp
@@ -389,16 +389,16 @@ BOOL LineDDA(int x0, int y0, int x1, int y1, LINEDDAPROC lpProc, CDC *cdc) {
 	return TRUE;
 }
 
-BYTE GetRValue(COLORREF color) {
-	return  ((BYTE)(color & 0xFF));
+byte GetRValue(COLORREF color) {
+	return  ((byte)(color & 0xFF));
 }
 
-BYTE GetGValue(COLORREF color) {
-	return ((BYTE)((color >> 8) & 0xFF));
+byte GetGValue(COLORREF color) {
+	return ((byte)((color >> 8) & 0xFF));
 }
 
-BYTE GetBValue(COLORREF color) {
-	return ((BYTE)((color >> 16) & 0xFF));
+byte GetBValue(COLORREF color) {
+	return ((byte)((color >> 16) & 0xFF));
 }
 
 HWND GetDlgItem(HWND hDlg, int nIDDlgItem) {
diff --git a/engines/bagel/mfc/wingdi.h b/engines/bagel/mfc/wingdi.h
index 1beb9e530a9..b9d65a4601b 100644
--- a/engines/bagel/mfc/wingdi.h
+++ b/engines/bagel/mfc/wingdi.h
@@ -29,7 +29,7 @@ namespace MFC {
 
 class CDC;
 
-#define PALETTEINDEX(i)     ((COLORREF)(0x01000000 | (uint32)(WORD)(i)))
+#define PALETTEINDEX(i)     ((COLORREF)(0x01000000 | (uint32)(uint16)(i)))
 
 /*
  * Class styles
@@ -264,7 +264,7 @@ enum FontWeight {
 /*
  * Standard Cursor IDs
  */
-#define MAKEINTRESOURCE(i) ((char *)((ULONG_PTR)((WORD)(i))))
+#define MAKEINTRESOURCE(i) ((char *)((ULONG_PTR)((uint16)(i))))
 #define IDC_NONE            0
 
 #define IDC_ARROW           MAKEINTRESOURCE(32512)
@@ -629,8 +629,8 @@ typedef struct tagBITMAPINFOHEADER {
 	uint32      biSize;
 	long       biWidth;
 	long       biHeight;
-	WORD       biPlanes;
-	WORD       biBitCount;
+	uint16       biPlanes;
+	uint16       biBitCount;
 	uint32      biCompression;
 	uint32      biSizeImage;
 	long       biXPelsPerMeter;
@@ -641,10 +641,10 @@ typedef struct tagBITMAPINFOHEADER {
 *PBITMAPINFOHEADER;
 
 typedef struct tagRGBQUAD {
-	BYTE    rgbBlue;
-	BYTE    rgbGreen;
-	BYTE    rgbRed;
-	BYTE    rgbReserved;
+	byte    rgbBlue;
+	byte    rgbGreen;
+	byte    rgbRed;
+	byte    rgbReserved;
 } RGBQUAD;
 
 typedef struct tagBITMAPINFO {
@@ -658,23 +658,23 @@ typedef struct tagBITMAP {
 	long        bmWidth;
 	long        bmHeight;
 	long        bmWidthBytes;
-	WORD        bmPlanes;
-	WORD        bmBitsPixel;
+	uint16        bmPlanes;
+	uint16        bmBitsPixel;
 	void *     bmBits;
 } BITMAP, *PBITMAP, NEAR *NPBITMAP, FAR *LPBITMAP;
 
 typedef struct tagBITMAPCOREHEADER {
 	uint32   bcSize;                 /* used to get to color table */
-	WORD    bcWidth;
-	WORD    bcHeight;
-	WORD    bcPlanes;
-	WORD    bcBitCount;
+	uint16    bcWidth;
+	uint16    bcHeight;
+	uint16    bcPlanes;
+	uint16    bcBitCount;
 } BITMAPCOREHEADER, FAR *LPBITMAPCOREHEADER, *PBITMAPCOREHEADER;
 
 typedef struct tagRGBTRIPLE {
-	BYTE    rgbtBlue;
-	BYTE    rgbtGreen;
-	BYTE    rgbtRed;
+	byte    rgbtBlue;
+	byte    rgbtGreen;
+	byte    rgbtRed;
 } RGBTRIPLE, *PRGBTRIPLE, NEAR *NPRGBTRIPLE, FAR *LPRGBTRIPLE;
 
 typedef struct tagBITMAPCOREINFO {
@@ -683,15 +683,15 @@ typedef struct tagBITMAPCOREINFO {
 } BITMAPCOREINFO, FAR *LPBITMAPCOREINFO, *PBITMAPCOREINFO;
 
 typedef struct tagPALETTEENTRY {
-	BYTE        peRed;
-	BYTE        peGreen;
-	BYTE        peBlue;
-	BYTE        peFlags;
+	byte        peRed;
+	byte        peGreen;
+	byte        peBlue;
+	byte        peFlags;
 } PALETTEENTRY, *PPALETTEENTRY, FAR *LPPALETTEENTRY;
 
 typedef struct tagLOGPALETTE {
-	WORD         palVersion;
-	WORD         palNumEntries;
+	uint16         palVersion;
+	uint16         palNumEntries;
 	PALETTEENTRY palPalEntry[1];
 } LOGPALETTE, *PLOGPALETTE, NEAR *NPLOGPALETTE, FAR *LPLOGPALETTE;
 
@@ -790,9 +790,9 @@ typedef void (CALLBACK *LINEDDAPROC)(int x, int y, CDC *cdc);
 extern BOOL LineDDA(int x0, int y0, int x1, int y1,
 	LINEDDAPROC lpProc, CDC *cdc);
 
-extern BYTE GetRValue(COLORREF color);
-extern BYTE GetGValue(COLORREF color);
-extern BYTE GetBValue(COLORREF color);
+extern byte GetRValue(COLORREF color);
+extern byte GetGValue(COLORREF color);
+extern byte GetBValue(COLORREF color);
 
 extern HWND GetDlgItem(HWND hDlg, int nIDDlgItem);
 extern BOOL EndDialog(HWND hDlg, INT_PTR nResult);
diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index 7ae79f8ceda..94b57a6021f 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -26,18 +26,13 @@ namespace Bagel {
 namespace MFC {
 
 typedef int BOOL;
-typedef byte BYTE;
-typedef byte UBYTE;
 typedef uint16 TCHAR;
 typedef uint16 SHORT;
-typedef uint16 WORD;
-typedef uint16 USHORT;
 typedef unsigned long ULONG;
 typedef int64 LONGLONG;
 typedef uint64 ULONGLONG;
-typedef WORD *PWORD;
-typedef WORD *LPWORD;
-typedef long *LPLONG;
+typedef uint16 *PWORD;
+typedef uint16 *LPWORD;
 typedef uint32 *PDWORD;
 typedef uint32 *LPDWORD;
 
@@ -58,7 +53,7 @@ typedef uintptr DWORD_PTR;
 typedef uint32 COLORREF;
 typedef void *POSITION;
 
-#define RGB_COL(r,g,b)          ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((uint32)(BYTE)(b))<<16)))
+#define RGB_COL(r,g,b)          ((COLORREF)(((byte)(r)|((uint16)((byte)(g))<<8))|(((uint32)(byte)(b))<<16)))
 #define PALETTERGB(r,g,b)   (0x02000000 | RGB_COL(r,g,b))
 #define RGB(r,g,b) PALETTERGB(r,g,b)
 #define IS_RGB(VAL) ((VAL & 0x02000000) != 0)
@@ -90,7 +85,7 @@ typedef long HRESULT;
 typedef char CCHAR;
 typedef uint32 LCID;
 typedef PDWORD PLCID;
-typedef WORD   LANGID;
+typedef uint16   LANGID;
 
 typedef uint32 (*APPLICATION_RECOVERY_CALLBACK)(void *pvParameter);
 
@@ -634,7 +629,7 @@ typedef uint32 (*APPLICATION_RECOVERY_CALLBACK)(void *pvParameter);
  /*
   * Predefined Resource Types
   */
-#define MAKEINTRESOURCE(i) ((char *)((ULONG_PTR)((WORD)(i))))
+#define MAKEINTRESOURCE(i) ((char *)((ULONG_PTR)((uint16)(i))))
 #define RT_CURSOR           MAKEINTRESOURCE(1)
 #define RT_BITMAP           MAKEINTRESOURCE(2)
 #define RT_ICON             MAKEINTRESOURCE(3)
@@ -700,15 +695,15 @@ typedef struct tagTEXTMETRICA {
 	long        tmOverhang = 0;
 	long        tmDigitizedAspectX = 0;
 	long        tmDigitizedAspectY = 0;
-	BYTE        tmFirstChar = 0;
-	BYTE        tmLastChar = 0;
-	BYTE        tmDefaultChar = 0;
-	BYTE        tmBreakChar = 0;
-	BYTE        tmItalic = 0;
-	BYTE        tmUnderlined = 0;
-	BYTE        tmStruckOut = 0;
-	BYTE        tmPitchAndFamily = 0;
-	BYTE        tmCharSet = 0;
+	byte        tmFirstChar = 0;
+	byte        tmLastChar = 0;
+	byte        tmDefaultChar = 0;
+	byte        tmBreakChar = 0;
+	byte        tmItalic = 0;
+	byte        tmUnderlined = 0;
+	byte        tmStruckOut = 0;
+	byte        tmPitchAndFamily = 0;
+	byte        tmCharSet = 0;
 } TEXTMETRIC, *PTEXTMETRIC, *LPTEXTMETRIC;
 
 typedef struct tagGCP_RESULTS {
diff --git a/engines/bagel/spacebar/sraf_computer.cpp b/engines/bagel/spacebar/sraf_computer.cpp
index 98751c2f0dd..6e7df435131 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -2355,7 +2355,7 @@ void SrafComputer::activateCodeWords() {
 	sStr = " ";
 	_pLBox->addToTail(sStr, false);
 
-	sStr = "CODE WORD PAIR: (,)";
+	sStr = "CODE uint16 PAIR: (,)";
 	_pLBox->addToTail(sStr, false);
 
 	// Show list box
@@ -3577,7 +3577,7 @@ void SrafComputer::onListCodeWords() {
 			*_pszGroup2Word = pszWord;
 		}
 
-		sStr = "CODE WORD PAIR: (";
+		sStr = "CODE uint16 PAIR: (";
 		if (_pszGroup1Word) {
 			sStr += *_pszGroup1Word;
 		}


Commit: 89ee4b14b911863b3767bb97560f4a389c6e1fe6
    https://github.com/scummvm/scummvm/commit/89ee4b14b911863b3767bb97560f4a389c6e1fe6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T02:29:25+03:00

Commit Message:
BAGEL: Switch more variable types to the ScummVM ones

Changed paths:
    engines/bagel/boflib/misc.cpp
    engines/bagel/boflib/misc.h
    engines/bagel/hodjnpodj/archeroids/main.cpp
    engines/bagel/hodjnpodj/archeroids/main.h
    engines/bagel/hodjnpodj/archeroids/usercfg.cpp
    engines/bagel/hodjnpodj/archeroids/usercfg.h
    engines/bagel/hodjnpodj/artparts/artparts.cpp
    engines/bagel/hodjnpodj/artparts/artparts.h
    engines/bagel/hodjnpodj/artparts/optndlg.cpp
    engines/bagel/hodjnpodj/artparts/optndlg.h
    engines/bagel/hodjnpodj/barbershop/main.cpp
    engines/bagel/hodjnpodj/barbershop/main.h
    engines/bagel/hodjnpodj/barbershop/usercfg.cpp
    engines/bagel/hodjnpodj/barbershop/usercfg.h
    engines/bagel/hodjnpodj/battlefish/bfish.cpp
    engines/bagel/hodjnpodj/battlefish/bfish.h
    engines/bagel/hodjnpodj/battlefish/usercfg.cpp
    engines/bagel/hodjnpodj/battlefish/usercfg.h
    engines/bagel/hodjnpodj/beacon/beacon.cpp
    engines/bagel/hodjnpodj/beacon/beacon.h
    engines/bagel/hodjnpodj/beacon/optndlg.cpp
    engines/bagel/hodjnpodj/beacon/optndlg.h
    engines/bagel/hodjnpodj/crypt/crypt.cpp
    engines/bagel/hodjnpodj/crypt/crypt.h
    engines/bagel/hodjnpodj/crypt/main.cpp
    engines/bagel/hodjnpodj/crypt/main.h
    engines/bagel/hodjnpodj/crypt/optn.cpp
    engines/bagel/hodjnpodj/crypt/optn.h
    engines/bagel/hodjnpodj/dfa/dfa.cpp
    engines/bagel/hodjnpodj/dfa/dfa.h
    engines/bagel/hodjnpodj/dfa/dialogs.h
    engines/bagel/hodjnpodj/dfa/msgdlg.cpp
    engines/bagel/hodjnpodj/dfa/optdlg.cpp
    engines/bagel/hodjnpodj/fuge/fuge.cpp
    engines/bagel/hodjnpodj/fuge/fuge.h
    engines/bagel/hodjnpodj/fuge/usercfg.cpp
    engines/bagel/hodjnpodj/fuge/usercfg.h
    engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
    engines/bagel/hodjnpodj/garfunkle/garfunkle.h
    engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
    engines/bagel/hodjnpodj/garfunkle/optndlg.h
    engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
    engines/bagel/hodjnpodj/hnplibs/audiocfg.h
    engines/bagel/hodjnpodj/hnplibs/button.cpp
    engines/bagel/hodjnpodj/hnplibs/button.h
    engines/bagel/hodjnpodj/hnplibs/cbofdlg.cpp
    engines/bagel/hodjnpodj/hnplibs/cbofdlg.h
    engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp
    engines/bagel/hodjnpodj/hnplibs/mainmenu.h
    engines/bagel/hodjnpodj/hnplibs/rules.cpp
    engines/bagel/hodjnpodj/hnplibs/rules.h
    engines/bagel/hodjnpodj/hnplibs/stdinc.h
    engines/bagel/hodjnpodj/life/game.cpp
    engines/bagel/hodjnpodj/life/game.h
    engines/bagel/hodjnpodj/life/life.cpp
    engines/bagel/hodjnpodj/life/life.h
    engines/bagel/hodjnpodj/life/usercfg.cpp
    engines/bagel/hodjnpodj/life/usercfg.h
    engines/bagel/hodjnpodj/mankala/btimeut.cpp
    engines/bagel/hodjnpodj/mankala/btimeut.h
    engines/bagel/hodjnpodj/mankala/mnk.cpp
    engines/bagel/hodjnpodj/mankala/mnk.h
    engines/bagel/hodjnpodj/mankala/mnkopt.cpp
    engines/bagel/hodjnpodj/mankala/mnkopt.h
    engines/bagel/hodjnpodj/mazedoom/mod.cpp
    engines/bagel/hodjnpodj/mazedoom/mod.h
    engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
    engines/bagel/hodjnpodj/mazedoom/optndlg.h
    engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
    engines/bagel/hodjnpodj/metagame/bgen/backpack.h
    engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
    engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bgb.h
    engines/bagel/hodjnpodj/metagame/bgen/bgen.h
    engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
    engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
    engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
    engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
    engines/bagel/hodjnpodj/metagame/bgen/notebook.h
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
    engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
    engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
    engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtl.h
    engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
    engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
    engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
    engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
    engines/bagel/hodjnpodj/metagame/gtl/pawn.h
    engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
    engines/bagel/hodjnpodj/metagame/gtl/rules.h
    engines/bagel/hodjnpodj/metagame/gtl/store.cpp
    engines/bagel/hodjnpodj/metagame/gtl/store.h
    engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
    engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
    engines/bagel/hodjnpodj/metagame/zoom/zoommap.h
    engines/bagel/hodjnpodj/novacancy/main.cpp
    engines/bagel/hodjnpodj/novacancy/main.h
    engines/bagel/hodjnpodj/packrat/dialogs.h
    engines/bagel/hodjnpodj/packrat/msgdlg.cpp
    engines/bagel/hodjnpodj/packrat/optdlg.cpp
    engines/bagel/hodjnpodj/packrat/packrat.cpp
    engines/bagel/hodjnpodj/packrat/packrat.h
    engines/bagel/hodjnpodj/pdq/game.cpp
    engines/bagel/hodjnpodj/pdq/game.h
    engines/bagel/hodjnpodj/pdq/guess.cpp
    engines/bagel/hodjnpodj/pdq/guess.h
    engines/bagel/hodjnpodj/pdq/main.cpp
    engines/bagel/hodjnpodj/pdq/main.h
    engines/bagel/hodjnpodj/pdq/usercfg.cpp
    engines/bagel/hodjnpodj/pdq/usercfg.h
    engines/bagel/hodjnpodj/peggle/game.cpp
    engines/bagel/hodjnpodj/peggle/game.h
    engines/bagel/hodjnpodj/peggle/options.cpp
    engines/bagel/hodjnpodj/peggle/options.h
    engines/bagel/hodjnpodj/peggle/optsub.cpp
    engines/bagel/hodjnpodj/poker/amtdlg.cpp
    engines/bagel/hodjnpodj/poker/dialogs.h
    engines/bagel/hodjnpodj/poker/optdlg.cpp
    engines/bagel/hodjnpodj/poker/options.h
    engines/bagel/hodjnpodj/poker/poffsdlg.cpp
    engines/bagel/hodjnpodj/poker/poker.cpp
    engines/bagel/hodjnpodj/poker/poker.h
    engines/bagel/hodjnpodj/poker/uwondlg.cpp
    engines/bagel/hodjnpodj/riddles/riddles.cpp
    engines/bagel/hodjnpodj/riddles/riddles.h
    engines/bagel/hodjnpodj/riddles/usercfg.cpp
    engines/bagel/hodjnpodj/riddles/usercfg.h
    engines/bagel/hodjnpodj/wordsearch/dialogs.h
    engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
    engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
    engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
    engines/bagel/hodjnpodj/wordsearch/wordsearch.h
    engines/bagel/mfc/afx.h
    engines/bagel/mfc/afxmsg.h
    engines/bagel/mfc/afxstr.h
    engines/bagel/mfc/afxwin.h
    engines/bagel/mfc/atltime.h
    engines/bagel/mfc/bitmap.cpp
    engines/bagel/mfc/button.cpp
    engines/bagel/mfc/cmd_target.cpp
    engines/bagel/mfc/dc.cpp
    engines/bagel/mfc/dialog.cpp
    engines/bagel/mfc/doc_template.cpp
    engines/bagel/mfc/document.cpp
    engines/bagel/mfc/edit.cpp
    engines/bagel/mfc/file.cpp
    engines/bagel/mfc/frame_wnd.cpp
    engines/bagel/mfc/gfx/dialog_template.h
    engines/bagel/mfc/gfx/text_render.cpp
    engines/bagel/mfc/gfx/text_render.h
    engines/bagel/mfc/global_functions.cpp
    engines/bagel/mfc/global_functions.h
    engines/bagel/mfc/joystickapi.cpp
    engines/bagel/mfc/joystickapi.h
    engines/bagel/mfc/libs/event_loop.cpp
    engines/bagel/mfc/libs/event_loop.h
    engines/bagel/mfc/libs/events.cpp
    engines/bagel/mfc/libs/events.h
    engines/bagel/mfc/menu.cpp
    engines/bagel/mfc/minwindef.h
    engines/bagel/mfc/palette.cpp
    engines/bagel/mfc/scrollbar.cpp
    engines/bagel/mfc/string.cpp
    engines/bagel/mfc/win_app.cpp
    engines/bagel/mfc/wingdi.cpp
    engines/bagel/mfc/wingdi.h
    engines/bagel/mfc/winnt.h
    engines/bagel/mfc/wnd.cpp


diff --git a/engines/bagel/boflib/misc.cpp b/engines/bagel/boflib/misc.cpp
index 839e95439c7..8350e0ba3e0 100644
--- a/engines/bagel/boflib/misc.cpp
+++ b/engines/bagel/boflib/misc.cpp
@@ -221,7 +221,7 @@ int StrFreqMatch(const char *mask, const char *test) {
 }
 
 
-BOOL StrCompare(const char *pszStr1, const char *pszStr2, UINT nSize) {
+BOOL StrCompare(const char *pszStr1, const char *pszStr2, unsigned int nSize) {
 	char *s1, *p, string1[256];   /* replace this stack hog with malloc */
 	char *s2, *sp, string2[256];       /* replace this stack hog with malloc */
 	int i, n, inc;
diff --git a/engines/bagel/boflib/misc.h b/engines/bagel/boflib/misc.h
index cc1aa5b38d6..b265316d000 100644
--- a/engines/bagel/boflib/misc.h
+++ b/engines/bagel/boflib/misc.h
@@ -111,7 +111,7 @@ extern bool ProbableTrue(int nProbability);
 extern void ErrorLog(const char *logFile, const char *format, ...);
 
 extern int          StrFreqMatch(const char *, const char *);
-extern BOOL         StrCompare(const char *, const char *, UINT);
+extern BOOL         StrCompare(const char *, const char *, unsigned int);
 extern int          StrCharCount(const char *, char);
 extern char *StriStr(char *, const char *);
 extern void         StrUprStr(char *, const char *);
diff --git a/engines/bagel/hodjnpodj/archeroids/main.cpp b/engines/bagel/hodjnpodj/archeroids/main.cpp
index dbd03662e18..5735620cd17 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/main.cpp
@@ -411,7 +411,7 @@ CMainWindow::CMainWindow() {
 		BeginWaitCursor();
 
 		// Seed the random number generator
-		//srand((UINT)time(nullptr));
+		//srand((unsigned int)time(nullptr));
 
 		errCode = LoadMasterSprites();
 
@@ -1962,7 +1962,7 @@ void CMainWindow::LoadIniSettings() {
 }
 
 
-void CMainWindow::OnTimer(UINT_PTR nEventID) {
+void CMainWindow::OnTimer(uintptr nEventID) {
 	KillTimer(nEventID);
 
 	while (m_bTimerActive) {
@@ -1983,7 +1983,7 @@ BOOL CMainWindow::MainLoop() {
 	CDC *pDC;
 	CRect tmpRect, newRect;
 	CSize size;
-	ULONG t1;
+	unsigned long t1;
 
 	// new game state is over.  We are now playing the game
 	//
@@ -2937,7 +2937,7 @@ void CMainWindow::DeleteSprite(CSprite *pSprite) {
 
 
 
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CRect   cTestRect;
 
 	cTestRect = m_pScrollSprite->GetRect();
@@ -2968,7 +2968,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 	CFrameWnd::OnLButtonDown(nFlags, point);
 }
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -2984,7 +2984,7 @@ void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// Shoot an arrow
@@ -3034,7 +3034,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	}
 }
 
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_Q
 	//
 	if ((nChar == 'q') && (nFlags & 0x2000)) {
@@ -3165,7 +3165,7 @@ void CMainWindow::OnClose() {
 }
 
 
-long CMainWindow::OnJoyStick(UINT wParam, long lParam) {
+long CMainWindow::OnJoyStick(unsigned int wParam, long lParam) {
 	long nThreshold;
 
 	if (m_bGameActive) {
@@ -3175,7 +3175,7 @@ long CMainWindow::OnJoyStick(UINT wParam, long lParam) {
 		}
 
 		nThreshold = m_nJoyLast;
-		nThreshold -= (UINT)HIWORD(lParam);
+		nThreshold -= (unsigned int)HIWORD(lParam);
 
 		if (nThreshold > 5000) {
 			MoveHodj(-GOODGUYMOVE_Y);
@@ -3211,13 +3211,13 @@ void CMainWindow::GameResume(void) {
 		SetCursor(nullptr);
 };
 
-void CMainWindow::OnActivate(UINT nState, CWnd *, BOOL) {
+void CMainWindow::OnActivate(unsigned int nState, CWnd *, BOOL) {
 	if (nState == WA_ACTIVE || nState == WA_CLICKACTIVE)
 		SetFocus();
 }
 
 
-void CMainWindow::OnRButtonUp(UINT, CPoint) {
+void CMainWindow::OnRButtonUp(unsigned int, CPoint) {
 	//
 	// Toggle Good Guy Move Mode
 	//
@@ -3242,7 +3242,7 @@ void CMainWindow::OnRButtonUp(UINT, CPoint) {
 	}
 }
 
-void CMainWindow::OnMouseMove(UINT, CPoint point) {
+void CMainWindow::OnMouseMove(unsigned int, CPoint point) {
 	//
 	// If the Right mouse button is down when we move the mouse, then
 	// the user is moving the good guy, otherwise it is a normal mouse move.
diff --git a/engines/bagel/hodjnpodj/archeroids/main.h b/engines/bagel/hodjnpodj/archeroids/main.h
index 62106094114..2226968a268 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.h
+++ b/engines/bagel/hodjnpodj/archeroids/main.h
@@ -83,16 +83,16 @@ protected:
 
 	virtual BOOL OnCommand(WPARAM, LPARAM) override;
 	void OnPaint(void);
-	void OnSysKeyDown(UINT, UINT, UINT);
-	void OnKeyDown(UINT, UINT, UINT);
-	void OnSysChar(UINT, UINT, UINT);
-	void OnTimer(UINT_PTR);
+	void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
+	void OnKeyDown(unsigned int, unsigned int, unsigned int);
+	void OnSysChar(unsigned int, unsigned int, unsigned int);
+	void OnTimer(uintptr);
 	void OnClose(void);
-	long OnJoyStick(UINT, long);
-	void OnActivate(UINT, CWnd *, BOOL) override;
-	void OnLButtonDown(UINT, CPoint);
-	void OnRButtonUp(UINT, CPoint);
-	void OnMouseMove(UINT, CPoint);
+	long OnJoyStick(unsigned int, long);
+	void OnActivate(unsigned int, CWnd *, BOOL) override;
+	void OnLButtonDown(unsigned int, CPoint);
+	void OnRButtonUp(unsigned int, CPoint);
+	void OnMouseMove(unsigned int, CPoint);
 	LRESULT OnMCINotify(WPARAM, LPARAM);
 	LRESULT OnMMIONotify(WPARAM, LPARAM);
 
@@ -135,19 +135,19 @@ protected:
 	HANDLE       m_hExtraLifeRes;
 
 	POINT        m_ptAnchor;
-	ULONG        m_lScore;
-	ULONG        m_lNewLifeScore;
+	unsigned long        m_lScore;
+	unsigned long        m_lNewLifeScore;
 	int          m_nGoodArrows, m_nBadArrows;
 	int          m_nGameSpeed;
-	UINT         m_nBadGuySpeed;
-	UINT         m_nArrowSpeed;
-	UINT         m_nState;
+	unsigned int         m_nBadGuySpeed;
+	unsigned int         m_nArrowSpeed;
+	unsigned int         m_nState;
 	int          m_nMoveArrows;
 	int          m_nBadGuys;
 	int          m_nLives;
 	int          m_nLevel;
 	int          m_nWave;
-	UINT         m_nJoyLast;
+	unsigned int         m_nJoyLast;
 	BOOL         m_bPause;
 	BOOL         m_bGameActive;
 	BOOL         m_bJoyActive;
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
index f151a1e8764..196bcd30382 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
@@ -60,7 +60,7 @@ static  CColorButton *pOKButton = nullptr;                     // OKAY button on
 static  CColorButton *pCancelButton = nullptr;                 // Cancel button on scroll
 static  CColorButton *pDefaultsButton = nullptr;               // Defaults button on scroll
 
-CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	: CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	m_nInitGameSpeed = DEFAULT_GAME_SPEED;
 	m_nInitArcherLevel = DEFAULT_ARCHER_LEVEL;
@@ -134,7 +134,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *pScroll) {
 	char szBuf[40];
 	CDC *pDC;
 
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.h b/engines/bagel/hodjnpodj/archeroids/usercfg.h
index 22f711db557..6b719a66174 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.h
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.h
@@ -51,7 +51,7 @@ namespace Archeroids {
 class CUserCfgDlg : public CBmpDialog {
 public:
 
-	CUserCfgDlg(CWnd *, CPalette *, UINT);
+	CUserCfgDlg(CWnd *, CPalette *, unsigned int);
 
 protected:
 
@@ -61,7 +61,7 @@ protected:
 	void ClearDialogImage(void);
 
 	void OnDestroy();
-	void OnHScroll(UINT, UINT, CScrollBar *);
+	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnPaint();
 	DECLARE_MESSAGE_MAP()
 
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.cpp b/engines/bagel/hodjnpodj/artparts/artparts.cpp
index f67744bc460..997c2611ac7 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.cpp
+++ b/engines/bagel/hodjnpodj/artparts/artparts.cpp
@@ -549,7 +549,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -565,7 +565,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CRect   rectTitle;
 	CSound  *pEffect = nullptr;
 
@@ -657,7 +657,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -673,7 +673,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	if (bGameStarted)
 		if (m_bNewGame && !m_bShowOutOfPlace) {
 			CDC     *pDC;
@@ -726,7 +726,7 @@ void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -742,7 +742,7 @@ void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	SetCursor(LoadCursor(nullptr, IDC_ARROW));           // Refresh cursor object
 
 	if (bGameStarted && (m_bNewGame && !m_bShowOutOfPlace)) {
@@ -871,7 +871,7 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -887,7 +887,7 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	if (bGameStarted) {
 		if (InArtRegion(point) && (m_bNewGame && !m_bShowOutOfPlace)) {
 			CDC     *pDC;
@@ -930,7 +930,7 @@ void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -946,7 +946,7 @@ void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnMButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnMButtonDown(unsigned int nFlags, CPoint point) {
 	if (bGameStarted)
 		if (!m_bShowOutOfPlace && (pGameInfo->bPlayingMetagame == FALSE)) {          // Not available in meta-game
 			m_bShowOutOfPlace = TRUE;
@@ -959,17 +959,17 @@ void CMainWindow::OnMButtonDown(UINT nFlags, CPoint point) {
 // These functions are called when keyboard input generates a character.
 //
 
-void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CFrameWnd ::OnChar(nChar, nRepCnt, nFlags);     // default action
 }
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if ((nChar == VK_F4) && (nFlags & 0x2000)) {
 		PostMessage(WM_CLOSE, 0, 0);                 // *** remove later ***
 	} else
 		CFrameWnd::OnSysKeyDown(nChar, nRepCnt, nFlags);    // default action
 }
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 	case VK_F1:                                             // F1 key is hit
 		SendMessage(WM_COMMAND, IDC_RULES, BN_CLICKED);  // Activate the Rules dialog
@@ -1002,7 +1002,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nIDEvent   The ID of the timer event activated
+ *      unsigned int nIDEvent   The ID of the timer event activated
  *
  *  IMPLICIT INPUT PARAMETERS:
  *
@@ -1017,7 +1017,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnTimer(UINT_PTR nIDEvent) {
+void CMainWindow::OnTimer(uintptr nIDEvent) {
 	CDC     *pDC;
 	CSound  *pEffect = nullptr;
 	char    msg[64];
@@ -1258,7 +1258,7 @@ BOOL CMainWindow::CopyPaletteContents(CPalette *pSource, CPalette *pDest) {
     ASSERT(pSource && pDest);
 
 	// Get the number of entries in the source palette
-	UINT nEntries = pSource->GetEntryCount();
+	unsigned int nEntries = pSource->GetEntryCount();
 	if (nEntries == 0)
 		return FALSE;
 
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.h b/engines/bagel/hodjnpodj/artparts/artparts.h
index df20819be7a..494e34c1976 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.h
+++ b/engines/bagel/hodjnpodj/artparts/artparts.h
@@ -185,15 +185,15 @@ protected:
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnMButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnTimer(uintptr nIDEvent);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnRButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonUp(unsigned int nFlags, CPoint point);
+	afx_msg void OnMButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
 	afx_msg void OnClose();
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/artparts/optndlg.cpp b/engines/bagel/hodjnpodj/artparts/optndlg.cpp
index e89444caf85..dcecbfaa344 100644
--- a/engines/bagel/hodjnpodj/artparts/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/artparts/optndlg.cpp
@@ -193,7 +193,7 @@ void COptnDlg::OnDestroy(void) {
 }
 
 
-void COptnDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void COptnDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	int pMin,
 	    pMax;
 	int OldPos = pScrollBar->GetScrollPos();
diff --git a/engines/bagel/hodjnpodj/artparts/optndlg.h b/engines/bagel/hodjnpodj/artparts/optndlg.h
index 51bfe1eb51f..92306b67488 100644
--- a/engines/bagel/hodjnpodj/artparts/optndlg.h
+++ b/engines/bagel/hodjnpodj/artparts/optndlg.h
@@ -70,7 +70,7 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(COptnDlg)
 	virtual BOOL OnInitDialog() override;
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
 	virtual void OnOK() override;
diff --git a/engines/bagel/hodjnpodj/barbershop/main.cpp b/engines/bagel/hodjnpodj/barbershop/main.cpp
index e570d2bcf71..3c3617f0d56 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/main.cpp
@@ -493,7 +493,7 @@ void CMainWindow::GameReset(void) {
 
 
 
-void CMainWindow::OnTimer(UINT_PTR nEvent) {
+void CMainWindow::OnTimer(uintptr nEvent) {
 	//CDC *pDC;
 
 	// continue as long as there is a currently active non-paused game
@@ -504,7 +504,7 @@ void CMainWindow::OnTimer(UINT_PTR nEvent) {
 }
 
 
-void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	CDC *pDC;
 
 	SetCursor(LoadCursor(nullptr, IDC_ARROW));
@@ -517,7 +517,7 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	CPoint  UndoPoint(UNDO_LEF + (UNDO_RIG - UNDO_LEF) / 2, UNDO_TOP + (UNDO_BOT - UNDO_TOP) / 2);
 
 	if (m_pBarb->m_pCrd != nullptr)        // r we currently moving a card?
@@ -532,7 +532,7 @@ void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
 	}
 }
 
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 	char    buf[32];
 	CRect   tmpRect;
@@ -636,7 +636,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-void CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 	char    buf[32];
 	CRect   tmpRect;
 
@@ -700,7 +700,7 @@ void CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
 }
 
 
-void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	char    buf[32];
 
 	if (m_pBarb->m_bIsGameOver == FALSE) {
@@ -759,7 +759,7 @@ void CMainWindow::DeleteSprite(CSprite *pSprite) {
 	delete pSprite;                                 // delete it
 }
 
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_Q
 	//
 	if ((nChar == 'q') && (nFlags & 0x2000)) {
@@ -773,7 +773,7 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	}
 }
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -789,7 +789,7 @@ void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	}
 }
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// Handle keyboard input
 	//
 	switch (nChar) {
@@ -841,7 +841,7 @@ void CMainWindow::FlushInputEvents(void) {
 	} // end while
 }
 
-void CMainWindow::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CMainWindow::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	if (pWndOther)      // bullshit to rid warnings
 		TRUE;
 
diff --git a/engines/bagel/hodjnpodj/barbershop/main.h b/engines/bagel/hodjnpodj/barbershop/main.h
index b1b24bcbb1e..79a0ee86842 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.h
+++ b/engines/bagel/hodjnpodj/barbershop/main.h
@@ -62,17 +62,17 @@ protected:
 	void        DeleteSprite(CSprite *);
 
 	void        OnPaint(void);
-	void        OnTimer(UINT_PTR);
-	void        OnMouseMove(UINT, CPoint);
-	void        OnLButtonDown(UINT, CPoint);
-	void        OnLButtonDblClk(UINT, CPoint);
-	void        OnRButtonDown(UINT, CPoint);
-	void        OnSysChar(UINT, UINT, UINT);
-	void        OnSysKeyDown(UINT, UINT, UINT);
-	void        OnKeyDown(UINT, UINT, UINT);
-	void        OnActivate(UINT, CWnd *, BOOL) override;
+	void        OnTimer(uintptr);
+	void        OnMouseMove(unsigned int, CPoint);
+	void        OnLButtonDown(unsigned int, CPoint);
+	void        OnLButtonDblClk(unsigned int, CPoint);
+	void        OnRButtonDown(unsigned int, CPoint);
+	void        OnSysChar(unsigned int, unsigned int, unsigned int);
+	void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
+	void        OnKeyDown(unsigned int, unsigned int, unsigned int);
+	void        OnActivate(unsigned int, CWnd *, BOOL) override;
 	void        OnClose(void);
-	void        OnLButtonUp(UINT, CPoint);
+	void        OnLButtonUp(unsigned int, CPoint);
 
 	DECLARE_MESSAGE_MAP()
 
diff --git a/engines/bagel/hodjnpodj/barbershop/usercfg.cpp b/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
index 20e72941883..7f785ef8f24 100644
--- a/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
@@ -45,7 +45,7 @@ extern CPalette     *pGamePalette;
 extern LPGAMESTRUCT pGameParams;
 extern int          g_nCardBack;
 
-CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	: CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	m_cRectCardBack1    = CRect(CBCK_RECT1_LEFT - DELTA, CBCK_RECT1_TOP - DELTA, CBCK_RECT1_RIG + DELTA, CBCK_RECT1_BOT + DELTA);
 	m_cRectCardBack2    = CRect(CBCK_RECT2_LEFT - DELTA, CBCK_RECT2_TOP - DELTA, CBCK_RECT2_RIG + DELTA, CBCK_RECT2_BOT + DELTA);
@@ -105,7 +105,7 @@ void CUserCfgDlg::OnPaint(void) {
 	ReleaseDC(pDC);
 }
 
-void CUserCfgDlg::OnLButtonUp(UINT nFlags, CPoint point) {
+void CUserCfgDlg::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	CDC     *pDC = GetDC();
 
 	if (
diff --git a/engines/bagel/hodjnpodj/barbershop/usercfg.h b/engines/bagel/hodjnpodj/barbershop/usercfg.h
index d7fa94a1c23..abed94e9991 100644
--- a/engines/bagel/hodjnpodj/barbershop/usercfg.h
+++ b/engines/bagel/hodjnpodj/barbershop/usercfg.h
@@ -62,7 +62,7 @@ namespace Barbershop {
 
 class CUserCfgDlg : public CBmpDialog {
 public:
-	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_USERCFG);
+	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_USERCFG);
 
 protected:
 
@@ -71,18 +71,18 @@ protected:
 
 	void OnClose();
 	void OnPaint();
-	void OnLButtonUp(UINT, CPoint);
+	void OnLButtonUp(unsigned int, CPoint);
 	void OnCancel() override;
 	void OnOK() override;
 	DECLARE_MESSAGE_MAP()
 	void MyFocusRect(CDC*, CRect, int nDrawMode, COLORREF);
 
 private:
-//	UINT            m_nTimeLimit;       //
+//	unsigned int            m_nTimeLimit;       //
 	BOOL            m_bSave;            // True if should save theses values
 	CRect           m_cRectCardBack1;
 	CRect           m_cRectCardBack2;
-	UINT            m_nCardBack;
+	unsigned int            m_nCardBack;
 	CColorButton    *m_pOKButton;       // OKAY button on scroll
 	CText           *m_ctextBox;
 };
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.cpp b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
index 9e19b525ce3..c0cd8f44f7b 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
@@ -1695,7 +1695,7 @@ int CBFishWindow::GetFishIndex(CSprite *pSprite) {
 *
 *  FORMAL PARAMETERS:
 *
-*       UINT nFlags  = Mouse button down flags
+*       unsigned int nFlags  = Mouse button down flags
 *       CPoint point = Point where the mouse was at time of this message
 *
 *  RETURN VALUE:
@@ -1703,7 +1703,7 @@ int CBFishWindow::GetFishIndex(CSprite *pSprite) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnRButtonDown(UINT, CPoint point) {
+void CBFishWindow::OnRButtonDown(unsigned int, CPoint point) {
 	CRect tmpRect;
 	int i;
 
@@ -1740,7 +1740,7 @@ void CBFishWindow::OnRButtonDown(UINT, CPoint point) {
 *
 *  FORMAL PARAMETERS:
 *
-*       UINT nFlags  = Mouse button down flags
+*       unsigned int nFlags  = Mouse button down flags
 *       CPoint point = Point where the mouse was at time of this message
 *
 *  RETURN VALUE:
@@ -1748,7 +1748,7 @@ void CBFishWindow::OnRButtonDown(UINT, CPoint point) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnLButtonDown(UINT, CPoint point) {
+void CBFishWindow::OnLButtonDown(unsigned int, CPoint point) {
 	CRect   tmpRect,
 	        winRect,
 	        trawlerRect,
@@ -1970,7 +1970,7 @@ void CBFishWindow::OnLButtonDown(UINT, CPoint point) {
 *
 *  FORMAL PARAMETERS:
 *
-*       UINT nFlags  = Mouse button down flags
+*       unsigned int nFlags  = Mouse button down flags
 *       CPoint point = Point where the mouse was at time of this message
 *
 *  RETURN VALUE:
@@ -1978,7 +1978,7 @@ void CBFishWindow::OnLButtonDown(UINT, CPoint point) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnLButtonUp(UINT, CPoint point) {
+void CBFishWindow::OnLButtonUp(unsigned int, CPoint point) {
 	CSize size;
 	CRect rect, tmpRect;
 	CDC *pDC;
@@ -2181,7 +2181,7 @@ CPoint CBFishWindow::SnapToGrid(CPoint point) {
 *
 *  FORMAL PARAMETERS:
 *
-*       UINT nFlags  = Mouse button down flags
+*       unsigned int nFlags  = Mouse button down flags
 *       CPoint point = Point where the mouse was at time of message
 *
 *  RETURN VALUE:
@@ -2189,7 +2189,7 @@ CPoint CBFishWindow::SnapToGrid(CPoint point) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnMouseMove(UINT, CPoint point) {
+void CBFishWindow::OnMouseMove(unsigned int, CPoint point) {
 	CSize size;
 	HCURSOR hCursor;
 	CDC *pDC;
@@ -3423,16 +3423,16 @@ void CBFishWindow::DeleteSprite(CSprite *pSprite) {
 *
 *  FORMAL PARAMETERS:
 *
-*       UINT nChar   = key that was pressed
-*       UINT nRepCnt = nunmber of times key was repeated
-*       UINT nFlags  = ALT, CTRL, and SHFT key flags
+*       unsigned int nChar   = key that was pressed
+*       unsigned int nRepCnt = nunmber of times key was repeated
+*       unsigned int nFlags  = ALT, CTRL, and SHFT key flags
 *
 *  RETURN VALUE:
 *
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CBFishWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_Q
 	//
 	if ((nChar == 'q') && (nFlags & 0x2000)) {
@@ -3456,16 +3456,16 @@ void CBFishWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 *
 *  FORMAL PARAMETERS:
 *
-*       UINT nChar   = key that was pressed
-*       UINT nRepCnt = nunmber of times key was repeated
-*       UINT nFlags  = ALT, CTRL, and SHFT key flags
+*       unsigned int nChar   = key that was pressed
+*       unsigned int nRepCnt = nunmber of times key was repeated
+*       unsigned int nFlags  = ALT, CTRL, and SHFT key flags
 *
 *  RETURN VALUE:
 *
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CBFishWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -3491,16 +3491,16 @@ void CBFishWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 *
 *  FORMAL PARAMETERS:
 *
-*       UINT nChar   = key that was pressed
-*       UINT nRepCnt = nunmber of times key was repeated
-*       UINT nFlags  = ALT, CTRL, and SHFT key flags
+*       unsigned int nChar   = key that was pressed
+*       unsigned int nRepCnt = nunmber of times key was repeated
+*       unsigned int nFlags  = ALT, CTRL, and SHFT key flags
 *
 *  RETURN VALUE:
 *
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CBFishWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// Handle keyboard input
 	//
 	switch (nChar) {
@@ -3540,7 +3540,7 @@ void CBFishWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 *
 *  FORMAL PARAMETERS:
 *
-*       UINT nState = WA_ACTIVE, WA_CLICKACTIVE or WA_INACTIVE
+*       unsigned int nState = WA_ACTIVE, WA_CLICKACTIVE or WA_INACTIVE
 *       CWnd *pWnd  = Pointer to Window that is losing/gaining activation
 *       BOOL bMin   = TRUE if this app is minimized
 *
@@ -3549,7 +3549,7 @@ void CBFishWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnActivate(UINT nState, CWnd *, BOOL bMinimized) {
+void CBFishWindow::OnActivate(unsigned int nState, CWnd *, BOOL bMinimized) {
 	if (!bMinimized) {
 
 		switch (nState) {
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.h b/engines/bagel/hodjnpodj/battlefish/bfish.h
index 86486eb8f49..257e9b1f4f6 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.h
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.h
@@ -97,14 +97,14 @@ protected:
 	LRESULT     OnMMIONotify(WPARAM, LPARAM);
 	void        OnSoundNotify(CSound *);
 	void        OnPaint(void);
-	void        OnMouseMove(UINT, CPoint);
-	void        OnRButtonDown(UINT, CPoint);
-	void        OnLButtonDown(UINT, CPoint);
-	void        OnLButtonUp(UINT, CPoint);
-	void        OnSysChar(UINT, UINT, UINT);
-	void        OnSysKeyDown(UINT, UINT, UINT);
-	void        OnKeyDown(UINT, UINT, UINT);
-	void        OnActivate(UINT, CWnd *, BOOL) override;
+	void        OnMouseMove(unsigned int, CPoint);
+	void        OnRButtonDown(unsigned int, CPoint);
+	void        OnLButtonDown(unsigned int, CPoint);
+	void        OnLButtonUp(unsigned int, CPoint);
+	void        OnSysChar(unsigned int, unsigned int, unsigned int);
+	void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
+	void        OnKeyDown(unsigned int, unsigned int, unsigned int);
+	void        OnActivate(unsigned int, CWnd *, BOOL) override;
 	void        OnClose(void);
 
 	DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
index 307f9c26b41..694e5238360 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
@@ -47,7 +47,7 @@ static const char *pszDiffLevel[DIFF_MAX + 1] = {
 extern const char *INI_SECTION;
 
 
-CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	: CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	m_pOKButton = nullptr;
 	m_pCancelButton = nullptr;
@@ -195,7 +195,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CBmpDialog::OnCommand(wParam, lParam);
 }
 
-void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *pScroll) {
 	switch (nSBCode) {
 
 	case SB_LEFT:
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.h b/engines/bagel/hodjnpodj/battlefish/usercfg.h
index 82fcdc0e1e2..3ddcb3244a9 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.h
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.h
@@ -41,7 +41,7 @@ namespace Battlefish {
 
 class CUserCfgDlg : public CBmpDialog {
 public:
-	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_USERCFG);
+	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_USERCFG);
 
 protected:
 
@@ -53,7 +53,7 @@ protected:
 	void LoadIniSettings(void);
 	void SaveIniSettings(void);
 
-	void OnHScroll(UINT, UINT, CScrollBar *);
+	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnDestroy();
 	void OnPaint();
 	void ClearDialogImage(void);
@@ -68,7 +68,7 @@ protected:
 	CText        *m_pTxtLevel;
 	CText        *m_pTxtOrder;
 	CScrollBar   *m_pScrollBar;
-	UINT          m_nDifficultyLevel;       // Difficulty level for BattleFish
+	unsigned int          m_nDifficultyLevel;       // Difficulty level for BattleFish
 	BOOL          m_bSave;                  // True if should save theses settings
 	BOOL          m_bUserGoesFirst;         // TRUE if Human player goes 1st
 };
diff --git a/engines/bagel/hodjnpodj/beacon/beacon.cpp b/engines/bagel/hodjnpodj/beacon/beacon.cpp
index af1aee77b78..643e8f415a3 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.cpp
+++ b/engines/bagel/hodjnpodj/beacon/beacon.cpp
@@ -69,20 +69,20 @@ BOOL        bChanged;
 BOOL        bPlaying = FALSE;
 BOOL        bNewGame = FALSE;                           // Not playing a game right now
 
-UINT        nCurrentIndex = BUTTON_ENTRY;               // The current beacon color index
-UINT        nNextIndex = BUTTON_ENTRY;                  // The next beacon color index
+unsigned int        nCurrentIndex = BUTTON_ENTRY;               // The current beacon color index
+unsigned int        nNextIndex = BUTTON_ENTRY;                  // The next beacon color index
 
-UINT        nSlice = START_ENTRY;
+unsigned int        nSlice = START_ENTRY;
 int         nLastPick = 0;
 
 int         m_nSweepCount = 0;
 constexpr int         m_nTotalSquares = (NUM_COLUMNS * NUM_ROWS) -
                               ((START_WIDTH / GRID_WIDTH) * (START_HEIGHT / GRID_HEIGHT));
 int         m_nRemoved = 0;                             // Count blocks removed
-UINT        m_nSweeps = MAX_SWEEPS;
-UINT        m_nSpeed = MAX_SPEED;
-UINT        tempSweeps = 100;                           // default sweeps = 100
-UINT        tempSpeed = MAX_SPEED;                      // default speed = Hovercraft
+unsigned int        m_nSweeps = MAX_SWEEPS;
+unsigned int        m_nSpeed = MAX_SPEED;
+unsigned int        tempSweeps = 100;                           // default sweeps = 100
+unsigned int        tempSpeed = MAX_SPEED;                      // default speed = Hovercraft
 BOOL        m_bAutomatic = FALSE;
 BOOL        m_bChangeAtTwelve = FALSE;
 float       m_Score = 0;
@@ -345,7 +345,7 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 	             *pBigPalOld = nullptr;
 	CRect       rect;
 	CPoint      Start, End, Center;
-	UINT    i;
+	unsigned int    i;
 	int     radius;
 	float   degrees, x, y, radians, rads;
 
@@ -551,7 +551,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -567,7 +567,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 	CRect   rectTitle;
 
@@ -607,7 +607,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -623,7 +623,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 	int     i;
 	BOOL    bHit = FALSE;
@@ -676,7 +676,7 @@ void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -692,7 +692,7 @@ void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	SetCursor(LoadCursor(nullptr, IDC_ARROW));           // Refresh cursor object
 
 	CFrameWnd ::OnMouseMove(nFlags, point);
@@ -708,9 +708,9 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nChar      Virtual key info
- *      UINT nRepCnt    Virtual key info
- *      UINT nFlags     Virtual key info
+ *      unsigned int nChar      Virtual key info
+ *      unsigned int nRepCnt    Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *
  *  IMPLICIT INPUT PARAMETERS:
  *
@@ -725,18 +725,18 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CFrameWnd ::OnChar(nChar, nRepCnt, nFlags);     // default action
 }
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if ((nChar == VK_F4) && (nFlags & 0x2000))      // terminate app on ALT-F4
 		PostMessage(WM_CLOSE, 0, 0);
 	else
 		CFrameWnd::OnChar(nChar, nRepCnt, nFlags);  // default action
 }
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if (nChar == VK_F1) {                                  // F1 key is hit
 		SendMessage(WM_COMMAND, IDC_RULES, BN_CLICKED);      // Activate the Rules dialog
 	} else if (nChar == VK_F2) {                         // F2 key is hit
@@ -755,7 +755,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nIDEvent   The ID of the timer event activated
+ *      unsigned int nIDEvent   The ID of the timer event activated
  *
  *  IMPLICIT INPUT PARAMETERS:
  *
@@ -770,7 +770,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnTimer(UINT_PTR nIDEvent) {
+void CMainWindow::OnTimer(uintptr nIDEvent) {
 	CDC *pDC;
 	char    msg[64];
 
@@ -1031,7 +1031,7 @@ BOOL CMainWindow::CompareColors(CDC *pDC, CPoint point) {
 	COLORREF    test;
 	byte        ar, ag, ab, br, bg, bb;
 	PALETTEENTRY    tempent[1];
-	UINT        index;
+	unsigned int        index;
 
 	test = (*pDC).GetPixel(point);
 
diff --git a/engines/bagel/hodjnpodj/beacon/beacon.h b/engines/bagel/hodjnpodj/beacon/beacon.h
index 8b436d6f7ce..17d55e23b0c 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.h
+++ b/engines/bagel/hodjnpodj/beacon/beacon.h
@@ -121,7 +121,7 @@ class CMainWindow : public CFrameWnd {
 private:
 	struct BLOCK {
 		CRect   rLocation;
-		UINT    nColorIndex;
+		unsigned int    nColorIndex;
 	} colorBlock[NUM_BUTTONS];
 
 	void initStatics();
@@ -149,13 +149,13 @@ protected:
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnTimer(uintptr nIDEvent);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonUp(unsigned int nFlags, CPoint point);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
 	afx_msg void OnClose();
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/beacon/optndlg.cpp b/engines/bagel/hodjnpodj/beacon/optndlg.cpp
index d1ba61c57ac..96c7ebebf6b 100644
--- a/engines/bagel/hodjnpodj/beacon/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/beacon/optndlg.cpp
@@ -215,7 +215,7 @@ BOOL COptnDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 } // end OnCommand
 
 
-void COptnDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void COptnDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	int pMin,
 	    pMax;
 	int OldPos = pScrollBar->GetScrollPos();
@@ -287,7 +287,7 @@ void COptnDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
  *
  ****************************************************************/
 void COptnDlg::UpdateScrollbars() {
-	UINT    OldValue;
+	unsigned int    OldValue;
 	CDC     *pDC;
 	char    msg[64];
 
diff --git a/engines/bagel/hodjnpodj/beacon/optndlg.h b/engines/bagel/hodjnpodj/beacon/optndlg.h
index fe357227c44..3a3915307fc 100644
--- a/engines/bagel/hodjnpodj/beacon/optndlg.h
+++ b/engines/bagel/hodjnpodj/beacon/optndlg.h
@@ -52,9 +52,9 @@ public:
 	CScrollBar m_ScrollSpeed;
 	BOOL    m_bAutomatic;
 	BOOL    m_bChangeAtTwelve;
-	UINT    m_nSweeps;
-	UINT    m_nSpeed;
-	UINT    nSweepSets;
+	unsigned int    m_nSweeps;
+	unsigned int    m_nSpeed;
+	unsigned int    nSweepSets;
 	CString mSpeedTable [NUM_SPEEDS];
 	//}}AFX_DATA
 
@@ -66,7 +66,7 @@ protected:
 	//{{AFX_MSG(COptnDlg)
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
 	virtual BOOL OnInitDialog() override;
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
 	virtual void OnOK() override;
diff --git a/engines/bagel/hodjnpodj/crypt/crypt.cpp b/engines/bagel/hodjnpodj/crypt/crypt.cpp
index d9a164c2fa1..df67ae59574 100644
--- a/engines/bagel/hodjnpodj/crypt/crypt.cpp
+++ b/engines/bagel/hodjnpodj/crypt/crypt.cpp
@@ -370,7 +370,7 @@ BOOL CCryptogram::HandleUserUpdate(CDC *pDC, CPoint cpointClicked) {
  *  void
  *
  ****************************************************************/
-BOOL CCryptogram::HandleUserUpdate(CDC *pDC, UINT nChar) {
+BOOL CCryptogram::HandleUserUpdate(CDC *pDC, unsigned int nChar) {
 	char    nNewChar = toupper(nChar);
 	int     nHiLiteCode;
 	int     nReplaceCode;
diff --git a/engines/bagel/hodjnpodj/crypt/crypt.h b/engines/bagel/hodjnpodj/crypt/crypt.h
index 286523122cd..7e5293c0e6a 100644
--- a/engines/bagel/hodjnpodj/crypt/crypt.h
+++ b/engines/bagel/hodjnpodj/crypt/crypt.h
@@ -48,7 +48,7 @@ public:
 
 	BOOL        DrawGram(CDC *pDC);
 	BOOL        HandleUserUpdate(CDC *pDC, CPoint cpointClicked);
-	BOOL        HandleUserUpdate(CDC *pDC, UINT nChar);
+	BOOL        HandleUserUpdate(CDC *pDC, unsigned int nChar);
 	void        Encrypt();
 	void        CreateCryptMap(int nLettersSolved);
 	int         UpdateCryptMap(int nOldType, int nNewType);
diff --git a/engines/bagel/hodjnpodj/crypt/main.cpp b/engines/bagel/hodjnpodj/crypt/main.cpp
index 00cbd070c38..a2d0e2f57ad 100644
--- a/engines/bagel/hodjnpodj/crypt/main.cpp
+++ b/engines/bagel/hodjnpodj/crypt/main.cpp
@@ -540,7 +540,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 				m_pHourGlass->EraseSprite(pDC);
 			} else if (m_cCryptograms->m_cStats->m_nTime != MAX_TIME) {      // Max time is more than max
 				IntervalLength = ((long)1000 * m_cCryptograms->m_cStats->m_nTime) / (MAX_HOURS - 1);
-				SetTimer(STAT_TIMER_ID, (UINT)(IntervalLength), nullptr);
+				SetTimer(STAT_TIMER_ID, (unsigned int)(IntervalLength), nullptr);
 			}
 
 			RefreshStats();
@@ -639,7 +639,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *      [Discuss return value]
  *
  ****************************************************************/
-void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CDC *pDC;
 
 	pDC = GetDC();
@@ -685,7 +685,7 @@ void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *      [Discuss return value]
  *
  ****************************************************************/
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if ((nChar == 'q') && (nFlags & 0x2000))        // terminate the game on an ALT-q
 		PostMessage(WM_CLOSE, 0, 0);                // ... same as clicking QUIT button
 	else
@@ -720,13 +720,13 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *      [Discuss return value]
  *
  ****************************************************************/
-void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 
 	CFrameWnd ::OnMouseMove(nFlags, point);         // default action
 }
 
 
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC *pDC;
 	CSprite *pSprite = nullptr;                    // Easter Egg anim pointer
 	CSound  *pEffect = nullptr;                    // EE & Sound pointer
@@ -930,11 +930,11 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 }
 
 
-void CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 	CDC *pDC;
 
 	pDC = GetDC();
@@ -951,31 +951,31 @@ void CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
 }
 
 
-void CMainWindow::OnMButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnMButtonDown(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMainWindow::OnMButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnMButtonUp(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMainWindow::OnMButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnMButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMainWindow::OnRButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonUp(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
-void CMainWindow::OnRButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
@@ -1008,7 +1008,7 @@ void CMainWindow::OnRButtonDblClk(UINT nFlags, CPoint point) {
  *      n/a
  *
  ****************************************************************/
-void CMainWindow::OnTimer(UINT_PTR nIDEvent) {
+void CMainWindow::OnTimer(uintptr nIDEvent) {
 	if ((nIDEvent == STAT_TIMER_ID) && (m_bPause == FALSE)) {
 		// move pointer to next hour glass formation
 		//
@@ -1051,7 +1051,7 @@ void CMainWindow::OnTimer(UINT_PTR nIDEvent) {
 	}
 }
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_F4
 	//
 	if ((nChar == VK_F4) && (nFlags & 0x2000)) {
@@ -1085,7 +1085,7 @@ void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *
  *
  ****************************************************************/
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if (nChar == VK_F1) {                                  // F1 key is hit
 		SendMessage(WM_COMMAND, IDC_OPTIONS_RULES, BN_CLICKED);  // Activate the Options dialog
 		(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L); // Reset scroll button to up state
diff --git a/engines/bagel/hodjnpodj/crypt/main.h b/engines/bagel/hodjnpodj/crypt/main.h
index ad360760b8c..7f5f098f602 100644
--- a/engines/bagel/hodjnpodj/crypt/main.h
+++ b/engines/bagel/hodjnpodj/crypt/main.h
@@ -176,21 +176,21 @@ protected:
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnLButtonDblClk(UINT, CPoint);
-	afx_msg void OnMButtonDown(UINT, CPoint);
-	afx_msg void OnMButtonUp(UINT, CPoint);
-	afx_msg void OnMButtonDblClk(UINT, CPoint);
-	afx_msg void OnRButtonDown(UINT, CPoint);
-	afx_msg void OnRButtonUp(UINT, CPoint);
-	afx_msg void OnRButtonDblClk(UINT, CPoint);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnLButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnMButtonDown(unsigned int, CPoint);
+	afx_msg void OnMButtonUp(unsigned int, CPoint);
+	afx_msg void OnMButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnRButtonDown(unsigned int, CPoint);
+	afx_msg void OnRButtonUp(unsigned int, CPoint);
+	afx_msg void OnRButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnTimer(uintptr nIDEvent);
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
diff --git a/engines/bagel/hodjnpodj/crypt/optn.cpp b/engines/bagel/hodjnpodj/crypt/optn.cpp
index 89d1c4a7f3a..fc66bd25d32 100644
--- a/engines/bagel/hodjnpodj/crypt/optn.cpp
+++ b/engines/bagel/hodjnpodj/crypt/optn.cpp
@@ -209,7 +209,7 @@ void COptn::OnDestroy(void) {
 }
 
 
-void COptn::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void COptn::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	// TODO: Add your message handler code here and/or call default
 	CDC     *pDC;
 	BOOL    bAssertCheck;
diff --git a/engines/bagel/hodjnpodj/crypt/optn.h b/engines/bagel/hodjnpodj/crypt/optn.h
index 87541e7b995..880c21a6fee 100644
--- a/engines/bagel/hodjnpodj/crypt/optn.h
+++ b/engines/bagel/hodjnpodj/crypt/optn.h
@@ -81,7 +81,7 @@ protected:
 	virtual BOOL OnInitDialog() override;
 	afx_msg void OnPaint();
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	virtual void OnOK() override;
 	virtual void OnCancel() override;
 	afx_msg void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/dfa/dfa.cpp b/engines/bagel/hodjnpodj/dfa/dfa.cpp
index 39007927d81..9e0ea54d4fe 100644
--- a/engines/bagel/hodjnpodj/dfa/dfa.cpp
+++ b/engines/bagel/hodjnpodj/dfa/dfa.cpp
@@ -533,7 +533,7 @@ void CMainDFAWindow::ResetGame() {
 void CALLBACK lpfnOptionCallback(CWnd * pWnd) {
 // do the mini options dialog
 	int             nOption = 0;       // return from the Options dialog
-//UINT          x = IDD_MINIOPTIONS_DIALOG;
+//unsigned int          x = IDD_MINIOPTIONS_DIALOG;
 	CDFAOptDlg      dlgMiniOptDlg(pWnd, pGamePalette, IDD_MINIOPTIONS_DIALOG);
 
 	dlgMiniOptDlg.SetInitialOptions(pMainGameWnd->m_nTimeForGame, pMainGameWnd->m_nBeaverDuration);
@@ -673,14 +673,14 @@ BOOL CMainDFAWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return TRUE;
 }
 
-void CMainDFAWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainDFAWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	if (bStart) {
 		bStart = FALSE;
 	}
 	CWnd::OnRButtonDown(nFlags, point);
 }
 
-void CMainDFAWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainDFAWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CSound  *pEffect = nullptr;
 	CRect   rWatch,
 	        rLake,
@@ -778,7 +778,7 @@ void CMainDFAWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonDown(nFlags, point);
 }
 
-void CMainDFAWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainDFAWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 
 	pDC = GetDC();
@@ -797,7 +797,7 @@ void CMainDFAWindow::OnMouseMove(UINT nFlags, CPoint point) {
 	CWnd::OnMouseMove(nFlags, point);
 }
 
-void CMainDFAWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainDFAWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 
 	if (!bEndGame && ArtRect.PtInRect(point)) {
 		CDC *pDC;
@@ -813,7 +813,7 @@ void CMainDFAWindow::OnLButtonUp(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonUp(nFlags, point);
 }
 
-void CMainDFAWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainDFAWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_F4
 	//
 	if ((nChar == VK_F4) && (nFlags & 0x2000)) {
@@ -828,7 +828,7 @@ void CMainDFAWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMainDFAWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainDFAWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CRules  dlgRules((CWnd *)this, RULESFILE, pGamePalette,
 	                 (m_lpGameStruct->bSoundEffectsEnabled ? RULES_WAV : nullptr));
 
@@ -860,7 +860,7 @@ void CMainDFAWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	return;
 }
 
-void CMainDFAWindow::OnTimer(UINT_PTR nWhichTimer) {
+void CMainDFAWindow::OnTimer(uintptr nWhichTimer) {
 	CSound  *pEffect = nullptr;
 
 	if (nWhichTimer == GAMETIMER) {
@@ -985,7 +985,7 @@ BOOL CMainDFAWindow::OnEraseBkgnd(CDC *pDC) {
 	return TRUE;
 }
 
-void CMainDFAWindow::OnActivate(UINT nState, CWnd   *pWndOther, BOOL bMinimized) {
+void CMainDFAWindow::OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) {
 	if (!bMinimized)
 		switch (nState) {
 		case WA_ACTIVE:
diff --git a/engines/bagel/hodjnpodj/dfa/dfa.h b/engines/bagel/hodjnpodj/dfa/dfa.h
index b51eb689caa..06bff1ab98e 100644
--- a/engines/bagel/hodjnpodj/dfa/dfa.h
+++ b/engines/bagel/hodjnpodj/dfa/dfa.h
@@ -127,7 +127,7 @@ namespace DFA {
 
 class CMainDFAWindow : public CFrameWnd {
 public:
-	UINT            m_nTimeForGame;
+	unsigned int            m_nTimeForGame;
 	int             m_nBeaverDuration;
 
 private:
@@ -177,15 +177,15 @@ protected:
 	afx_msg void OnPaint();
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
-	afx_msg void OnTimer(UINT_PTR);
-	afx_msg void OnRButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnMouseMove(UINT, CPoint);
-	afx_msg void OnSysKeyDown(UINT, UINT, UINT);
-	afx_msg void OnKeyDown(UINT, UINT, UINT);
+	afx_msg void OnTimer(uintptr);
+	afx_msg void OnRButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnMouseMove(unsigned int, CPoint);
+	afx_msg void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
+	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	afx_msg void OnActivate(UINT nState, CWnd   *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) override;
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
 	//}}AFX_MSG
diff --git a/engines/bagel/hodjnpodj/dfa/dialogs.h b/engines/bagel/hodjnpodj/dfa/dialogs.h
index d4ebbd7eebe..99f62e26a4e 100644
--- a/engines/bagel/hodjnpodj/dfa/dialogs.h
+++ b/engines/bagel/hodjnpodj/dfa/dialogs.h
@@ -40,7 +40,7 @@ private:
 	CRect rDisplayBTime;
 
 public:
-	CDFAOptDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_MINIOPTIONS_DIALOG);
+	CDFAOptDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MINIOPTIONS_DIALOG);
 	void SetInitialOptions(int = 8, int = 1);    // Sets the private members
 	void ClearDialogImage();
 	BOOL OnInitDialog() override;
@@ -51,7 +51,7 @@ protected:
 	virtual void OnOK(void) override;
 	virtual BOOL OnCommand(WPARAM, LPARAM) override;
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
 	//}}AFX_MSG
@@ -67,7 +67,7 @@ private:
 	long    m_lScore;
 
 public:
-	CMsgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_MESSAGEBOX);
+	CMsgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MESSAGEBOX);
 	void SetInitialOptions(int, long);   // Sets the private members
 	void ClearDialogImage();
 	BOOL OnInitDialog() override;
diff --git a/engines/bagel/hodjnpodj/dfa/msgdlg.cpp b/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
index 625cf8b1607..d3e592d8e96 100644
--- a/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
@@ -59,7 +59,7 @@ CColorButton    *pMsgOKButton = nullptr;
  *      n/a
  *
  ****************************************************************/
-CMsgDlg::CMsgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CMsgDlg::CMsgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	:  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	pPackRatOptPalette = pPalette;
 	m_nWhichMsg = 1;
diff --git a/engines/bagel/hodjnpodj/dfa/optdlg.cpp b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
index 0a3c109a1d7..dc0a3d6af40 100644
--- a/engines/bagel/hodjnpodj/dfa/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
@@ -69,7 +69,7 @@ CColorButton    *pDFACancelButton = nullptr;
  *      n/a
  *
  ****************************************************************/
-CDFAOptDlg::CDFAOptDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CDFAOptDlg::CDFAOptDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	:  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP"),
 		rDisplayGTime(43, 85, 174, 97),
 		rDisplayBTime(43, 35, 174, 47) {
@@ -356,7 +356,7 @@ void CDFAOptDlg::OnPaint(void) {
  *      n/a
  *
  ****************************************************************/
-void CDFAOptDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void CDFAOptDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	int     oldAmnt = 0;
 	int     newAmnt = 0;
 	CDC     *pDC;
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.cpp b/engines/bagel/hodjnpodj/fuge/fuge.cpp
index 7873bc19b5e..27c8d8e5363 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.cpp
+++ b/engines/bagel/hodjnpodj/fuge/fuge.cpp
@@ -468,7 +468,7 @@ CFugeWindow::CFugeWindow() : gvCenter(CENTER_X, CENTER_Y) {
 			}
 
 			// seed the random number generator
-			//srand((UINT)time(nullptr));
+			//srand((unsigned int)time(nullptr));
 
 			//
 			// The vector table is rotated by 11 or so degrees, because it
@@ -2383,7 +2383,7 @@ void CFugeWindow::GameReset(void) {
 }
 
 
-void CFugeWindow::OnTimer(UINT_PTR nEvent) {
+void CFugeWindow::OnTimer(uintptr nEvent) {
 	// there should be only one timer
 	assert(nEvent == TIMER_ID);
 
@@ -2407,7 +2407,7 @@ void CFugeWindow::OnTimer(UINT_PTR nEvent) {
 	}
 }
 
-long CFugeWindow::OnJoyStick(UINT wParam, long lParam) {
+long CFugeWindow::OnJoyStick(unsigned int wParam, long lParam) {
 	long nThresholdX, nThresholdY;
 
 	if (m_bGameActive) {
@@ -2419,10 +2419,10 @@ long CFugeWindow::OnJoyStick(UINT wParam, long lParam) {
 		}
 
 		nThresholdX = m_nJoyOrgX;
-		nThresholdX -= (UINT)LOWORD(lParam);
+		nThresholdX -= (unsigned int)LOWORD(lParam);
 
 		nThresholdY = m_nJoyOrgY;
-		nThresholdY -= (UINT)HIWORD(lParam);
+		nThresholdY -= (unsigned int)HIWORD(lParam);
 
 		if (nThresholdY > 5000) {
 
@@ -2472,7 +2472,7 @@ long CFugeWindow::OnJoyStick(UINT wParam, long lParam) {
 }
 
 
-void CFugeWindow::OnMouseMove(UINT, CPoint point) {
+void CFugeWindow::OnMouseMove(unsigned int, CPoint point) {
 	int nMove;
 
 	if (m_bGameActive && m_bMovingPaddle) {
@@ -2508,7 +2508,7 @@ void CFugeWindow::OnMouseMove(UINT, CPoint point) {
 
 
 
-void CFugeWindow::OnRButtonUp(UINT nFlags, CPoint point) {
+void CFugeWindow::OnRButtonUp(unsigned int nFlags, CPoint point) {
 	if (m_bGameActive) {
 
 		// toggle move paddle mode
@@ -2532,7 +2532,7 @@ void CFugeWindow::OnRButtonUp(UINT nFlags, CPoint point) {
 }
 
 
-void CFugeWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CFugeWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CRect   boothRect,
 	        tentRect,
 	        peopRect,
@@ -2653,7 +2653,7 @@ void CFugeWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-void CFugeWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CFugeWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_Q
 	//
 	if ((nChar == 'q') && (nFlags & 0x2000)) {
@@ -2668,7 +2668,7 @@ void CFugeWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CFugeWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CFugeWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -2684,7 +2684,7 @@ void CFugeWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CFugeWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CFugeWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// Handle keyboard input
 	//
 	switch (nChar) {
@@ -2756,7 +2756,7 @@ void CFugeWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CFugeWindow::OnActivate(UINT nState, CWnd *, BOOL bMinimized) {
+void CFugeWindow::OnActivate(unsigned int nState, CWnd *, BOOL bMinimized) {
 	if (!bMinimized) {
 
 		switch (nState) {
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.h b/engines/bagel/hodjnpodj/fuge/fuge.h
index 29997c94c64..bda0eb33cde 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.h
+++ b/engines/bagel/hodjnpodj/fuge/fuge.h
@@ -78,16 +78,16 @@ protected:
 	void        BallvsBrick(DOUBLE);
 
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
-	long        OnJoyStick(UINT, long);
+	long        OnJoyStick(unsigned int, long);
 	void        OnPaint(void);
-	void        OnTimer(UINT_PTR);
-	void        OnMouseMove(UINT, CPoint);
-	void        OnRButtonUp(UINT, CPoint);
-	void        OnLButtonDown(UINT, CPoint);
-	void        OnSysChar(UINT, UINT, UINT);
-	void        OnSysKeyDown(UINT, UINT, UINT);
-	void        OnKeyDown(UINT, UINT, UINT);
-	void        OnActivate(UINT, CWnd *, BOOL) override;
+	void        OnTimer(uintptr);
+	void        OnMouseMove(unsigned int, CPoint);
+	void        OnRButtonUp(unsigned int, CPoint);
+	void        OnLButtonDown(unsigned int, CPoint);
+	void        OnSysChar(unsigned int, unsigned int, unsigned int);
+	void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
+	void        OnKeyDown(unsigned int, unsigned int, unsigned int);
+	void        OnActivate(unsigned int, CWnd *, BOOL) override;
 	LRESULT     OnMCINotify(WPARAM, LPARAM);
 	LRESULT     OnMMIONotify(WPARAM, LPARAM);
 	void        OnSoundNotify(CSound *);
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.cpp b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
index 0b242b5d2d3..51622bc0a73 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
@@ -49,7 +49,7 @@ static  CColorButton *pCancelButton = nullptr;                 // Cancel button
 static  CColorButton *pDefaultsButton = nullptr;               // Defaults button on scroll
 
 
-CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	: CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	// Inits
 	//
@@ -139,7 +139,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CBmpDialog::OnCommand(wParam, lParam);
 }
 
-void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *pScroll) {
 	char buf[40];
 	int nMin, nMax, nVal;
 	CDC *pDC;
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.h b/engines/bagel/hodjnpodj/fuge/usercfg.h
index 49f8c89b3fb..1039c338098 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.h
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.h
@@ -54,7 +54,7 @@ namespace Fuge {
 
 class CUserCfgDlg : public CBmpDialog {
 public:
-	CUserCfgDlg(CWnd *pParent, CPalette *pPalette, UINT);
+	CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int);
 
 protected:
 
@@ -69,7 +69,7 @@ protected:
 	void ClearDialogImage(void);
 
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	void OnHScroll(UINT, UINT, CScrollBar *);
+	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnClose();
 	void OnDestroy();
 	void OnPaint();
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
index 764c7cf63dd..e95f891536d 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
@@ -80,7 +80,7 @@ int     tempNumButtons;
 
 int     nNoteCount = 0;
 int     nCheckCount = 0;
-UINT    nSButFlag = MAX_BUTTONS;
+unsigned int    nSButFlag = MAX_BUTTONS;
 CNote   *pNoteMarker;
 
 static const char *cSoundName[MAX_BUTTONS] = {
@@ -403,7 +403,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 		case IDC_D:
 		case IDC_E:
 		case IDC_F:
-			UINT    nButID, nHitID;
+			unsigned int    nButID, nHitID;
 			char    msg[4];
 
 			nHitID = wParam - IDC_A;                        // The musician buttons are consecutive
@@ -553,7 +553,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -569,7 +569,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CRect   rectTitle,
 	        rectWoodsRight,
 	        rectWoodsLeft,
@@ -678,7 +678,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	if (m_bNewGame) {
 		if (m_bPlaying && bLDown) {
 			if (pAnimSprite[m_nButID] != nullptr) {
@@ -690,7 +690,7 @@ void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
 	}
 }
 
-void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 
 	if (!m_bNewGame) {
 		PostMessage(WM_COMMAND, IDC_START, BN_CLICKED);      // Activate the imaginary 'start' button
@@ -708,7 +708,7 @@ void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -724,7 +724,7 @@ void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	if (bPlayingBackSeries) {
 		SetCursor(LoadCursor(nullptr, IDC_WAIT));            // Refresh cursor object
 	} else {
@@ -739,25 +739,25 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
 // These functions are called when keyboard input generates a character.
 //
 
-void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CFrameWnd::OnChar(nChar, nRepCnt, nFlags);  // default action
 }
 
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if ((nChar == 'q') && (nFlags & 0x2000))        // terminate app on ALT-q
 		PostMessage(WM_CLOSE, 0, 0);                 // *** remove later ***
 	else
 		CFrameWnd::OnChar(nChar, nRepCnt, nFlags);  // default action
 }
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if ((nChar == VK_F4) && (nFlags & 0x2000))      // terminate app on ALT-q
 		PostMessage(WM_CLOSE, 0, 0);                 // *** remove later ***
 	else
 		CFrameWnd::OnSysKeyDown(nChar, nRepCnt, nFlags);    // default action
 }
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if (!bPlayingBackSeries) {
 		if (nChar == VK_F1) {                                  // F1 key is hit
 			SendMessage(WM_COMMAND, IDC_RULES, BN_CLICKED);      // Activate the Rules dialog
@@ -807,7 +807,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	*/
 }
 /* one-plus of low priority
-void CMainWindow::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
+void CMainWindow::OnKeyUp(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags)
 {
     BOOL    bMusician = FALSE;
 
@@ -845,7 +845,7 @@ void CMainWindow::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nIDEvent   The ID of the timer event activated
+ *      unsigned int nIDEvent   The ID of the timer event activated
  *
  *  IMPLICIT INPUT PARAMETERS:
  *
@@ -860,7 +860,7 @@ void CMainWindow::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnTimer(UINT_PTR nIDEvent) {
+void CMainWindow::OnTimer(uintptr nIDEvent) {
 	CDC     *pDC = nullptr;
 	CSound  *pEffect = nullptr;
 
@@ -908,7 +908,7 @@ void CMainWindow::OnTimer(UINT_PTR nIDEvent) {
 
 }
 
-void CMainWindow::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CMainWindow::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 
 	if (!bMinimized) {
 		switch (nState) {
@@ -1038,10 +1038,10 @@ BOOL CMainWindow::GetNewSequence(int nLength) {
 	return TRUE;
 }//end GetNewSequence()
 
-void CMainWindow::ActivateButtons(UINT nNumActive, BOOL bState) {
+void CMainWindow::ActivateButtons(unsigned int nNumActive, BOOL bState) {
 	CDC         *pDC;
 	CPalette    *pOldPal = nullptr;
-	UINT i;
+	unsigned int i;
 
 	pDC = GetDC();
 	pOldPal = pDC->SelectPalette(pGamePalette, FALSE);           // select the game palette
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.h b/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
index 9fb0bb865b3..d4c2add0c5c 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
@@ -193,7 +193,7 @@ public:
 	CMainWindow();
 	BOOL GetNewSequence(const char* pszFileName);
 	BOOL GetNewSequence(int nLength);
-	void ActivateButtons(UINT nNumActive, BOOL bState);
+	void ActivateButtons(unsigned int nNumActive, BOOL bState);
 	void PlayBackSeries(int nNumNotes);
 	void NewGame();
 	void StartAnimation();
@@ -215,17 +215,17 @@ protected:
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-//	afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnActivate(UINT, CWnd*, BOOL) override;
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+//	afx_msg void OnKeyUp(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnTimer(uintptr nIDEvent);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonUp(unsigned int nFlags, CPoint point);
+	afx_msg void OnRButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnActivate(unsigned int, CWnd*, BOOL) override;
 	afx_msg void OnClose();
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp b/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
index 1cb719f319c..3405eb29bc9 100644
--- a/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
@@ -204,7 +204,7 @@ BOOL COptnDlg::OnEraseBkgnd(CDC *pDC) {
 }
 
 
-void COptnDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void COptnDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	int pMin,
 	    pMax;
 	int OldPos = pScrollBar->GetScrollPos();
diff --git a/engines/bagel/hodjnpodj/garfunkle/optndlg.h b/engines/bagel/hodjnpodj/garfunkle/optndlg.h
index 424f9f260d0..5e9de784e1e 100644
--- a/engines/bagel/hodjnpodj/garfunkle/optndlg.h
+++ b/engines/bagel/hodjnpodj/garfunkle/optndlg.h
@@ -64,7 +64,7 @@ protected:
 	//{{AFX_MSG(COptnDlg)
 	virtual BOOL OnInitDialog() override;
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg int  OnCreate(LPCREATESTRUCT lpCreateStruct);
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
 	virtual void OnOK() override;
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
index adcdb7ca097..d00ec4f0181 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
@@ -40,7 +40,7 @@ static  CColorButton *pOKButton = nullptr;                     // OKAY button on
 static  CColorButton *pCancelButton = nullptr;                 // Cancel button on scroll
 
 
-CAudioCfgDlg::CAudioCfgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CAudioCfgDlg::CAudioCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	: CBmpDialog(pParent, pPalette, IDD_AUDIOCFG, ".\\ART\\SSCROLL.BMP") {
 	m_pScrollBar1 = nullptr;
 
@@ -110,7 +110,7 @@ BOOL CAudioCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CBmpDialog::OnCommand(wParam, lParam);
 }
 
-void CAudioCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CAudioCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *pScroll) {
 	int nMin = 0, nMax = 0, nVal = 0;
 
 	if (pScroll == m_pScrollBar1) {
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
index b3042483ce5..c3bc955b337 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
@@ -38,7 +38,7 @@ namespace HodjNPodj {
 
 class CAudioCfgDlg : public CBmpDialog {
 public:
-	CAudioCfgDlg(CWnd *pParent, CPalette *pPalette, UINT);
+	CAudioCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int);
 
 protected:
 
@@ -53,7 +53,7 @@ protected:
 	void ClearDialogImage(void);
 
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	void OnHScroll(UINT, UINT, CScrollBar *);
+	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnClose();
 	void OnDestroy();
 	void OnPaint();
diff --git a/engines/bagel/hodjnpodj/hnplibs/button.cpp b/engines/bagel/hodjnpodj/hnplibs/button.cpp
index bb0a880ce7f..4d4f51f6ed0 100644
--- a/engines/bagel/hodjnpodj/hnplibs/button.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/button.cpp
@@ -156,7 +156,7 @@ void CBmpButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
  * SetControl()
  *
  * Parameters:
- *  UINT nID        control identifier for the dialog button
+ *  unsigned int nID        control identifier for the dialog button
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
@@ -166,7 +166,7 @@ void CBmpButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
  *
  ************************************************************************/
 
-BOOL CBmpButton::SetControl(UINT nID, CWnd * pParent) {
+BOOL CBmpButton::SetControl(unsigned int nID, CWnd * pParent) {
 	if (!CBitmapButton::SubclassDlgItem(nID, pParent))      // attach the Button to the dialog control
 		return FALSE;
 
@@ -179,7 +179,7 @@ BOOL CBmpButton::SetControl(UINT nID, CWnd * pParent) {
  * AutoLoad()
  *
  * Parameters:
- *  UINT nID        control identifier for the dialog button
+ *  unsigned int nID        control identifier for the dialog button
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
@@ -190,7 +190,7 @@ BOOL CBmpButton::SetControl(UINT nID, CWnd * pParent) {
  *
  ************************************************************************/
 
-BOOL CBmpButton::AutoLoad(UINT nID, CWnd * pParent) {
+BOOL CBmpButton::AutoLoad(unsigned int nID, CWnd * pParent) {
 	CString buttonName;
 	BOOL    bSuccess;
 
@@ -839,7 +839,7 @@ void CColorButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cHighl
  * SetControl()
  *
  * Parameters:
- *  UINT nID        control identifier for the dialog button
+ *  unsigned int nID        control identifier for the dialog button
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
@@ -849,7 +849,7 @@ void CColorButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cHighl
  *
  ************************************************************************/
 
-BOOL CColorButton::SetControl(UINT nID, CWnd * pParent) {
+BOOL CColorButton::SetControl(unsigned int nID, CWnd * pParent) {
 	if (!CColorButton::SubclassDlgItem(nID, pParent))      // attach the Button to the dialog control
 		return FALSE;
 
@@ -1127,7 +1127,7 @@ void CCheckButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cContr
  * SetControl()
  *
  * Parameters:
- *  UINT nID        control identifier for the dialog button
+ *  unsigned int nID        control identifier for the dialog button
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
@@ -1137,7 +1137,7 @@ void CCheckButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cContr
  *
  ************************************************************************/
 
-BOOL CCheckButton::SetControl(UINT nID, CWnd * pParent) {
+BOOL CCheckButton::SetControl(unsigned int nID, CWnd * pParent) {
 	if (!CCheckButton::SubclassDlgItem(nID, pParent))      // attach the Button to the dialog control
 		return FALSE;
 
@@ -1472,7 +1472,7 @@ void CRadioButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cContr
  * SetControl()
  *
  * Parameters:
- *  UINT nID        control identifier for the dialog button
+ *  unsigned int nID        control identifier for the dialog button
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
@@ -1482,7 +1482,7 @@ void CRadioButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cContr
  *
  ************************************************************************/
 
-BOOL CRadioButton::SetControl(UINT nID, CWnd * pParent) {
+BOOL CRadioButton::SetControl(unsigned int nID, CWnd * pParent) {
 	if (!CRadioButton::SubclassDlgItem(nID, pParent))      // attach the Button to the dialog control
 		return FALSE;
 	SetButtonStyle(BS_OWNERDRAW, FALSE);
diff --git a/engines/bagel/hodjnpodj/hnplibs/button.h b/engines/bagel/hodjnpodj/hnplibs/button.h
index 00af92a0b71..4d022cabd93 100644
--- a/engines/bagel/hodjnpodj/hnplibs/button.h
+++ b/engines/bagel/hodjnpodj/hnplibs/button.h
@@ -75,8 +75,8 @@ public:
 
 // Implementation
 public:
-	BOOL SetControl(UINT nID, CWnd * pParent);
-	BOOL AutoLoad(UINT nID, CWnd * pParent);
+	BOOL SetControl(unsigned int nID, CWnd * pParent);
+	BOOL AutoLoad(unsigned int nID, CWnd * pParent);
 
 	BOOL LoadBitmaps(CPalette *pPalette, CBitmap *pBase, CBitmap *pSelected, CBitmap *pFocus, CBitmap *pDisabled);
 	BOOL LoadBitmaps(const char *lpszBase, const char *lpszSelected = nullptr, const char *lpszFocus = nullptr, const char *lpszDisabled = nullptr);
@@ -151,7 +151,7 @@ public:
 
 // Implementation
 public:
-	BOOL SetControl(UINT nID, CWnd * pParent);
+	BOOL SetControl(unsigned int nID, CWnd * pParent);
 	void SetPalette(CPalette *pPalette);
 	void SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cHighlight, COLORREF cShadow, COLORREF cText, COLORREF cTextDisabled, COLORREF cOutline);
 
@@ -190,7 +190,7 @@ public:
 
 // Implementation
 public:
-	BOOL SetControl(UINT nID, CWnd * pParent);
+	BOOL SetControl(unsigned int nID, CWnd * pParent);
 	void SetPalette(CPalette *pPalette);
 	void SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cControl, COLORREF cText, COLORREF cTextDisabled, COLORREF cOutline);
 
@@ -231,7 +231,7 @@ public:
 
 // Implementation
 public:
-	BOOL SetControl(UINT nID, CWnd * pParent);
+	BOOL SetControl(unsigned int nID, CWnd * pParent);
 	void SetPalette(CPalette *pPalette);
 	void SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cControl, COLORREF cText, COLORREF cTextDisabled, COLORREF cOutline);
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/cbofdlg.cpp b/engines/bagel/hodjnpodj/hnplibs/cbofdlg.cpp
index f822bf3bf90..17f10d964f0 100644
--- a/engines/bagel/hodjnpodj/hnplibs/cbofdlg.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/cbofdlg.cpp
@@ -233,12 +233,12 @@ void CBmpDialog::OnPaint() {
 }
 
 
-void CBmpDialog::OnShowWindow(BOOL bShow, UINT nStatus) {
+void CBmpDialog::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	CDialog::OnShowWindow(bShow, nStatus);
 }
 
 
-void CBmpDialog::OnSize(UINT nType, int cx, int cy) {
+void CBmpDialog::OnSize(unsigned int nType, int cx, int cy) {
 	CDialog::OnSize(nType, cx, cy);
 }
 
@@ -251,12 +251,12 @@ int CBmpDialog::OnCreate(LPCREATESTRUCT lpCreateStruct) {
 }
 
 
-void CBmpDialog::OnLButtonDown(UINT nFlags, CPoint point) {
+void CBmpDialog::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDialog::OnLButtonDown(nFlags, point);
 }
 
 
-void CBmpDialog::OnMouseMove(UINT nFlags, CPoint point) {
+void CBmpDialog::OnMouseMove(unsigned int nFlags, CPoint point) {
 	CDialog::OnMouseMove(nFlags, point);
 }
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/cbofdlg.h b/engines/bagel/hodjnpodj/hnplibs/cbofdlg.h
index 7b8583ffa98..f42cfb7ca44 100644
--- a/engines/bagel/hodjnpodj/hnplibs/cbofdlg.h
+++ b/engines/bagel/hodjnpodj/hnplibs/cbofdlg.h
@@ -54,10 +54,10 @@ protected:
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp b/engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp
index af829b9a57d..b5e181ac6f5 100644
--- a/engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp
@@ -50,7 +50,7 @@ BEGIN_MESSAGE_MAP(CMainMenu, CBmpDialog)
 END_MESSAGE_MAP()
 
 CMainMenu::CMainMenu(CWnd *pParent, CPalette *pPalette,
-        UINT nFlags, FPFUNC pOptionsFunc, const char *pRulesFileName,
+        unsigned int nFlags, FPFUNC pOptionsFunc, const char *pRulesFileName,
         const char *pWavFileName, LPGAMESTRUCT pGameParams)
 		: CBmpDialog(pParent, pPalette, IDD_OPTIONS_DIALOG, ".\\ART\\OSCROLL.BMP") {
 	// Can't access null pointers
diff --git a/engines/bagel/hodjnpodj/hnplibs/mainmenu.h b/engines/bagel/hodjnpodj/hnplibs/mainmenu.h
index 44e6203fecd..2692efbe787 100644
--- a/engines/bagel/hodjnpodj/hnplibs/mainmenu.h
+++ b/engines/bagel/hodjnpodj/hnplibs/mainmenu.h
@@ -44,7 +44,7 @@ typedef void (CALLBACK *FPFUNC)(CWnd *);
 
 class CMainMenu : public CBmpDialog {
 public:
-	CMainMenu(CWnd *, CPalette *, UINT, FPFUNC,
+	CMainMenu(CWnd *, CPalette *, unsigned int, FPFUNC,
 	          const char *, const char *pWavFileName = nullptr,
 	          LPGAMESTRUCT pGameParams = nullptr);
 	void ClearDialogImage();
diff --git a/engines/bagel/hodjnpodj/hnplibs/rules.cpp b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
index 69ad285ae34..59f15c766ba 100644
--- a/engines/bagel/hodjnpodj/hnplibs/rules.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
@@ -337,7 +337,7 @@ BOOL CRules::OnInitDialog() {
 }
 
 
-void CRules::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CRules::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	BOOL    bUpdateNeeded;
 
 	switch (nState) {
@@ -857,8 +857,8 @@ void CRules::UpdateScroll(int nPage) {
 
 void CRules::WritePage(CDC *pDC, int nPage) {
 	int         i, n, x, y;
-	UINT        nCropped = 0;
-	UINT        nCount = 0;
+	unsigned int        nCropped = 0;
+	unsigned int        nCount = 0;
 	char        chInBuf[TEXT_BUFFER_SIZE];
 	CFont       *pFontOld = nullptr;
 	CSize       textInfo;
@@ -1075,7 +1075,7 @@ void CRules::UpdateMore(CDC *pDC) {
 }
 
 
-void CRules::OnShowWindow(BOOL bShow, UINT nStatus) {
+void CRules::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	CDialog::OnShowWindow(bShow, nStatus);
 
 	// TODO: Add your message handler code here
@@ -1083,7 +1083,7 @@ void CRules::OnShowWindow(BOOL bShow, UINT nStatus) {
 }
 
 
-void CRules::OnSize(UINT nType, int cx, int cy) {
+void CRules::OnSize(unsigned int nType, int cx, int cy) {
 	CDialog::OnSize(nType, cx, cy);
 
 	// TODO: Add your message handler code here
@@ -1367,7 +1367,7 @@ CBitmap *CRules::CreateScrollBitmap(CDC *pDC, CDibDoc *pDibDoc, CPalette *pPalet
 }
 
 
-void CRules::OnLButtonDown(UINT nFlags, CPoint point) {
+void CRules::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	if (!bActiveWindow)
 		return;
 
@@ -1382,7 +1382,7 @@ void CRules::OnLButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-void CRules::OnMouseMove(UINT nFlags, CPoint point) {
+void CRules::OnMouseMove(unsigned int nFlags, CPoint point) {
 	HCURSOR hNewCursor = nullptr;
 	CWinApp *pMyApp;
 
@@ -1413,7 +1413,7 @@ void CRules::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-BOOL CRules::OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) {
+BOOL CRules::OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message) {
 	if ((*pWnd).m_hWnd == (*this).m_hWnd)
 		return TRUE;
 	else
diff --git a/engines/bagel/hodjnpodj/hnplibs/rules.h b/engines/bagel/hodjnpodj/hnplibs/rules.h
index 83b412d05bc..3aaafd625e7 100644
--- a/engines/bagel/hodjnpodj/hnplibs/rules.h
+++ b/engines/bagel/hodjnpodj/hnplibs/rules.h
@@ -98,12 +98,12 @@ protected:
 	virtual void OnCancel(void) override;
 	afx_msg void OnDestroy(void);
 	afx_msg void OnPaint(void);
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg BOOL OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/engines/bagel/hodjnpodj/hnplibs/stdinc.h b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
index bd0a80f75f8..08a0f4942ea 100644
--- a/engines/bagel/hodjnpodj/hnplibs/stdinc.h
+++ b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
@@ -56,18 +56,9 @@ namespace HodjNPodj {
 #ifndef FAR
 	#define FAR
 #endif
-#define char char
 typedef unsigned char UCHAR;
-typedef byte byte;
-#define int int
 typedef short SHORT;
-typedef uint16 uint16;
-#define uint16 uint16
-#define long long
-typedef unsigned long ULONG;
-#define float float
 #define DOUBLE double
-#define void void
 #define CONST const
 
 enum {
@@ -95,7 +86,7 @@ enum {
 #define WF_STANDARD 16
 #define WF_ENHANCED 32
 
-inline UINT GetWinFlags() {
+inline unsigned int GetWinFlags() {
 	return 0;
 }
 
diff --git a/engines/bagel/hodjnpodj/life/game.cpp b/engines/bagel/hodjnpodj/life/game.cpp
index 1d9a952208a..83ab36886e3 100644
--- a/engines/bagel/hodjnpodj/life/game.cpp
+++ b/engines/bagel/hodjnpodj/life/game.cpp
@@ -684,7 +684,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *      [Discuss return value]
  *
  ****************************************************************/
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -701,7 +701,7 @@ void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	} // end switch
 }
 
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if ((nChar == 'e') && (nFlags & 0x2000)) {          // ALT-e - evolve
 		PostMessage(WM_COMMAND, IDC_EVOLVE, BN_CLICKED);
 	} else if ((nChar == 'q') && (nFlags & 0x2000)) {    // Alt-q - quit
@@ -713,7 +713,7 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	} // end if
 }
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// Handle keyboard input
 	//
 	switch (nChar) {
@@ -767,7 +767,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *      [Discuss return value]
  *
  ****************************************************************/
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 	CRect   cTestRect;
 
@@ -818,7 +818,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
  *      [Discuss return value]
  *
  ****************************************************************/
-void CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 	CRect   cTestRect;
 	CDC     *pDC;
@@ -868,7 +868,7 @@ void CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
  *      [Discuss return value]
  *
  ****************************************************************/
-void CMainWindow::OnTimer(UINT_PTR nIDEvent) {
+void CMainWindow::OnTimer(uintptr nIDEvent) {
 	CDC *pDC;
 
 	switch (nIDEvent) {
diff --git a/engines/bagel/hodjnpodj/life/game.h b/engines/bagel/hodjnpodj/life/game.h
index 0302ac2a81d..4e6ce323c5a 100644
--- a/engines/bagel/hodjnpodj/life/game.h
+++ b/engines/bagel/hodjnpodj/life/game.h
@@ -165,12 +165,12 @@ protected:
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonDblClk(UINT, CPoint);
-	afx_msg void OnSysKeyDown(UINT, UINT, UINT);
-	afx_msg void OnSysChar(UINT, UINT, UINT);
-	afx_msg void OnKeyDown(UINT, UINT, UINT);
-	afx_msg void OnTimer(UINT_PTR);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
+	afx_msg void OnSysChar(unsigned int, unsigned int, unsigned int);
+	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
+	afx_msg void OnTimer(uintptr);
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/life/life.cpp b/engines/bagel/hodjnpodj/life/life.cpp
index 2da5876c75d..1ea1dcaf560 100644
--- a/engines/bagel/hodjnpodj/life/life.cpp
+++ b/engines/bagel/hodjnpodj/life/life.cpp
@@ -174,7 +174,7 @@ CLife::~CLife() {
  *      [Discuss return value]
  *
  ****************************************************************/
-void CLife::change_board(UINT nFlags, CPoint point, CDC *pDC, BOOL bPlayingMeta) {
+void CLife::change_board(unsigned int nFlags, CPoint point, CDC *pDC, BOOL bPlayingMeta) {
 	int i;
 	CSprite *pSprite;
 	CRect   myArea;
diff --git a/engines/bagel/hodjnpodj/life/life.h b/engines/bagel/hodjnpodj/life/life.h
index a33c8503e06..fa4a27961dc 100644
--- a/engines/bagel/hodjnpodj/life/life.h
+++ b/engines/bagel/hodjnpodj/life/life.h
@@ -56,7 +56,7 @@ public:
 	CLife(CDC *pDC);
 	// Destructor
 	~CLife();
-	void    change_board(UINT, CPoint, CDC*, BOOL);
+	void    change_board(unsigned int, CPoint, CDC*, BOOL);
 	void    evolution(CDC *pDC);
 	void    NewGame(CDC *pDC);
 	void    DisplayMonth(int nMonth, CDC *pDC);
diff --git a/engines/bagel/hodjnpodj/life/usercfg.cpp b/engines/bagel/hodjnpodj/life/usercfg.cpp
index 696c0bab4a4..a2b098f1ec9 100644
--- a/engines/bagel/hodjnpodj/life/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/life/usercfg.cpp
@@ -42,7 +42,7 @@ extern BOOL bPrePlaceColonies,      // Whether they want to pre-place some
 
 extern CPalette *pGamePalette;      // Used everywhere for ref
 
-CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	: CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	m_DisplayRounds     = "";
 	m_DisplaySpeed      = "";
@@ -204,7 +204,7 @@ BOOL CUserCfgDlg::OnInitDialog() {
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
 
-void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	// TODO: Add your message handler code here and/or call default
 	CDC     *pDC;
 	BOOL    bAssertCheck;
diff --git a/engines/bagel/hodjnpodj/life/usercfg.h b/engines/bagel/hodjnpodj/life/usercfg.h
index 5d7a9b6247c..ab53aae2693 100644
--- a/engines/bagel/hodjnpodj/life/usercfg.h
+++ b/engines/bagel/hodjnpodj/life/usercfg.h
@@ -75,7 +75,7 @@ public:
 	            nLifeTemp;
 	BOOL        bPrePlaceTemp;
 
-	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_USERCFG);
+	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_USERCFG);
 
 	enum { IDD = IDD_USERCFG };
 	CScrollBar      m_ScrollVillages;
@@ -97,7 +97,7 @@ protected:
 	afx_msg void OnPrePlace();
 	afx_msg void OnPaint();
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
 	DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/mankala/btimeut.cpp b/engines/bagel/hodjnpodj/mankala/btimeut.cpp
index 80d0717c1d4..27c214fc40d 100644
--- a/engines/bagel/hodjnpodj/mankala/btimeut.cpp
+++ b/engines/bagel/hodjnpodj/mankala/btimeut.cpp
@@ -30,13 +30,13 @@ namespace Mankala {
 BOOL bTimeDelayPassed = TRUE ;
 
 //* CTimeUtil::DelayMs -- delay for specified # of milliseconds
-BOOL CTimeUtil::DelayMs(UINT uMs)
+BOOL CTimeUtil::DelayMs(unsigned int uMs)
 // uMs -- number of milliseconds to delay
 // returns: TRUE if error, FALSE otherwise
 {
 	JXENTER(CTimeUtil::DelayMs) ;
 	int iError = 0 ;        // error code
-	UINT uTimerId ;     // timer id returned by SetTimer
+	unsigned int uTimerId ;     // timer id returned by SetTimer
 //    MSG FAR * lpMsg ;     // message area storage
 
 //    RETURN(FALSE) ;   // ***************
@@ -64,8 +64,8 @@ cleanup:
 	RETURN(iError != 0) ;
 }
 
-void CTimeUtil::DelayMsCallback(HWND hWnd, UINT uMsg,
-                                UINT_PTR uTimerId, uint32 dwTime) {
+void CTimeUtil::DelayMsCallback(HWND hWnd, unsigned int uMsg,
+                                uintptr uTimerId, uint32 dwTime) {
 	JXENTER(::DelayMsCallback) ;
 	//int iError = 0 ;      // error code
 	bTimeDelayPassed = TRUE ;   // elapsed time passed
diff --git a/engines/bagel/hodjnpodj/mankala/btimeut.h b/engines/bagel/hodjnpodj/mankala/btimeut.h
index 16b24c356c4..cd74c7b3429 100644
--- a/engines/bagel/hodjnpodj/mankala/btimeut.h
+++ b/engines/bagel/hodjnpodj/mankala/btimeut.h
@@ -49,10 +49,10 @@ public:
 
 private:
 	//- DelayMs -- delay for specified # of milliseconds
-	BOOL DelayMs(UINT uMs) ;
+	BOOL DelayMs(unsigned int uMs) ;
 
 	static void DelayMsCallback(HWND /* hWnd */,
-		UINT /* uMsg */, UINT_PTR /* uTimerId */, uint32 /* dwTime */) ;
+		unsigned int /* uMsg */, uintptr /* uTimerId */, uint32 /* dwTime */) ;
 };
 
 
diff --git a/engines/bagel/hodjnpodj/mankala/mnk.cpp b/engines/bagel/hodjnpodj/mankala/mnk.cpp
index aee0b6ef67f..bdf5bef9228 100644
--- a/engines/bagel/hodjnpodj/mankala/mnk.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnk.cpp
@@ -405,7 +405,7 @@ BOOL CMnkWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *
  ****************************************************************/
 
-void CMnkWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMnkWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// TODO: Add your message handler code here and/or call default
 
 
@@ -413,7 +413,7 @@ void CMnkWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 
 }
 
-void CMnkWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMnkWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	int iRVal;
 
 	if (nChar == VK_F1) {
@@ -460,7 +460,7 @@ void CMnkWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *
  ****************************************************************/
 
-void CMnkWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMnkWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate game on ALT-Q
 	if ((nChar == 'q') && (nFlags & 0x2000))
 		PostMessage(WM_CLOSE, 0, 0) ; // same as clicking QUIT button
@@ -469,7 +469,7 @@ void CMnkWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMnkWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMnkWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate game on ALT-F4
 	if ((nChar == VK_F4) && (nFlags & 0x2000))
 		PostMessage(WM_CLOSE, 0, 0) ; // same as clicking QUIT button
@@ -506,7 +506,7 @@ void CMnkWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *
  ****************************************************************/
 
-void CMnkWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMnkWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	MFC::SetCursor(LoadCursor(nullptr, IDC_ARROW));
 
 	static int dxCursor = GetSystemMetrics(SM_CXCURSOR);        //cursor size.
@@ -577,7 +577,7 @@ void CMnkWindow::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-void CMnkWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMnkWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CRect   rectTemp;
 	CSprite *pSpriteGlobe, *pSpriteChair;
 	CDC     *pDC = nullptr;
@@ -732,7 +732,7 @@ void CMnkWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-void CMnkWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMnkWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 
 	CDC *pDC = nullptr;
 
@@ -785,27 +785,27 @@ void CMnkWindow::OnLButtonUp(UINT nFlags, CPoint point) {
 }
 
 
-void CMnkWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
+void CMnkWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMnkWindow::OnMButtonDown(UINT nFlags, CPoint point) {
+void CMnkWindow::OnMButtonDown(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMnkWindow::OnMButtonUp(UINT nFlags, CPoint point) {
+void CMnkWindow::OnMButtonUp(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMnkWindow::OnMButtonDblClk(UINT nFlags, CPoint point) {
+void CMnkWindow::OnMButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMnkWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMnkWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	if (nFlags & MK_CONTROL) {
 		gbTurnSoundsOff = !gbTurnSoundsOff; //F12 is pressed, toggle sounds ON/OFF.
 		WritePrivateProfileString("Mankala", "MuteCrab", gbTurnSoundsOff ? "1" : "0", INI_FILENAME);
@@ -814,11 +814,11 @@ void CMnkWindow::OnRButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-void CMnkWindow::OnRButtonUp(UINT nFlags, CPoint point) {
+void CMnkWindow::OnRButtonUp(unsigned int nFlags, CPoint point) {
 
 }
 
-void CMnkWindow::OnRButtonDblClk(UINT nFlags, CPoint point) {
+void CMnkWindow::OnRButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 
 }
@@ -856,7 +856,7 @@ void CMnkWindow::OnRButtonDblClk(UINT nFlags, CPoint point) {
  *
  ****************************************************************/
 
-void CMnkWindow::OnTimer(UINT_PTR nIDEvent) {
+void CMnkWindow::OnTimer(uintptr nIDEvent) {
 //   CDC    *m_xpcDC ;
 
 
diff --git a/engines/bagel/hodjnpodj/mankala/mnk.h b/engines/bagel/hodjnpodj/mankala/mnk.h
index f1c0e4e1666..4874c3bed92 100644
--- a/engines/bagel/hodjnpodj/mankala/mnk.h
+++ b/engines/bagel/hodjnpodj/mankala/mnk.h
@@ -63,7 +63,7 @@ const int MINSTRENGTH = 1, MAXSTRENGTH = 4 ;
 
 
 const int MAXTABLESTONES = 12 ; // configurations in best win table
-const ULONG MAXCONFIGS = 3000000L ; // # configurations in table
+const unsigned long MAXCONFIGS = 3000000L ; // # configurations in table
 
 
 const int BESTWINBITS = 5 ; // # bits per best win table entry
@@ -535,7 +535,7 @@ public: BOOL FAR PASCAL UserDialog(void) ;
 //- OptionsDialog -- call options dialog
 private: BOOL OptionsDialog(void) ;
 
-//private: BOOL CALLBACK ResetPitsDlgProc(HWND, UINT, WPARAM, LPARAM);
+//private: BOOL CALLBACK ResetPitsDlgProc(HWND, unsigned int, WPARAM, LPARAM);
 
 
 
@@ -560,22 +560,22 @@ protected:
 
 	//{{AFX_MSG( CMnkWindow )
 	afx_msg void OnPaint();
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnLButtonDblClk(UINT, CPoint);
-	afx_msg void OnMButtonDown(UINT, CPoint);
-	afx_msg void OnMButtonUp(UINT, CPoint);
-	afx_msg void OnMButtonDblClk(UINT, CPoint);
-	afx_msg void OnRButtonDown(UINT, CPoint);
-	afx_msg void OnRButtonUp(UINT, CPoint);
-	afx_msg void OnRButtonDblClk(UINT, CPoint);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnLButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnMButtonDown(unsigned int, CPoint);
+	afx_msg void OnMButtonUp(unsigned int, CPoint);
+	afx_msg void OnMButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnRButtonDown(unsigned int, CPoint);
+	afx_msg void OnRButtonUp(unsigned int, CPoint);
+	afx_msg void OnRButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnTimer(uintptr nIDEvent);
 	afx_msg void OnClose();
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
 	//}}AFX_MSG
 
 	DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/mankala/mnkopt.cpp b/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
index 3a5566c1b82..a85d13ad909 100644
--- a/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
@@ -103,7 +103,7 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CMnkUsr dialog
 
-CMnkUsr::CMnkUsr(CWnd *xpParent, CPalette *xpPalette, UINT nID)
+CMnkUsr::CMnkUsr(CWnd *xpParent, CPalette *xpPalette, unsigned int nID)
 	:  CBmpDialog(xpParent, xpPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	//{{AFX_DATA_INIT(CMnkUsr)
 	m_iUShells = 0;
@@ -229,7 +229,7 @@ BOOL CMnkUsr::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CBmpDialog::OnCommand(wParam, lParam);
 }
 
-void CMnkUsr::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* xpScrollBar) {
+void CMnkUsr::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* xpScrollBar) {
 //    int iId = xpScrollBar->GetDlgCtrlID() ;   // get id of control bar
 	int iValMin, iValMax, iValCur ; // min, max, current values
 
diff --git a/engines/bagel/hodjnpodj/mankala/mnkopt.h b/engines/bagel/hodjnpodj/mankala/mnkopt.h
index e597c6c555f..b5fefa58fba 100644
--- a/engines/bagel/hodjnpodj/mankala/mnkopt.h
+++ b/engines/bagel/hodjnpodj/mankala/mnkopt.h
@@ -83,7 +83,7 @@ class CMnkUsr : public CBmpDialog {
 // Construction
 public:
 	CMnkUsr(CWnd *xpParent = nullptr,
-	        CPalette *xpPalette = nullptr, UINT nID = IDD_MNK_USER) ;
+	        CPalette *xpPalette = nullptr, unsigned int nID = IDD_MNK_USER) ;
 	~CMnkUsr();     // destructor
 
 	CPalette *m_xpGamePalette ;
@@ -108,7 +108,7 @@ protected:
 
 	// Generated message map functions
 	//{{AFX_MSG(CMnkUsr)
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	virtual BOOL OnInitDialog() override;
 	afx_msg void OnPaint();
 //	afx_msg void OnKillfocusUShells();
diff --git a/engines/bagel/hodjnpodj/mazedoom/mod.cpp b/engines/bagel/hodjnpodj/mazedoom/mod.cpp
index 040e6b1fa07..7496e318386 100644
--- a/engines/bagel/hodjnpodj/mazedoom/mod.cpp
+++ b/engines/bagel/hodjnpodj/mazedoom/mod.cpp
@@ -92,7 +92,7 @@ BOOL        m_bIgnoreScrollClick;
 BOOL        _playing;
 BOOL        _gameOver = FALSE;
 POINT       _playerPos;
-UINT        m_nPlayerID = PODJ;         // Hodj = 0, Podj = 4 to Offset the Bitmap ID for player
+unsigned int        m_nPlayerID = PODJ;         // Hodj = 0, Podj = 4 to Offset the Bitmap ID for player
 
 int         _difficulty;
 int         _time,
@@ -103,8 +103,8 @@ int         tempTime;
 
 struct  TILE {          // Data type for each square of the underlying Grid of the Maze
 	POINT   m_nStart;   // Upper-left-hand corner where the bmp is to be drawn (24 X 24)
-	UINT    m_nWall;    // 0 = Path, 1 = Wall, 2 = Trap, etc...
-	UINT    m_nTrap;    // Index of trap bitmap to use for drawing
+	unsigned int    m_nWall;    // 0 = Path, 1 = Wall, 2 = Trap, etc...
+	unsigned int    m_nTrap;    // Index of trap bitmap to use for drawing
 	POINT   m_nDest;    // x,y Tile location of Trap exit point
 	BOOL    m_bHidden;  // 0 = Visible, 1 = Invisible
 } _mazeTile[NUM_COLUMNS][NUM_ROWS];
@@ -492,7 +492,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -508,7 +508,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CRect   rectTitle;
 
 	rectTitle.SetRect(NEWGAME_LOCATION_X, NEWGAME_LOCATION_Y,
@@ -535,7 +535,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -551,7 +551,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	CFrameWnd ::OnLButtonUp(nFlags, point);
 }
 
@@ -565,7 +565,7 @@ void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -581,7 +581,7 @@ void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	if (InArtRegion(point) && _playing && !_gameOver) {     // If the cursor is within the border
 		GetNewCursor();                                     //...and we're playing, update the cursor
 		if (nFlags & MK_LBUTTON) {                          // If the Left mouse button is down,
@@ -602,7 +602,7 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -618,7 +618,7 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 
 	CFrameWnd ::OnRButtonDown(nFlags, point);
 
@@ -628,11 +628,11 @@ void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
 // These functions are called when keyboard input generates a character.
 //
 
-void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CFrameWnd ::OnChar(nChar, nRepCnt, nFlags);     // default action
 }
 
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if ((nChar == 'q') && (nFlags & 0x2000)) {      // terminate app on ALT-q
 		if (pGameInfo->bPlayingMetagame)
 			pGameInfo->lScore = 0;
@@ -641,7 +641,7 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 		CFrameWnd::OnChar(nChar, nRepCnt, nFlags);  // default action
 }
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -658,7 +658,7 @@ void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	}
 }
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CPoint  NewPosition;
 	NewPosition = (*_playerSprite).GetPosition();
 
@@ -716,7 +716,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nIDEvent   The ID of the timer event activated
+ *      unsigned int nIDEvent   The ID of the timer event activated
  *
  *  IMPLICIT INPUT PARAMETERS:
  *
@@ -731,7 +731,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
  *      void
  *
  ****************************************************************/
-void CMainWindow::OnTimer(UINT_PTR nIDEvent) {
+void CMainWindow::OnTimer(uintptr nIDEvent) {
 	CDC     *pDC;
 	CSound  *pEffect = nullptr;
 	char    msg[64];
@@ -878,7 +878,7 @@ void CMainWindow::NewGame() {
  *
  *  FORMAL PARAMETERS:
  *
- *      UINT nFlags     Virtual key info
+ *      unsigned int nFlags     Virtual key info
  *      CPoint point    Location of cursor
  *
  *  IMPLICIT INPUT PARAMETERS:
@@ -903,7 +903,7 @@ void CMainWindow::MovePlayer(CPoint point) {
 	BOOL    bCollision = FALSE;
 	POINT   Delta;
 	POINT   Step;
-	UINT    nBmpID = IDB_HODJ_RIGHT;
+	unsigned int    nBmpID = IDB_HODJ_RIGHT;
 	auto *app = AfxGetApp();
 
 	if (_gameOver)
diff --git a/engines/bagel/hodjnpodj/mazedoom/mod.h b/engines/bagel/hodjnpodj/mazedoom/mod.h
index 63687813f1f..3038f2fb068 100644
--- a/engines/bagel/hodjnpodj/mazedoom/mod.h
+++ b/engines/bagel/hodjnpodj/mazedoom/mod.h
@@ -127,15 +127,15 @@ protected:
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnTimer(uintptr nIDEvent);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnRButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonUp(unsigned int nFlags, CPoint point);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
 	afx_msg void OnClose();
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/mazedoom/optndlg.cpp b/engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
index d8ce9ca4532..8046b1cd71f 100644
--- a/engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
@@ -178,7 +178,7 @@ void COptnDlg::OnDestroy(void) {
 }
 
 
-void COptnDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void COptnDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	int     pMin,
 	        pMax;
 	int     OldPos = pScrollBar->GetScrollPos();
diff --git a/engines/bagel/hodjnpodj/mazedoom/optndlg.h b/engines/bagel/hodjnpodj/mazedoom/optndlg.h
index a5c448245d1..599d5a4ac3a 100644
--- a/engines/bagel/hodjnpodj/mazedoom/optndlg.h
+++ b/engines/bagel/hodjnpodj/mazedoom/optndlg.h
@@ -63,7 +63,7 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(COptnDlg)
 	virtual BOOL OnInitDialog() override;
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
 	virtual void OnOK() override;
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp b/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
index 996c1e5de71..cdbb9bddea5 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
@@ -324,7 +324,7 @@ BOOL CBackpack::OnInitDialog() {
 }
 
 
-void CBackpack::OnActivate(UINT nState, CWnd *, BOOL /*bMinimized*/) {
+void CBackpack::OnActivate(unsigned int nState, CWnd *, BOOL /*bMinimized*/) {
 	BOOL    bUpdateNeeded;
 
 	switch (nState) {
@@ -534,7 +534,7 @@ void CBackpack::RefreshBackground(void) {
 }
 
 
-void CBackpack::OnShowWindow(BOOL bShow, UINT nStatus) {
+void CBackpack::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	CDialog::OnShowWindow(bShow, nStatus);
 
 	// TODO: Add your message handler code here
@@ -542,7 +542,7 @@ void CBackpack::OnShowWindow(BOOL bShow, UINT nStatus) {
 }
 
 
-void CBackpack::OnSize(UINT nType, int cx, int cy) {
+void CBackpack::OnSize(unsigned int nType, int cx, int cy) {
 	CDialog::OnSize(nType, cx, cy);
 
 	// TODO: Add your message handler code here
@@ -630,7 +630,7 @@ BOOL CBackpack::CreateWorkAreas(CDC *pDC) {
 }
 
 
-void CBackpack::OnMouseMove(UINT nFlags, CPoint point) {
+void CBackpack::OnMouseMove(unsigned int nFlags, CPoint point) {
 	HCURSOR hNewCursor = nullptr;
 	CWinApp *pMyApp = nullptr;
 	CRect   testRect;
@@ -701,7 +701,7 @@ void CBackpack::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-void CBackpack::OnLButtonDown(UINT nFlags, CPoint point) {
+void CBackpack::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	int         i;
 	CDC *pDC = nullptr;
 	CItem *pItem;
@@ -790,7 +790,7 @@ int CBackpack::SelectedItem(CPoint point) {
 }
 
 
-BOOL CBackpack::OnSetCursor(CWnd *pWnd, UINT /*nHitTest*/, UINT /*message*/) {
+BOOL CBackpack::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int /*message*/) {
 	if ((*pWnd).m_hWnd == (*this).m_hWnd)
 		return TRUE;
 	else
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/backpack.h b/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
index cc99b427efb..4bc7058d46a 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
@@ -111,12 +111,12 @@ protected:
 	virtual void OnCancel(void) override;
 	afx_msg void OnDestroy(void);
 	afx_msg void OnPaint(void);
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg BOOL OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
index 801fdb0f904..00fc0d47792 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
@@ -110,7 +110,7 @@ BOOL CBdbgMgr::TraceDestructor(const char *lpszName, void *lpLoc)
 }
 
 //* CBdbgMgr::DebugMessageBox --
-BOOL CBdbgMgr::DebugMessageBox(const char *lpszPrompt, UINT nType, UINT nIDPrompt)
+BOOL CBdbgMgr::DebugMessageBox(const char *lpszPrompt, unsigned int nType, unsigned int nIDPrompt)
 // lpszPrompt -- message string, starting with '~'
 // nType, nIDPrompt -- integer Common::sprintf_s substitutions
 // returns: TRUE if error, FALSE otherwise
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
index 1ad0d1331c6..68c06bd70bd 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
@@ -73,7 +73,7 @@ public:
 	BOOL TraceConstructor(const char *lpszName, void *lpLoc) ;
 	BOOL TraceDestructor(const char *lpszName, void *lpLoc) ;
 	BOOL DebugMessageBox(const char *lpszPrompt,
-	                     UINT nType, UINT nIDPrompt) ;
+	                     unsigned int nType, unsigned int nIDPrompt) ;
 	BOOL AddTraceObject(const char *lpszName, void *lpPtr) ;
 	BOOL TestTraceObject(const char *lpszName, void *lpPtr,
 	                     BOOL bMissing PDFT(FALSE)) ;
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
index ff8588466a6..750d6992b4a 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
@@ -44,8 +44,8 @@ uint32   GetPhysicalMemory(void);
 extern  CBfcMgr *lpMetaGameStruct;
 
 // age
-ULONG glOldest = 0xFFFFFFFF;
-ULONG glAge = 0xFFFFFFFF;
+unsigned long glOldest = 0xFFFFFFFF;
+unsigned long glAge = 0xFFFFFFFF;
 
 CBgbMgr *gpBgbMgr;
 
@@ -168,7 +168,7 @@ BOOL CBgbMgr::InitBitmapObject(CBgbObject *pBgbObject, XPSTR pszFileName) {
 				// animation sequence.
 				//
 				assert(pBgbObject->m_nCels > 0);
-				pBgbObject->m_nRepeat *= (UINT)pBgbObject->m_nCels;
+				pBgbObject->m_nRepeat *= (unsigned int)pBgbObject->m_nCels;
 				pBgbObject->m_nFreqCount = pBgbObject->m_nFreq - 1;
 
 				if ((pList = new CLList((CObject *)pBgbObject)) != nullptr) {
@@ -441,14 +441,14 @@ void CBgbMgr::CacheReleaseObject(CBgbObject *pBgbObject) {
 *
 *  SAMPLE USAGE:
 *      CacheOptimize(lReqSpace);
-*  ULONG lReqSpace;                     Ammount of requested free space
+*  unsigned long lReqSpace;                     Ammount of requested free space
 *
 *****************************************************************************/
-void CBgbMgr::CacheOptimize(ULONG lReqSpace) {
+void CBgbMgr::CacheOptimize(unsigned long lReqSpace) {
 	CBgbObject  *pBgbObject;
-	ULONG       lAvgAge;
+	unsigned long       lAvgAge;
 	int         nObjects;
-	ULONG       lSpace;
+	unsigned long       lSpace;
 
 	// There are no objects to flush
 	//
@@ -691,8 +691,8 @@ BOOL CBgbMgr::PaintBitmapObject(CBgbObject *pBgbObject, BOOL bPaint, CRect *pCli
 }
 
 
-ULONG Sqrt(ULONG x) {
-	ULONG num, lHigh, lLow, lSqr;
+unsigned long Sqrt(unsigned long x) {
+	unsigned long num, lHigh, lLow, lSqr;
 
 	lHigh = x;
 	lLow = 0;
@@ -758,7 +758,7 @@ BOOL CBgbMgr::AnimateSprite(CBgbObject *pBgbSprite, CPoint cOldPosition, CPoint
 	x = cNewPosition.x - cOldPosition.x;
 	y = cNewPosition.y - cOldPosition.y;
 
-	iSegments = (int)(Sqrt((ULONG)x * x + (ULONG)y * y) / 10 + 1);
+	iSegments = (int)(Sqrt((unsigned long)x * x + (unsigned long)y * y) / 10 + 1);
 
 	for (iK = 1; iK <= iSegments; ++iK) {
 
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgb.h b/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
index 87984965133..a7c4bebfcd2 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
@@ -107,7 +107,7 @@ public:
 	void CacheLoadObject(CBgbObject *);
 	void CacheReleaseObject(CBgbObject *);
 	void CacheFlush(void);
-	void CacheOptimize(ULONG);
+	void CacheOptimize(unsigned long);
 };
 
 
@@ -136,13 +136,13 @@ public:
 
 	int         m_nCels;                // number of cels in this cel strip
 	int         m_nZOrder;              // Sprite Z-Order
-	UINT        m_nFreq;                // How often Animation should start
-	UINT        m_nRepeat;              // Number of Paint cycles to perform
-	UINT        m_nFreqCount;
+	unsigned int        m_nFreq;                // How often Animation should start
+	unsigned int        m_nRepeat;              // Number of Paint cycles to perform
+	unsigned int        m_nFreqCount;
 	CRPoint     m_crPosition;           // relocatable position to paint bitmap
 	CSize       m_cSize;                // size of bitmap
 	CObject *m_pObject;              // can be CSprite or CBitmap...
-	ULONG       m_lAge;                 // age of this object
+	unsigned long       m_lAge;                 // age of this object
 	char        m_cEndData;
 
 public:
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgen.h b/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
index d82c92d82e5..3588e68c724 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgen.h
@@ -48,8 +48,6 @@ typedef int *XPINT ;
 typedef char *XPCHAR ;
 typedef void *XPVOID ;
 
-typedef unsigned long ULONG ;
-
 // RGB colors
 #define RGBCOLOR_RED        RGB(255,   0,   0)
 #define RGBCOLOR_GREEN      RGB(  0, 255,   0)
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
index 376c07cfe57..7bd602f8a21 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
@@ -297,7 +297,7 @@ cleanup:
 
 
 //* CBsuSet::OnScroll -- handle OnHScroll and OnVScroll messages
-BOOL CBsuSet::OnScroll(UINT nSBCode, UINT nPos, CScrollBar *, int iBarType)
+BOOL CBsuSet::OnScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *, int iBarType)
 // nSBCode -- SB_xxxx -- Windows scroll code
 // nPos -- position on scroll bar (SB_THUMBTRACT/SB_THUMBPOSITION)
 // xpScrollBar -- pointer to scroll bar control
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
index 23c8b46bd68..5319ccdff4f 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
@@ -113,7 +113,7 @@ public:
 	//  the clip rectangle to the specified region
 	BOOL PrepareDc(CDC *xpDc, BOOL bRelocatable PDFT(TRUE));
 	//- OnScroll -- handle OnHScroll and OnVScroll messages
-	BOOL OnScroll(UINT nSBCode, UINT nPos,
+	BOOL OnScroll(unsigned int nSBCode, unsigned int nPos,
 		CScrollBar *xpScrollBar, int iBarType PDFT(0));
 	//- GetBar -- get bsu scroll bar object
 	CBsuBar *GetBar(int iBarType);
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp b/engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
index 6eb77ad373a..ef720e29e10 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
@@ -30,17 +30,17 @@ namespace Metagame {
 BOOL bTimeDelayPassed = TRUE ;
 
 void CALLBACK DelayMsCallback(HWND /* hWnd */,
-                              UINT /* uMsg */, UINT /* uTimerId */, uint32 /* dwTime */);
+                              unsigned int /* uMsg */, unsigned int /* uTimerId */, uint32 /* dwTime */);
 
 
 //* CTimeUtil::DelayMs -- delay for specified # of milliseconds
-BOOL CTimeUtil::DelayMs(UINT uMs)
+BOOL CTimeUtil::DelayMs(unsigned int uMs)
 // uMs -- number of milliseconds to delay
 // returns: TRUE if error, FALSE otherwise
 {
 	JXENTER(CTimeUtil::DelayMs) ;
 	int iError = 0 ;        // error code
-	UINT uTimerId ;     // timer id returned by SetTimer
+	unsigned int uTimerId ;     // timer id returned by SetTimer
 
 	// set timer, and test for success
 	if ((uTimerId = SetTimer(nullptr, 0, uMs, DelayMsCallback)) == 0) {
@@ -66,7 +66,7 @@ cleanup:
 
 ///* DelayMsCallback -- SetTimer callback routine for DelayMs
 void CTimeUtil::DelayMsCallback(HWND /* hWnd */,
-                                UINT /* uMsg */, UINT_PTR /* uTimerId */, uint32 /* dwTime */)
+                                unsigned int /* uMsg */, uintptr /* uTimerId */, uint32 /* dwTime */)
 // hWnd -- handle of window (always nullptr in this case)
 // uMsg -- WM_TIMER message
 // uTimerId -- timer identifier
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/btimeut.h b/engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
index 70d5c2536c3..3634689d8bf 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
@@ -45,7 +45,7 @@ public:
 	}
 
 //- DelayMs -- delay for specified # of milliseconds
-	BOOL DelayMs(UINT uMs) ;
+	BOOL DelayMs(unsigned int uMs) ;
 
 private:
 	/**
@@ -55,8 +55,8 @@ private:
 	 * @param uTimerId  timer identifier
 	 * @param dwTime    current system time
 	 */
-	static void DelayMsCallback(HWND hWnd, UINT uMsg,
-	    UINT_PTR uTimerId, uint32 dwTime);
+	static void DelayMsCallback(HWND hWnd, unsigned int uMsg,
+	    uintptr uTimerId, uint32 dwTime);
 };
 
 } // namespace Metagame
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp b/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
index b3218e1e0cb..addb411b988 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
@@ -345,7 +345,7 @@ BOOL CNotebook::OnInitDialog() {
 }
 
 
-void CNotebook::OnActivate(UINT nState, CWnd *, BOOL /*bMinimized*/) {
+void CNotebook::OnActivate(unsigned int nState, CWnd *, BOOL /*bMinimized*/) {
 	BOOL    bUpdateNeeded;
 
 	switch (nState) {                                               // force a repaint if activated
@@ -597,7 +597,7 @@ void CNotebook::RefreshBackground(void) {
 }
 
 
-void CNotebook::OnShowWindow(BOOL bShow, UINT nStatus) {
+void CNotebook::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	CDialog::OnShowWindow(bShow, nStatus);
 
 	// TODO: Add your message handler code here
@@ -605,7 +605,7 @@ void CNotebook::OnShowWindow(BOOL bShow, UINT nStatus) {
 }
 
 
-void CNotebook::OnSize(UINT nType, int cx, int cy) {
+void CNotebook::OnSize(unsigned int nType, int cx, int cy) {
 	CDialog::OnSize(nType, cx, cy);
 
 	// TODO: Add your message handler code here
@@ -694,7 +694,7 @@ BOOL CNotebook::CreateWorkAreas(CDC *pDC) {
 }
 
 
-void CNotebook::OnMouseMove(UINT nFlags, CPoint point) {
+void CNotebook::OnMouseMove(unsigned int nFlags, CPoint point) {
 	HCURSOR hNewCursor = nullptr;
 	CWinApp *pMyApp = nullptr;
 
@@ -736,7 +736,7 @@ void CNotebook::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-void CNotebook::OnLButtonDown(UINT nFlags, CPoint point) {
+void CNotebook::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC *pDC = nullptr;
 	CSound *pSound;
 
@@ -782,7 +782,7 @@ void CNotebook::OnLButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-BOOL CNotebook::OnSetCursor(CWnd *pWnd, UINT /*nHitTest*/, UINT /*message*/) {
+BOOL CNotebook::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int /*message*/) {
 	if ((*pWnd).m_hWnd == (*this).m_hWnd)
 		return TRUE;
 	else
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/notebook.h b/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
index 74e99f36ecb..c2eb1df7acc 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
@@ -133,12 +133,12 @@ protected:
 	virtual void OnCancel(void) override;
 	afx_msg void OnDestroy(void);
 	afx_msg void OnPaint(void);
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg BOOL OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index 6b1636fade4..8fd132fd26d 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -171,7 +171,7 @@ byte     anBellCurve[BELLCURVE] = {
 
 struct CREDITS {
 	const char *m_pszCelFile;
-	UINT m_nDuration;
+	unsigned int m_nDuration;
 };
 
 static const CREDITS stCredits[MAX_CREDITS] = {
@@ -703,7 +703,7 @@ BOOL CHodjPodjWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CHodjPodjWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CHodjPodjWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	HCURSOR hNewCursor = nullptr;
 	CWinApp *pMyApp;
 
@@ -721,7 +721,7 @@ void CHodjPodjWindow::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-void CHodjPodjWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CHodjPodjWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	if (m_bInCredits) {
 		m_nFlags = CR_NEXT;
 	} else {
@@ -729,7 +729,7 @@ void CHodjPodjWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 	}
 }
 
-void CHodjPodjWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CHodjPodjWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	if (m_bInCredits) {
 		m_nFlags = CR_NEXT;
 	} else {
@@ -796,7 +796,7 @@ void CHodjPodjWindow::BlackScreen(void) {
 }
 
 
-void CHodjPodjWindow::OnActivate(UINT nState, CWnd *, BOOL) {
+void CHodjPodjWindow::OnActivate(unsigned int nState, CWnd *, BOOL) {
 	switch (nState) {
 	case WA_INACTIVE:
 		bActiveWindow = FALSE;
@@ -813,7 +813,7 @@ void CHodjPodjWindow::OnActivate(UINT nState, CWnd *, BOOL) {
 }
 
 
-void CHodjPodjWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CHodjPodjWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if (nChar == VK_ESCAPE) {
 		m_nFlags = CR_ESCAPE;
 	} else {
@@ -1592,7 +1592,7 @@ long CHodjPodjWindow::DetermineChallengeScore() {
 }
 
 
-void CHodjPodjWindow::OnParentNotify(UINT msg, LPARAM lParam) {
+void CHodjPodjWindow::OnParentNotify(unsigned int msg, LPARAM lParam) {
 	BOOL        bMainDlg = TRUE;
 	LPARAM      nGameReturn;
 
@@ -2101,7 +2101,7 @@ BOOL CHodjPodjWindow::Restore() {
 void CHodjPodjWindow::ShowCredits(void) {
 	MSG msg;
 	long lTimeElapsed, lStart;
-	ULONG lGoal, lWait;
+	unsigned long lGoal, lWait;
 	CDC *pDC;
 	int i;
 
@@ -2156,7 +2156,7 @@ void CHodjPodjWindow::ShowCredits(void) {
 			// pause for specified ammount of time less ammount used to pre-load
 			// next bitmap
 			//
-			lWait = (ULONG)max((long)stCredits[i].m_nDuration - lTimeElapsed, 0L);
+			lWait = (unsigned long)max((long)stCredits[i].m_nDuration - lTimeElapsed, 0L);
 
 			lGoal = lWait + GetTickCount();
 			while (lGoal > GetTickCount()) {
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
index 924949c7ee3..0836c565df6 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
@@ -64,7 +64,7 @@ class CHodjPodjWindow : public CFrameWnd {
 private:
 	CMovieWindow pMovie;
 	CBitmap *m_pCurrentBmp;
-	UINT m_nFlags;
+	unsigned int m_nFlags;
 	BOOL m_bInCredits;
 
 public:
@@ -120,14 +120,14 @@ protected:
 	afx_msg void OnPaint();
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
-	afx_msg void OnMouseMove(UINT, CPoint);
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnRButtonDown(UINT, CPoint);
+	afx_msg void OnMouseMove(unsigned int, CPoint);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnRButtonDown(unsigned int, CPoint);
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	afx_msg void OnParentNotify(UINT, LPARAM);
-	afx_msg void OnActivate(UINT, CWnd *, BOOL) override;
-	afx_msg void OnKeyDown(UINT, UINT, UINT);
+	afx_msg void OnParentNotify(unsigned int, LPARAM);
+	afx_msg void OnActivate(unsigned int, CWnd *, BOOL) override;
+	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
 	//}}AFX_MSG
 
 	DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
index 4d0e1374f56..adf169a2589 100644
--- a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
+++ b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
@@ -796,7 +796,7 @@ void CMainGTWindow::SplashScreen() {
 		}
 	} else {
 
-		UINT    nOldTextAlign;
+		unsigned int    nOldTextAlign;
 		char    cNextGame[64];
 		char    cLastGame[64];
 		int     nGameCode;
@@ -1047,23 +1047,23 @@ BOOL CMainGTWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return TRUE;
 }
 
-void CMainGTWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainGTWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CWnd::OnLButtonDown(nFlags, point);
 }
 
-void CMainGTWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainGTWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	CWnd::OnMouseMove(nFlags, point);
 }
 
-void CMainGTWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainGTWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	CWnd::OnLButtonUp(nFlags, point);
 }
 
-void CMainGTWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainGTWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CWnd::OnKeyDown(nChar, nRepCnt, nFlags);
 }
 
-void CMainGTWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainGTWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CRect   rTempRect;
 	char    cAlpha[27];
 	int     i;
@@ -1721,7 +1721,7 @@ BOOL CMainGTWindow::OnEraseBkgnd(CDC *pDC) {
 }
 
 
-void CMainGTWindow::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CMainGTWindow::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	BOOL    bUpdateNeeded;
 
 	switch (nState) {
diff --git a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
index 52f9464aac3..52fc2f81186 100644
--- a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
+++ b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
@@ -125,13 +125,13 @@ protected:
 	afx_msg void OnPaint();
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnMouseMove(UINT, CPoint);
-	afx_msg void OnKeyDown(UINT, UINT, UINT);
-	afx_msg void OnChar(UINT, UINT, UINT);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnMouseMove(unsigned int, CPoint);
+	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
+	afx_msg void OnChar(unsigned int, unsigned int, unsigned int);
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	afx_msg void OnActivate(UINT nState, CWnd   *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) override;
 	//}}AFX_MSG
 
 	DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp b/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
index 711030ff0c9..704573c5ae0 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
@@ -568,8 +568,8 @@ static const CEncounterTable Encounters[MG_ENC_COUNT] = {
  *      BOOL        bHodj           Flag to tell which player this is
  *      CInventory  *pInventory     pointer to the player's inventory object
  *      int         nNumSteps       Number of steps in the current move
- *      UINT        nPSector        Sector of player
- *      UINT        nOSector        Sector of opponent
+ *      unsigned int        nPSector        Sector of player
+ *      unsigned int        nOSector        Sector of opponent
  *      BOOL        bArray          Array of whether an encounter has been used already
  *
  * RETURN VALUE:
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
index 25e2bb40544..13bee71acae 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
@@ -178,7 +178,7 @@ BOOL CGtlApp::CallOnFileSave(void)
 
 //* CGtlApp::DoMessageBox -- override of CWinApp function to
 //              display message box messages
-int CGtlApp::DoMessageBox(const char *lpszPrompt, UINT nType, UINT nIDPrompt)
+int CGtlApp::DoMessageBox(const char *lpszPrompt, unsigned int nType, unsigned int nIDPrompt)
 // returns: TRUE if error, FALSE otherwise
 {
 	JXENTER(CGtlApp::DoMessageBox) ;
@@ -253,8 +253,8 @@ void CGtlApp::focusChange(CWnd *oldFocus, CWnd *newFocus) {
 // (calls to AfxRegisterVBEvent will be placed here by ClassWizard)
 
 //{{AFX_VBX_REGISTER_MAP()
-//      UINT NEAR VBN_SPINDOWN = AfxRegisterVBEvent("SPINDOWN");
-//      UINT NEAR VBN_SPINUP = AfxRegisterVBEvent("SPINUP");
+//      unsigned int NEAR VBN_SPINDOWN = AfxRegisterVBEvent("SPINDOWN");
+//      unsigned int NEAR VBN_SPINUP = AfxRegisterVBEvent("SPINUP");
 //}}AFX_VBX_REGISTER_MAP
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtl.h b/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
index f5a7f65d8e4..6f1311ddda5 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
@@ -84,7 +84,7 @@ public:
 	//- DoMessageBox -- override of CWinApp function to
 	//              display message box messages
 	virtual int DoMessageBox(const char *lpszPrompt,
-	                         UINT nType, UINT nIDPrompt) ;
+	                         unsigned int nType, unsigned int nIDPrompt) ;
 	BOOL OnIdle(long lCount) override;
 
 private:
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
index 7a0fa5b546b..7c57f205b95 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
@@ -294,8 +294,8 @@ public:
 
 	CSound *m_pThemeSound;              // this character's MIDI theme song info
 	const char *m_pszThemeFile;
-	UINT    m_nThemeStart;
-	UINT    m_nThemeEnd;
+	unsigned int    m_nThemeStart;
+	unsigned int    m_nThemeEnd;
 
 	const char *m_pszStarsFile;             // cel strip for stars animation
 
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
index 4bdd8d4c3c9..8de99b4b1a6 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
@@ -424,7 +424,7 @@ void CGtlFrame::OnCallExit() {
 }
 
 
-void CGtlFrame::OnSysCommand(UINT nID, LPARAM lParam) {
+void CGtlFrame::OnSysCommand(unsigned int nID, LPARAM lParam) {
 	if ((nID & 0xfff0) != SC_SCREENSAVE)
 		CWnd::OnSysCommand(nID, lParam);
 }
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
index 48180a12e90..ae54299e1bb 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
@@ -81,7 +81,7 @@ protected:
 	afx_msg void OnCallExit();
 	afx_msg BOOL OnEraseBkgnd(CDC *);
 	afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
-	afx_msg void OnSysCommand(UINT, LPARAM);
+	afx_msg void OnSysCommand(unsigned int, LPARAM);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
index 3c641f5288d..6e7837a1ca0 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
@@ -116,7 +116,7 @@ void CGtlData::CreateOffScreenBmp(void) {
 	if (m_pOffScreenBmp == nullptr) {
 
 		if ((m_cBgbMgr.m_xpGamePalette != nullptr) &&
-		        (GetFreeSpace(0) >= (ULONG)250000) && (GlobalCompact(0) >= (ULONG)500000)) {
+		        (GetFreeSpace(0) >= (unsigned long)250000) && (GlobalCompact(0) >= (unsigned long)500000)) {
 
 			if ((m_pOffScreenBmp = new CBitmap) != nullptr) {
 
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
index bdabdf9b778..ef4038c9dc3 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
@@ -301,7 +301,7 @@ BOOL CGtlView::OnEraseBkgnd(CDC *) {
 	return TRUE ; // this tells MFC that the background has been erased
 }
 
-void CGtlView::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CGtlView::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -317,7 +317,7 @@ void CGtlView::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	}
 }
 
-void CGtlView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CGtlView::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	JXENTER(CGtlView::OnKeyDown) ;
 	CGtlDoc *xpDoc = GetDocument() ;
 	BOOL    bJunk, bAnimations;
@@ -410,7 +410,7 @@ void CGtlView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	JXELEAVE(CGtlView::OnKeyDown) ;
 }
 
-void CGtlView::OnLButtonDown(UINT nFlags, CPoint cMousePoint) {
+void CGtlView::OnLButtonDown(unsigned int nFlags, CPoint cMousePoint) {
 	CGtlDoc* xpDoc = GetDocument() ;
 
 	xpDoc->m_xpGtlData->AcceptClick(this, cMousePoint, CLICK_LDOWN) ;
@@ -421,7 +421,7 @@ void CGtlView::OnLButtonDown(UINT nFlags, CPoint cMousePoint) {
 	CView::OnLButtonDown(nFlags, cMousePoint);
 }
 
-void CGtlView::OnLButtonUp(UINT nFlags, CPoint cMousePoint) {
+void CGtlView::OnLButtonUp(unsigned int nFlags, CPoint cMousePoint) {
 	CGtlDoc* xpDoc = GetDocument() ;
 
 	xpDoc->m_xpGtlData->AcceptClick(this, cMousePoint, CLICK_LUP) ;
@@ -430,14 +430,14 @@ void CGtlView::OnLButtonUp(UINT nFlags, CPoint cMousePoint) {
 		CView::OnLButtonUp(nFlags, cMousePoint);
 }
 
-void CGtlView::OnRButtonDown(UINT nFlags, CPoint cMousePoint) {
+void CGtlView::OnRButtonDown(unsigned int nFlags, CPoint cMousePoint) {
 	CGtlDoc* xpDoc = GetDocument() ;
 	xpDoc->m_xpGtlData->AcceptClick(this, cMousePoint, CLICK_RDOWN) ;
 
 	CView::OnRButtonDown(nFlags, cMousePoint);
 }
 
-void CGtlView::OnRButtonUp(UINT nFlags, CPoint cMousePoint) {
+void CGtlView::OnRButtonUp(unsigned int nFlags, CPoint cMousePoint) {
 	CGtlDoc* xpDoc = GetDocument() ;
 	xpDoc->m_xpGtlData->AcceptClick(this, cMousePoint, CLICK_RUP) ;
 
@@ -489,7 +489,7 @@ void CGtlView::FlushInputEvents(void) {
 
 extern CBgbMgr *gpBgbMgr;
 
-void CGtlView::OnTimer(UINT_PTR nEventID) {
+void CGtlView::OnTimer(uintptr nEventID) {
 	// there can only be one animation timer going
 	assert(nEventID == ANIMATION_TIMER_ID);
 
@@ -500,7 +500,7 @@ void CGtlView::OnTimer(UINT_PTR nEventID) {
 }
 
 
-BOOL CGtlView::OnSetCursor(CWnd *pWnd, UINT /*nHitTest*/, UINT /*message*/) {
+BOOL CGtlView::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int /*message*/) {
 	if ((*pWnd).m_hWnd == (*this).m_hWnd)
 		return TRUE;
 	else
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.h b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
index 37cf2b255b8..6b775a67a09 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
@@ -86,28 +86,28 @@ public:
 // Generated message map functions
 protected:
 	//{{AFX_MSG(CGtlView)
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnRButtonDblClk(UINT nFlags, CPoint point);
-	afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnKeyUp(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnLButtonDblClk(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonUp(unsigned int nFlags, CPoint point);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnRButtonDblClk(unsigned int nFlags, CPoint point);
+	afx_msg void OnRButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnRButtonUp(unsigned int nFlags, CPoint point);
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
 	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
 	afx_msg void OnSetFocus(CWnd* pOldWnd);
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
-	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
+	afx_msg void OnVScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnDestroy();
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
-	afx_msg void OnTimer(UINT_PTR);
-	afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message);
+	afx_msg void OnTimer(uintptr);
+	afx_msg BOOL OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp b/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
index 370ccba4bd5..4a16e1d4126 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
@@ -338,7 +338,7 @@ BOOL CPawnShop::OnInitDialog() {
 }
 
 
-void CPawnShop::OnActivate(UINT nState, CWnd *, BOOL /*bMinimized*/) {
+void CPawnShop::OnActivate(unsigned int nState, CWnd *, BOOL /*bMinimized*/) {
 	BOOL    bUpdateNeeded;
 
 	switch (nState) {
@@ -570,7 +570,7 @@ void CPawnShop::RefreshBackground(void) {
 }
 
 
-void CPawnShop::OnShowWindow(BOOL bShow, UINT nStatus) {
+void CPawnShop::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	CDialog::OnShowWindow(bShow, nStatus);
 
 	// TODO: Add your message handler code here
@@ -578,7 +578,7 @@ void CPawnShop::OnShowWindow(BOOL bShow, UINT nStatus) {
 }
 
 
-void CPawnShop::OnSize(UINT nType, int cx, int cy) {
+void CPawnShop::OnSize(unsigned int nType, int cx, int cy) {
 	CDialog::OnSize(nType, cx, cy);
 
 	// TODO: Add your message handler code here
@@ -677,7 +677,7 @@ BOOL CPawnShop::CreateWorkAreas(CDC *pDC) {
 }
 
 
-void CPawnShop::OnMouseMove(UINT nFlags, CPoint point) {
+void CPawnShop::OnMouseMove(unsigned int nFlags, CPoint point) {
 	HCURSOR hNewCursor = nullptr;
 	CWinApp *pMyApp = nullptr;
 	CRect   testRect;
@@ -749,7 +749,7 @@ void CPawnShop::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-void CPawnShop::OnLButtonDown(UINT nFlags, CPoint point) {
+void CPawnShop::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	int     i;
 	CDC     *pDC = nullptr;
 	CItem   *pItem;
@@ -832,7 +832,7 @@ int CPawnShop::SelectedItem(CPoint point) {
 }
 
 
-BOOL CPawnShop::OnSetCursor(CWnd *pWnd, UINT /*nHitTest*/, UINT /*message*/) {
+BOOL CPawnShop::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int /*message*/) {
 	if ((*pWnd).m_hWnd == (*this).m_hWnd)
 		return TRUE;
 	else
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/pawn.h b/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
index a7d1a75c98f..c9987471303 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
@@ -115,12 +115,12 @@ protected:
 	virtual void OnCancel(void) override;
 	afx_msg void OnDestroy(void);
 	afx_msg void OnPaint(void);
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg BOOL OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp b/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
index 26fdd329ff8..14e74e322db 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
@@ -356,7 +356,7 @@ BOOL CRules::OnInitDialog() {
 }
 
 
-void CRules::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CRules::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	BOOL    bUpdateNeeded;
 
 	switch (nState) {
@@ -874,8 +874,8 @@ void CRules::UpdateScroll(int nPage) {
 
 void CRules::WritePage(CDC *pDC, int nPage) {
 	int         i, n, x, y;
-	UINT        nCropped = 0;
-	UINT        nCount = 0;
+	unsigned int        nCropped = 0;
+	unsigned int        nCount = 0;
 	char        chInBuf[TEXT_BUFFER_SIZE];
 	CFont       *pFontOld = nullptr;
 	CSize       textInfo;
@@ -1091,7 +1091,7 @@ void CRules::UpdateMore(CDC *pDC) {
 }
 
 
-void CRules::OnShowWindow(BOOL bShow, UINT nStatus) {
+void CRules::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	CDialog::OnShowWindow(bShow, nStatus);
 
 	// TODO: Add your message handler code here
@@ -1099,7 +1099,7 @@ void CRules::OnShowWindow(BOOL bShow, UINT nStatus) {
 }
 
 
-void CRules::OnSize(UINT nType, int cx, int cy) {
+void CRules::OnSize(unsigned int nType, int cx, int cy) {
 	CDialog::OnSize(nType, cx, cy);
 
 	// TODO: Add your message handler code here
@@ -1382,7 +1382,7 @@ CBitmap *CRules::CreateScrollBitmap(CDC *pDC, CDibDoc *pDibDoc, CPalette *pPalet
 }
 
 
-void CRules::OnLButtonDown(UINT nFlags, CPoint point) {
+void CRules::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	if (!bActiveWindow)
 		return;
 
@@ -1397,7 +1397,7 @@ void CRules::OnLButtonDown(UINT nFlags, CPoint point) {
 }
 
 
-void CRules::OnMouseMove(UINT nFlags, CPoint point) {
+void CRules::OnMouseMove(unsigned int nFlags, CPoint point) {
 	HCURSOR hNewCursor = nullptr;
 	CWinApp *pMyApp;
 
@@ -1428,7 +1428,7 @@ void CRules::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-BOOL CRules::OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) {
+BOOL CRules::OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message) {
 	if ((*pWnd).m_hWnd == (*this).m_hWnd)
 		return TRUE;
 	else
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/rules.h b/engines/bagel/hodjnpodj/metagame/gtl/rules.h
index ba027849b98..af384dcf9af 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/rules.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/rules.h
@@ -99,12 +99,12 @@ protected:
 	virtual void OnCancel(void) override;
 	afx_msg void OnDestroy(void);
 	afx_msg void OnPaint(void);
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg BOOL OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
index d30a4aef6df..37d282f2a35 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
@@ -339,7 +339,7 @@ BOOL CGeneralStore::OnInitDialog() {
 }
 
 
-void CGeneralStore::OnActivate(UINT nState, CWnd *, BOOL /*bMinimized*/) {
+void CGeneralStore::OnActivate(unsigned int nState, CWnd *, BOOL /*bMinimized*/) {
 	BOOL    bUpdateNeeded;
 
 	switch (nState) {
@@ -561,7 +561,7 @@ void CGeneralStore::RefreshBackground(void) {
 }
 
 
-void CGeneralStore::OnShowWindow(BOOL bShow, UINT nStatus) {
+void CGeneralStore::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	CDialog::OnShowWindow(bShow, nStatus);
 
 	// TODO: Add your message handler code here
@@ -569,7 +569,7 @@ void CGeneralStore::OnShowWindow(BOOL bShow, UINT nStatus) {
 }
 
 
-void CGeneralStore::OnSize(UINT nType, int cx, int cy) {
+void CGeneralStore::OnSize(unsigned int nType, int cx, int cy) {
 	CDialog::OnSize(nType, cx, cy);
 
 	// TODO: Add your message handler code here
@@ -668,7 +668,7 @@ BOOL CGeneralStore::CreateWorkAreas(CDC *pDC) {
 }
 
 
-void CGeneralStore::OnMouseMove(UINT nFlags, CPoint point) {
+void CGeneralStore::OnMouseMove(unsigned int nFlags, CPoint point) {
 	HCURSOR hNewCursor = nullptr;
 	CWinApp *pMyApp = nullptr;
 	CRect   testRect;
@@ -737,7 +737,7 @@ void CGeneralStore::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-void CGeneralStore::OnLButtonDown(UINT nFlags, CPoint point) {
+void CGeneralStore::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	int     i;
 	int     nPrice;
 	CDC     *pDC = nullptr;
@@ -837,7 +837,7 @@ int CGeneralStore::SelectedItem(CPoint point) {
 }
 
 
-BOOL CGeneralStore::OnSetCursor(CWnd *pWnd, UINT /*nHitTest*/, UINT /*message*/) {
+BOOL CGeneralStore::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int /*message*/) {
 	if ((*pWnd).m_hWnd == (*this).m_hWnd)
 		return TRUE;
 	else
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/store.h b/engines/bagel/hodjnpodj/metagame/gtl/store.h
index 98581fc3b8f..6b49963c58b 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/store.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/store.h
@@ -116,12 +116,12 @@ protected:
 	virtual void OnCancel(void) override;
 	afx_msg void OnDestroy(void);
 	afx_msg void OnPaint(void);
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg BOOL OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
+	afx_msg void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) override;
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h b/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
index 97ed55e8ebb..285fdedafa7 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
@@ -106,7 +106,7 @@ struct PLAYER_INFO {
  * Structure for the save game file format
  */
 struct SAVEGAME_INFO {
-	ULONG   m_lBoffoGameID = 0;
+	unsigned long   m_lBoffoGameID = 0;
 	uint16  m_nFixedRecordSize = 0;
 	BOOL    m_bUsed = false;
 	//	char    m_szSaveGameDescription[40];    // description of this saved game
diff --git a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
index 29a1a7995f2..5ae081a9612 100644
--- a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
+++ b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
@@ -337,7 +337,7 @@ BOOL CMainZoomWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return TRUE;
 }
 
-void CMainZoomWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainZoomWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	int x; // counter
 
 	for (x = 0; x < 21; x++) {
@@ -355,7 +355,7 @@ void CMainZoomWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonDown(nFlags, point);
 }
 
-void CMainZoomWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainZoomWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	int x;
 
 	for (x = 0; x < 21; x++) {
@@ -404,11 +404,11 @@ void CMainZoomWindow::OnMouseMove(UINT nFlags, CPoint point) {
 	CWnd::OnMouseMove(nFlags, point);
 }
 
-void CMainZoomWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainZoomWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	CWnd::OnLButtonUp(nFlags, point);
 }
 
-void CMainZoomWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainZoomWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 
 	switch (nChar) {
 	case VK_ESCAPE:
@@ -424,7 +424,7 @@ void CMainZoomWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	return;
 }
 
-void CMainZoomWindow::OnTimer(UINT_PTR nWhichTimer) {
+void CMainZoomWindow::OnTimer(uintptr nWhichTimer) {
 	return;
 }
 
@@ -463,7 +463,7 @@ BOOL CMainZoomWindow::OnEraseBkgnd(CDC *pDC) {
 }
 
 
-void CMainZoomWindow::OnActivate(UINT nState, CWnd  *pWndOther, BOOL bMinimized) {
+void CMainZoomWindow::OnActivate(unsigned int nState, CWnd  *pWndOther, BOOL bMinimized) {
 	BOOL    bUpdateNeeded;
 
 	switch (nState) {
diff --git a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.h b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.h
index 48df56902fd..89a908ca565 100644
--- a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.h
+++ b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.h
@@ -74,13 +74,13 @@ protected:
 	afx_msg void OnPaint();
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
-	afx_msg void OnTimer(UINT_PTR);
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnMouseMove(UINT, CPoint);
-	afx_msg void OnKeyDown(UINT, UINT, UINT);
+	afx_msg void OnTimer(uintptr);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnMouseMove(unsigned int, CPoint);
+	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	afx_msg void OnActivate(UINT nState, CWnd   *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) override;
 	//}}AFX_MSG
 
 	DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/novacancy/main.cpp b/engines/bagel/hodjnpodj/novacancy/main.cpp
index 6a1011c6d53..2b25052ad55 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.cpp
+++ b/engines/bagel/hodjnpodj/novacancy/main.cpp
@@ -223,7 +223,7 @@ CMainWindow::CMainWindow(void) {
 	if (errCode == ERR_NONE) {
 
 		// seed the random number generator
-		//srand((UINT)timeGetTime());
+		//srand((unsigned int)timeGetTime());
 
 		//       begin playing bckgnd music when the game begins
 		if (pGameParams->bMusicEnabled) {
@@ -552,8 +552,8 @@ void CMainWindow::PlayGame() {
 
 		AnimateDice();
 #pragma warning(disable: 4135)
-		m_LDie = (byte)(((uint32)(UINT)brand() * 6L) / ((uint32)(UINT)RAND_MAX + 1L)) + 1;
-		m_RDie = (byte)(((uint32)(UINT)brand() * 6L) / ((uint32)(UINT)RAND_MAX + 1L)) + 1;
+		m_LDie = (byte)(((uint32)(unsigned int)brand() * 6L) / ((uint32)(unsigned int)RAND_MAX + 1L)) + 1;
+		m_RDie = (byte)(((uint32)(unsigned int)brand() * 6L) / ((uint32)(unsigned int)RAND_MAX + 1L)) + 1;
 #pragma warning(default: 4135)
 		PaintMaskedBitmap(pDC, m_pGamePalette, pCRDieBmp[m_RDie], \
 		                  m_rRDie.left, m_rRDie.top, (int) m_rRDie.Width(), (int) m_rRDie.Height());
@@ -621,7 +621,7 @@ void CMainWindow::GameReset(void) {
 *
 ***********************************************************************************************************************************
 */
-void CMainWindow::OnMouseMove(UINT, CPoint) {
+void CMainWindow::OnMouseMove(unsigned int, CPoint) {
 	SetCursor(LoadCursor(nullptr, IDC_ARROW));
 }
 
@@ -663,7 +663,7 @@ void CMainWindow::OnMouseMove(UINT, CPoint) {
 ***********************************************************************************************************************************
 */
 
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	short i,
 	      iDoor;
 	short jj;
@@ -800,9 +800,9 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 
 				/* randomise throws */
 #pragma warning(disable: 4135)
-				V = (uint32)((UINT)RAND_MAX + 1);
-				m_LDie = (byte)(((uint32)(UINT)brand() * 6L) / V) +1;                                    //  left Die
-				m_RDie = m_bOneDieCase ? 0 : (byte)(((uint32)(UINT)brand() * 6) / V) +1;       //    right Die
+				V = (uint32)((unsigned int)RAND_MAX + 1);
+				m_LDie = (byte)(((uint32)(unsigned int)brand() * 6L) / V) +1;                                    //  left Die
+				m_RDie = m_bOneDieCase ? 0 : (byte)(((uint32)(unsigned int)brand() * 6) / V) +1;       //    right Die
 #pragma warning(default: 4135)
 
 				pDC = GetDC();
@@ -1051,7 +1051,7 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 *
 ***********************************************************************************************************************************
 */
-void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	short i;
 	int         xx,
 	            yy;
@@ -1166,7 +1166,7 @@ void CMainWindow::DeleteSprite(CSprite *pSprite) {
 
 
 
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// Terminate app on ALT_Q
 	if ((nChar == 'q') && (nFlags & 0x2000)) {
 
@@ -1182,7 +1182,7 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 
 
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -1199,7 +1199,7 @@ void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 
 
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// Handle keyboard input
 	//
 
@@ -1243,7 +1243,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMainWindow::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CMainWindow::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	if (!bMinimized) {
 		switch (nState) {
 		case WA_ACTIVE:
@@ -1804,10 +1804,10 @@ void CMainWindow::AnimateDice(void) {
 *   Retrieves a string in a static buffer from a resource object.
 *
 *   CALLING SEQUENCE:
-*   char* GetStringFromResource(UINT nResourceID)
+*   char* GetStringFromResource(unsigned int nResourceID)
 *
 *   FORMAL PARAMETERS:
-*   UINT    nID     The ID of the string resource from the resource file.
+*   unsigned int    nID     The ID of the string resource from the resource file.
 *
 *   IMPLICIT INPUT PARAMETERS:
 *   static szBuffer[ ], the buffer for  storing the string.
@@ -1823,7 +1823,7 @@ void CMainWindow::AnimateDice(void) {
 ****************************************************************************************************************
 */
 
-char *GetStringFromResource(UINT nID) {
+char *GetStringFromResource(unsigned int nID) {
 	static char szBuffer[256];
 
 	if (LoadString(AfxGetResourceHandle(), nID, szBuffer, 256))
diff --git a/engines/bagel/hodjnpodj/novacancy/main.h b/engines/bagel/hodjnpodj/novacancy/main.h
index 6e717375b5a..7bff4a1a796 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.h
+++ b/engines/bagel/hodjnpodj/novacancy/main.h
@@ -34,7 +34,7 @@ namespace Bagel {
 namespace HodjNPodj {
 namespace NoVacancy {
 
-char *GetStringFromResource(UINT);
+char *GetStringFromResource(unsigned int);
 
 class CMainWindow : public CFrameWnd {
 public:
@@ -54,14 +54,14 @@ protected:
 	void        DeleteSprite(CSprite *);
 
 	void        OnPaint(void);
-	void        OnTimer(UINT_PTR);
-	void        OnMouseMove(UINT, CPoint);
-	virtual void        OnLButtonDown(UINT, CPoint);
-	virtual void        OnRButtonDown(UINT, CPoint);
-	void        OnSysChar(UINT, UINT, UINT);
-	virtual  void        OnSysKeyDown(UINT, UINT, UINT);
-	virtual void        OnKeyDown(UINT, UINT, UINT);
-	void        OnActivate(UINT, CWnd *, BOOL) override;
+	void        OnTimer(uintptr);
+	void        OnMouseMove(unsigned int, CPoint);
+	virtual void        OnLButtonDown(unsigned int, CPoint);
+	virtual void        OnRButtonDown(unsigned int, CPoint);
+	void        OnSysChar(unsigned int, unsigned int, unsigned int);
+	virtual  void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
+	virtual void        OnKeyDown(unsigned int, unsigned int, unsigned int);
+	void        OnActivate(unsigned int, CWnd *, BOOL) override;
 	void        OnClose(void);
 	virtual LRESULT     OnMCINotify(WPARAM, LPARAM);
 	virtual LRESULT     OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/packrat/dialogs.h b/engines/bagel/hodjnpodj/packrat/dialogs.h
index 0cdf98378d3..36d089d0a23 100644
--- a/engines/bagel/hodjnpodj/packrat/dialogs.h
+++ b/engines/bagel/hodjnpodj/packrat/dialogs.h
@@ -45,7 +45,7 @@ private:
 	CRect   rectDisplayLives;
 
 public:
-	CPackRatOptDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_MINIOPTIONS_DIALOG);
+	CPackRatOptDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MINIOPTIONS_DIALOG);
 	void SetInitialOptions(int = 1, int = 1);    // Sets the private members
 	void ClearDialogImage();
 	BOOL OnInitDialog() override;
@@ -55,7 +55,7 @@ protected:
 	virtual void OnCancel(void) override;
 	virtual void OnOK(void) override;
 	virtual BOOL OnCommand(WPARAM, LPARAM) override;
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
 	//}}AFX_MSG
@@ -72,7 +72,7 @@ private:
 	int     m_nLevel;
 
 public:
-	CMsgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_MESSAGEBOX);
+	CMsgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MESSAGEBOX);
 	void SetInitialOptions(int, long, int = 0);  // Sets the private members
 	void ClearDialogImage();
 	BOOL OnInitDialog() override;
diff --git a/engines/bagel/hodjnpodj/packrat/msgdlg.cpp b/engines/bagel/hodjnpodj/packrat/msgdlg.cpp
index 766618987eb..cf37f137e85 100644
--- a/engines/bagel/hodjnpodj/packrat/msgdlg.cpp
+++ b/engines/bagel/hodjnpodj/packrat/msgdlg.cpp
@@ -60,7 +60,7 @@ CColorButton    *pMsgOKButton = nullptr;
  *      n/a
  *
  ****************************************************************/
-CMsgDlg::CMsgDlg(CWnd *pParent, CPalette *pPalette, UINT nID) :  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
+CMsgDlg::CMsgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID) :  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	pPackRatOptPalette = pPalette;
 	m_nWhichMsg = 1;
 	m_lCurrentScore = 0L;
diff --git a/engines/bagel/hodjnpodj/packrat/optdlg.cpp b/engines/bagel/hodjnpodj/packrat/optdlg.cpp
index 12fb0c9f896..f81b3b8e35e 100644
--- a/engines/bagel/hodjnpodj/packrat/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/packrat/optdlg.cpp
@@ -62,7 +62,7 @@ CColorButton    *pPRCancelButton = nullptr;
  *      n/a
  *
  ****************************************************************/
-CPackRatOptDlg::CPackRatOptDlg(CWnd *pParent, CPalette *pPalette, UINT nID) :
+CPackRatOptDlg::CPackRatOptDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID) :
 		CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP"),
 		rectDisplayLevel(43, 60, 174, 72),
 		rectDisplayLives(43, 101, 174, 113) {
@@ -324,7 +324,7 @@ void CPackRatOptDlg::OnPaint(void) {
  *      n/a
  *
  ****************************************************************/
-void CPackRatOptDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void CPackRatOptDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	int     oldAmnt = 0;
 	int     newAmnt = 0;
 	CDC     *pDC;
diff --git a/engines/bagel/hodjnpodj/packrat/packrat.cpp b/engines/bagel/hodjnpodj/packrat/packrat.cpp
index cbb5c9a7275..d77f844ce25 100644
--- a/engines/bagel/hodjnpodj/packrat/packrat.cpp
+++ b/engines/bagel/hodjnpodj/packrat/packrat.cpp
@@ -181,7 +181,7 @@ BOOL    bFlashTurtle;
 int     anReleaseTurtleCount[4];
 
 BOOL    bUseJoyStick;
-UINT    awJoyCenter[2];
+unsigned int    awJoyCenter[2];
 
 int     nNumOfBGKilled;
 int     nStartingLives;
@@ -439,8 +439,8 @@ CMainPackRatWindow::CMainPackRatWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStru
 		bUseJoyStick = TRUE;
 		joySetThreshold(JOYSTICKID1, 2000);
 		joyGetPos(JOYSTICKID1, &joyInfo);
-		awJoyCenter[0] = (UINT)joyInfo.wXpos;
-		awJoyCenter[1] = (UINT)joyInfo.wYpos;
+		awJoyCenter[0] = (unsigned int)joyInfo.wXpos;
+		awJoyCenter[1] = (unsigned int)joyInfo.wYpos;
 	} else {
 		bUseJoyStick = FALSE;
 	}
@@ -1702,16 +1702,16 @@ void CMainPackRatWindow::SetNewPlayerPos() {
 
 	if ((bUseJoyStick) && (m_nNextDir == 0)) {
 		joyGetPos(JOYSTICKID1, &joyInfo);
-		if ((UINT)(joyInfo.wXpos) > (UINT)(awJoyCenter[0] + 10000))
+		if ((unsigned int)(joyInfo.wXpos) > (unsigned int)(awJoyCenter[0] + 10000))
 			m_nNextDir = 2;
 		else {
-			if ((UINT)(joyInfo.wXpos) < (UINT)(awJoyCenter[0] - 10000))
+			if ((unsigned int)(joyInfo.wXpos) < (unsigned int)(awJoyCenter[0] - 10000))
 				m_nNextDir = 1;
 			else {
-				if ((UINT)(joyInfo.wYpos) > (UINT)(awJoyCenter[1] + 10000))
+				if ((unsigned int)(joyInfo.wYpos) > (unsigned int)(awJoyCenter[1] + 10000))
 					m_nNextDir = 4;
 				else {
-					if ((UINT)(joyInfo.wYpos) < (UINT)(awJoyCenter[1] - 10000))
+					if ((unsigned int)(joyInfo.wYpos) < (unsigned int)(awJoyCenter[1] - 10000))
 						m_nNextDir = 3;
 				}
 			}
@@ -2716,7 +2716,7 @@ void CMainPackRatWindow::ResetGame() {
 void CALLBACK lpfnOptionCallback(CWnd * pWnd) {
 // do the mini options dialog
 	int             nOption = 0;       // return from the Options dialog
-//UINT            x = IDD_MINIOPTIONS_DIALOG;
+//unsigned int            x = IDD_MINIOPTIONS_DIALOG;
 	CPackRatOptDlg  dlgMiniOptDlg(pWnd, pGamePalette, IDD_MINIOPTIONS_DIALOG);
 
 	bResetGame = FALSE;
@@ -2831,7 +2831,7 @@ BOOL CMainPackRatWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return TRUE;
 }
 
-void CMainPackRatWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainPackRatWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 
 	if (m_bMouseCaptured) {
 
@@ -2881,7 +2881,7 @@ void CMainPackRatWindow::OnMouseMove(UINT nFlags, CPoint point) {
 	CWnd::OnMouseMove(nFlags, point);
 }
 
-void CMainPackRatWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainPackRatWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 
 	if (m_lpGameStruct->bPlayingMetagame == FALSE) {
 		if ((rNewGame.PtInRect(point)) && (m_bMouseCaptured == FALSE))  {
@@ -2897,7 +2897,7 @@ void CMainPackRatWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonDown(nFlags, point);
 }
 
-void CMainPackRatWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainPackRatWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 
 	/*
 	    if ( m_bMouseCaptured ) {
@@ -2913,7 +2913,7 @@ void CMainPackRatWindow::OnLButtonUp(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonUp(nFlags, point);
 }
 
-void CMainPackRatWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainPackRatWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 
 	if (m_bMouseCaptured) {
 		ReleaseCapture();
@@ -2932,7 +2932,7 @@ void CMainPackRatWindow::OnRButtonDown(UINT nFlags, CPoint point) {
 	CWnd::OnRButtonDown(nFlags, point);
 }
 
-void CMainPackRatWindow::OnRButtonUp(UINT nFlags, CPoint point) {
+void CMainPackRatWindow::OnRButtonUp(unsigned int nFlags, CPoint point) {
 	/*
 	    if ( m_bMouseCaptured ) {
 	        m_bMouseCaptured = FALSE;
@@ -2944,7 +2944,7 @@ void CMainPackRatWindow::OnRButtonUp(UINT nFlags, CPoint point) {
 	CWnd::OnRButtonUp(nFlags, point);
 }
 
-void CMainPackRatWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainPackRatWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CRules  dlgRules((CWnd *)this, RULESFILE, pGamePalette,
 	                 (m_lpGameStruct->bSoundEffectsEnabled ? RULES_WAV : nullptr));
 
@@ -3023,7 +3023,7 @@ void CMainPackRatWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	return;
 }
 
-void CMainPackRatWindow::OnTimer(UINT_PTR nWhichTimer) {
+void CMainPackRatWindow::OnTimer(uintptr nWhichTimer) {
 	if (nWhichTimer == PACKRATTIMER) {
 		KillTimer(PACKRATTIMER);
 		bEndGame = FALSE;
@@ -3275,7 +3275,7 @@ BOOL CMainPackRatWindow::OnEraseBkgnd(CDC *pDC) {
 	return TRUE;
 }
 
-void CMainPackRatWindow::OnActivate(UINT nState, CWnd   *pWndOther, BOOL bMinimized) {
+void CMainPackRatWindow::OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) {
 	if (!bMinimized)
 		switch (nState) {
 		case WA_INACTIVE:
@@ -3597,7 +3597,7 @@ void CMainPackRatWindow::OnSoundNotify(CSound *pSound) {
 	//
 }
 
-void CMainPackRatWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainPackRatWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 	// User has hit ALT_F4 so close down this App
 	//
diff --git a/engines/bagel/hodjnpodj/packrat/packrat.h b/engines/bagel/hodjnpodj/packrat/packrat.h
index 98a7f8d02d4..128c7fe33f2 100644
--- a/engines/bagel/hodjnpodj/packrat/packrat.h
+++ b/engines/bagel/hodjnpodj/packrat/packrat.h
@@ -144,17 +144,17 @@ protected:
 	afx_msg void OnPaint();
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
-	afx_msg void OnTimer(UINT_PTR);
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnRButtonDown(UINT, CPoint);
-	afx_msg void OnRButtonUp(UINT, CPoint);
-	afx_msg void OnMouseMove(UINT, CPoint);
-	afx_msg void OnKeyDown(UINT, UINT, UINT);
-	afx_msg void OnSysKeyDown(UINT, UINT, UINT);
+	afx_msg void OnTimer(uintptr);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnRButtonDown(unsigned int, CPoint);
+	afx_msg void OnRButtonUp(unsigned int, CPoint);
+	afx_msg void OnMouseMove(unsigned int, CPoint);
+	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
+	afx_msg void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 //	afx_msg void OnDrawItem( int, LPDRAWITEMSTRUCT );
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	afx_msg void OnActivate(UINT nState, CWnd   *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) override;
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
 	//}}AFX_MSG
diff --git a/engines/bagel/hodjnpodj/pdq/game.cpp b/engines/bagel/hodjnpodj/pdq/game.cpp
index 3cf0816e52d..db83a2bd61b 100644
--- a/engines/bagel/hodjnpodj/pdq/game.cpp
+++ b/engines/bagel/hodjnpodj/pdq/game.cpp
@@ -47,8 +47,8 @@ typedef struct {
 } PHRASES;
 
 typedef struct {
-	UINT     gameSpeed;             // 1 to 5 = 2.5 to .5 seconds
-	UINT     nShown;                // 1 to 9   as of 9/9/94 0 to 6
+	unsigned int     gameSpeed;             // 1 to 5 = 2.5 to .5 seconds
+	unsigned int     nShown;                // 1 to 9   as of 9/9/94 0 to 6
 	bool  bRandomLetters;         // TRUE if letter ordering shall be random
 	bool  bShowNames;            // TRUE if we are to display category names
 } USERCFG;
@@ -78,13 +78,13 @@ ERROR_CODE  BuildSpriteList(CDC *);
 void        KillCurPhrase(void);
 void        BuildRandomPhraseOrder();
 bool     RevealNextLetter(void);
-void CALLBACK GameTimerHook(HWND, UINT, UINT_PTR, uint32);
+void CALLBACK GameTimerHook(HWND, unsigned int, uintptr, uint32);
 int         StrLenNoSpaces(const char *);
 int         GetIndex(CSprite *);
 void        LoadGameCfg(void);
 void        SaveGameCfg(void);
 ERROR_CODE  ValidatePhrase(PHRASES *);
-void        UpdateScore(UINT, UINT, UINT, UINT);
+void        UpdateScore(unsigned int, unsigned int, unsigned int, unsigned int);
 int         NumLinkedSprites(void);
 
 #define TIMER_ID        50
@@ -121,7 +121,7 @@ int         iNextLetter;
 int         timerInterval;
 HWND        gGameWnd;
 bool     bPause;
-UINT        gLeftAvg, gTotalAvg;
+unsigned int        gLeftAvg, gTotalAvg;
 const char *INI_SECTION = "ThGesngGme";
 int         nPhrasePixelLength;
 
@@ -662,8 +662,8 @@ ERROR_CODE CleanScreen(CDC *pDC) {
 *
 *  synopsis  GameTimerHook(hWnd, nMsg, nEventID, dwTime)
 *            HWND  hWnd                 Handle of window that received WM_TIMER
-*            UINT  nMsg                 WM_TIMER
-*            UINT  nEventID             TIMER_ID
+*            unsigned int  nMsg                 WM_TIMER
+*            unsigned int  nEventID             TIMER_ID
 *            uint32 dwTime               time that event occured
 *
 *  purpose   To provide a callback routine for hooking the WM_TIMER.
@@ -673,11 +673,11 @@ ERROR_CODE CleanScreen(CDC *pDC) {
 *  returns   Nothing
 *
 **/
-void CALLBACK GameTimerHook(HWND hWnd, UINT, UINT_PTR nEventID, uint32) {
+void CALLBACK GameTimerHook(HWND hWnd, unsigned int, uintptr nEventID, uint32) {
 	CDC *pDC;
 	HDC hDC;
 	BOOL done;
-	UINT nLeft, nTotal, nLeftAvg, nTotalAvg;
+	unsigned int nLeft, nTotal, nLeftAvg, nTotalAvg;
 
 	assert(nEventID == TIMER_ID);
 
@@ -842,7 +842,7 @@ ERROR_CODE EndGame(CDC *pDC) {
 }
 
 void WinGame() {
-	UINT n;
+	unsigned int n;
 
 	// update the final score
 	//
@@ -1091,7 +1091,7 @@ ERROR_CODE ValidatePhrase(PHRASES *phrase) {
 }
 
 
-void GameGetScore(UINT *nLeft, UINT *nTotal, UINT *nLeftAvg, UINT *nTotalAvg) {
+void GameGetScore(unsigned int *nLeft, unsigned int *nTotal, unsigned int *nLeftAvg, unsigned int *nTotalAvg) {
 	/* can't write to null pointers */
 	assert(nLeft != nullptr);
 	assert(nTotal != nullptr);
diff --git a/engines/bagel/hodjnpodj/pdq/game.h b/engines/bagel/hodjnpodj/pdq/game.h
index 69847399835..de20e7dfe75 100644
--- a/engines/bagel/hodjnpodj/pdq/game.h
+++ b/engines/bagel/hodjnpodj/pdq/game.h
@@ -94,7 +94,7 @@ extern void        WinGame(void);
 extern ERROR_CODE  RepaintSpriteList(CDC *);
 extern bool     CheckUserGuess(const char *);
 extern void CALLBACK GetGameParams(CWnd *);
-extern void        GameGetScore(UINT *, UINT *, UINT *, UINT *);
+extern void        GameGetScore(unsigned int *, unsigned int *, unsigned int *, unsigned int *);
 
 } // namespace PDQ
 } // namespace HodjNPodj
diff --git a/engines/bagel/hodjnpodj/pdq/guess.cpp b/engines/bagel/hodjnpodj/pdq/guess.cpp
index 93dfaf6962a..f6079cbd9af 100644
--- a/engines/bagel/hodjnpodj/pdq/guess.cpp
+++ b/engines/bagel/hodjnpodj/pdq/guess.cpp
@@ -57,7 +57,7 @@ BOOL CGuessDlg::OnInitDialog(void) {
 	return TRUE;
 }
 
-void CGuessDlg::OnTimer(UINT_PTR nEventID) {
+void CGuessDlg::OnTimer(uintptr nEventID) {
 	char buf[MAX_PLENGTH_S + 2];
 	CEdit *pEdit;
 
@@ -77,7 +77,7 @@ void CGuessDlg::OnSetFocus(CWnd *) {
 	SetTimer(10, 50, nullptr);
 }
 
-void CGuessDlg::OnActivate(UINT nState, CWnd *, BOOL bMinimized) {
+void CGuessDlg::OnActivate(unsigned int nState, CWnd *, BOOL bMinimized) {
 	CEdit *pEdit;
 
 	pEdit = (CEdit *)GetDlgItem(IDC_EDIT);
diff --git a/engines/bagel/hodjnpodj/pdq/guess.h b/engines/bagel/hodjnpodj/pdq/guess.h
index 0c62845d8a8..dd580a47edb 100644
--- a/engines/bagel/hodjnpodj/pdq/guess.h
+++ b/engines/bagel/hodjnpodj/pdq/guess.h
@@ -44,10 +44,10 @@ public:
 protected:
 	virtual void DoDataExchange(CDataExchange *) override;    // DDX/DDV support
 	BOOL OnInitDialog(void) override;
-	void OnTimer(UINT_PTR);
+	void OnTimer(uintptr);
 	void OnPaint(void);
 	void OnSetFocus(CWnd *);
-	void OnActivate(UINT, CWnd *, BOOL) override;
+	void OnActivate(unsigned int, CWnd *, BOOL) override;
 	BOOL OnEraseBkgnd(CDC *);
 
 	DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/pdq/main.cpp b/engines/bagel/hodjnpodj/pdq/main.cpp
index b7d4efe1f7a..6bdbd5b377b 100644
--- a/engines/bagel/hodjnpodj/pdq/main.cpp
+++ b/engines/bagel/hodjnpodj/pdq/main.cpp
@@ -72,7 +72,7 @@ STATIC const char *pszCategoryBitmaps[N_CATEGORIES] = {
 /*
 * Local prototypes
 */
-void UpdateScore(UINT, UINT, UINT, UINT);
+void UpdateScore(unsigned int, unsigned int, unsigned int, unsigned int);
 
 /*
 * Globals
@@ -337,7 +337,7 @@ void CMainWindow::PaintScreen() {
 	CDC     *pDC;
 	CDibDoc myDoc;
 	HDIB    hDIB;
-	UINT nLeft, nTotal, nLeftAvg, nTotalAvg;
+	unsigned int nLeft, nTotal, nLeftAvg, nTotalAvg;
 	BOOL bSuccess;
 
 	myDoc.OpenDocument(MINI_GAME_MAP);
@@ -461,7 +461,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 void CMainWindow::PlayGame() {
 	CDC *pDC;
-	UINT nLeft, nTotal, nLeftAvg, nTotalAvg;
+	unsigned int nLeft, nTotal, nLeftAvg, nTotalAvg;
 	ERROR_CODE errCode;
 
 	pDC = GetDC();
@@ -489,7 +489,7 @@ void CMainWindow::PlayGame() {
 	ReleaseDC(pDC);
 }
 
-void CMainWindow::OnMouseMove(UINT, CPoint) {
+void CMainWindow::OnMouseMove(unsigned int, CPoint) {
 	SetCursor(LoadCursor(nullptr, IDC_ARROW));
 }
 
@@ -572,7 +572,7 @@ void CMainWindow::OnClose() {
 	MFC::PostMessage(ghParentWnd, WM_PARENTNOTIFY, WM_DESTROY, 0L);
 }
 
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_Q
 	//
 	if ((nChar == 'q') && (nFlags & 0x2000)) {
@@ -587,7 +587,7 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	}
 }
 
-void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	switch (nChar) {
 
 	// User has hit ALT_F4 so close down this App
@@ -603,9 +603,9 @@ void CMainWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	}
 }
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CDC *pDC;
-	UINT nLeft, nTotal, nLeftAvg, nTotalAvg;
+	unsigned int nLeft, nTotal, nLeftAvg, nTotalAvg;
 
 	// Handle keyboard input
 	//
@@ -701,11 +701,11 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CWnd::OnChar(nChar, nRepCnt, nFlags);
 }
 
-void UpdateScore(UINT nLeft, UINT nTotal, UINT nLeftAvg, UINT nTotalAvg) {
+void UpdateScore(unsigned int nLeft, unsigned int nTotal, unsigned int nLeftAvg, unsigned int nTotalAvg) {
 	char buf[40];
 	CDC *pDC;
 
@@ -736,7 +736,7 @@ void UpdateScore(UINT nLeft, UINT nTotal, UINT nLeftAvg, UINT nTotalAvg) {
 	}
 }
 
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 	CSprite *pSprite = nullptr;
 	CSound  *pEffect = nullptr;
@@ -903,7 +903,7 @@ void CMainWindow::OnSetFocus(CWnd *) {
 	}
 }
 
-void CMainWindow::OnActivate(UINT nState, CWnd *, BOOL bMinimized) {
+void CMainWindow::OnActivate(unsigned int nState, CWnd *, BOOL bMinimized) {
 	if (!bMinimized) {
 		switch (nState) {
 		case WA_ACTIVE:
diff --git a/engines/bagel/hodjnpodj/pdq/main.h b/engines/bagel/hodjnpodj/pdq/main.h
index 4bba3150571..22a035b107b 100644
--- a/engines/bagel/hodjnpodj/pdq/main.h
+++ b/engines/bagel/hodjnpodj/pdq/main.h
@@ -57,13 +57,13 @@ protected:
 	void OnSoundNotify(CSound *pSound);
 
 	void OnPaint(void);
-	void OnChar(UINT, UINT, UINT);
-	void OnSysChar(UINT, UINT, UINT);
-	void OnKeyDown(UINT, UINT, UINT);
-	void OnSysKeyDown(UINT, UINT, UINT);
-	void OnMouseMove(UINT, CPoint);
-	void OnLButtonDown(UINT, CPoint);
-	void OnActivate(UINT, CWnd *, BOOL) override;
+	void OnChar(unsigned int, unsigned int, unsigned int);
+	void OnSysChar(unsigned int, unsigned int, unsigned int);
+	void OnKeyDown(unsigned int, unsigned int, unsigned int);
+	void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
+	void OnMouseMove(unsigned int, CPoint);
+	void OnLButtonDown(unsigned int, CPoint);
+	void OnActivate(unsigned int, CWnd *, BOOL) override;
 	void OnSetFocus(CWnd *);
 	void OnClose(void);
 	LRESULT OnMCINotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/pdq/usercfg.cpp b/engines/bagel/hodjnpodj/pdq/usercfg.cpp
index 26a60d08a9d..4310471c675 100644
--- a/engines/bagel/hodjnpodj/pdq/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/pdq/usercfg.cpp
@@ -63,7 +63,7 @@ static  CColorButton *pCancelButton = nullptr;                 // Cancel button
 static  CColorButton *pDefaultsButton = nullptr;               // Defaults button on scroll
 static  CCheckButton *pFixedButton = nullptr;
 
-CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	: CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 
 	m_pNamesButton = nullptr;
@@ -152,7 +152,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
+void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *pScroll) {
 	switch (pScroll->GetDlgCtrlID()) {
 
 	case ID_SPEED:
diff --git a/engines/bagel/hodjnpodj/pdq/usercfg.h b/engines/bagel/hodjnpodj/pdq/usercfg.h
index 44387f74eee..dc4aea21a22 100644
--- a/engines/bagel/hodjnpodj/pdq/usercfg.h
+++ b/engines/bagel/hodjnpodj/pdq/usercfg.h
@@ -41,7 +41,7 @@ namespace PDQ {
 
 class CUserCfgDlg : public CBmpDialog {
 public:
-	CUserCfgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_USERCFG);
+	CUserCfgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_USERCFG);
 
 protected:
 
@@ -55,7 +55,7 @@ protected:
 	void ClearDialogImage(void);
 
 
-	void OnHScroll(UINT, UINT, CScrollBar *);
+	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnPaint();
 	void OnDestroy();
 	DECLARE_MESSAGE_MAP()
@@ -67,8 +67,8 @@ protected:
 	/*
 	* user preference data
 	*/
-	UINT        m_nShown;               // initial number of letters to be revealed
-	UINT        m_nGameSpeed;           // game speed 1..5 (1 = fast, 5 = slow)
+	unsigned int        m_nShown;               // initial number of letters to be revealed
+	unsigned int        m_nGameSpeed;           // game speed 1..5 (1 = fast, 5 = slow)
 	BOOL        m_bRandomLetters;       // TRUE if letters to be revealed in random order
 	BOOL        m_bShowNames;           // TRUE if we shouldm show category names
 	BOOL        m_bShouldSave;          // TRUE if we should save theses values
diff --git a/engines/bagel/hodjnpodj/peggle/game.cpp b/engines/bagel/hodjnpodj/peggle/game.cpp
index c85f42aa434..1cd1362bb2d 100644
--- a/engines/bagel/hodjnpodj/peggle/game.cpp
+++ b/engines/bagel/hodjnpodj/peggle/game.cpp
@@ -491,14 +491,14 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 // These functions are called when keyboard input generates a character.
 //
 
-void CMainWindow::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// TODO: Add your message handler code here and/or call default
 
 	CFrameWnd ::OnChar(nChar, nRepCnt, nFlags);     // default action
 }
 
 
-void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// TODO: Add your message handler code here and/or call default
 
 	if ((nChar == 'q') && (nFlags & 0x2000)) {      // terminate app on ALT-q
@@ -510,7 +510,7 @@ void CMainWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if (nChar == VK_F1) {                                  // F1 key is hit
 		SendMessage(WM_COMMAND, IDC_RULES, BN_CLICKED);  // Activate the Options dialog
 		(*pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
@@ -528,7 +528,7 @@ void CMainWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 // related message occurs.
 //
 
-void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	CDC    *pDC;
 	CPoint real_loc;
 
@@ -544,7 +544,7 @@ void CMainWindow::OnMouseMove(UINT nFlags, CPoint point) {
 }
 
 
-void CMainWindow::OnLButtonDown(UINT nFlags, CPoint myPoint) {
+void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint myPoint) {
 // if you want to do click and click, just check the counter % 2
 // if true, then store oldx, oldy, and first click case ("click")
 // if false, then do newx, newy, and second click case ("drag")
@@ -964,41 +964,41 @@ void CMainWindow::OnLButtonDown(UINT nFlags, CPoint myPoint) {
 }
 
 
-void CMainWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	if (bPegMoving)
 		OnLButtonDown(nFlags, point);
 }
 
 
-void CMainWindow::OnLButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMainWindow::OnMButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnMButtonDown(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMainWindow::OnMButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnMButtonUp(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
-void CMainWindow::OnMButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnMButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMainWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
 
-void CMainWindow::OnRButtonUp(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonUp(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
-void CMainWindow::OnRButtonDblClk(UINT nFlags, CPoint point) {
+void CMainWindow::OnRButtonDblClk(unsigned int nFlags, CPoint point) {
 //  insert mouse button processing code here
 }
 
diff --git a/engines/bagel/hodjnpodj/peggle/game.h b/engines/bagel/hodjnpodj/peggle/game.h
index 789c297f2ca..92836f4f786 100644
--- a/engines/bagel/hodjnpodj/peggle/game.h
+++ b/engines/bagel/hodjnpodj/peggle/game.h
@@ -81,21 +81,21 @@ protected:
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnLButtonDblClk(UINT, CPoint);
-	afx_msg void OnMButtonDown(UINT, CPoint);
-	afx_msg void OnMButtonUp(UINT, CPoint);
-	afx_msg void OnMButtonDblClk(UINT, CPoint);
-	afx_msg void OnRButtonDown(UINT, CPoint);
-	afx_msg void OnRButtonUp(UINT, CPoint);
-	afx_msg void OnRButtonDblClk(UINT, CPoint);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnLButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnMButtonDown(unsigned int, CPoint);
+	afx_msg void OnMButtonUp(unsigned int, CPoint);
+	afx_msg void OnMButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnRButtonDown(unsigned int, CPoint);
+	afx_msg void OnRButtonUp(unsigned int, CPoint);
+	afx_msg void OnRButtonDblClk(unsigned int, CPoint);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
 	afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/peggle/options.cpp b/engines/bagel/hodjnpodj/peggle/options.cpp
index ef796a0d327..d9ca8ac94c5 100644
--- a/engines/bagel/hodjnpodj/peggle/options.cpp
+++ b/engines/bagel/hodjnpodj/peggle/options.cpp
@@ -40,13 +40,13 @@ extern  LPGAMESTRUCT    pGameInfo;
 extern CPalette *pOptionsPalette;
 
 
-void COptions::OnLButtonDown(UINT nFlags, CPoint point) {
+void COptions::OnLButtonDown(unsigned int nFlags, CPoint point) {
 
 	CDialog::OnLButtonDown(nFlags, point);
 }
 
 
-void COptions::OnMouseMove(UINT nFlags, CPoint point) {
+void COptions::OnMouseMove(unsigned int nFlags, CPoint point) {
 
 	CDialog::OnMouseMove(nFlags, point);
 }
diff --git a/engines/bagel/hodjnpodj/peggle/options.h b/engines/bagel/hodjnpodj/peggle/options.h
index a7ef20ea5f5..d25b23a5381 100644
--- a/engines/bagel/hodjnpodj/peggle/options.h
+++ b/engines/bagel/hodjnpodj/peggle/options.h
@@ -62,10 +62,10 @@ protected:
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
 	virtual void OnOK() override;
 	afx_msg void OnPaint();
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
 	afx_msg void OnClickedRules() ;
 	afx_msg void OnClickedNewgame() ;
 	afx_msg void OnClickedOptions() ;
@@ -73,7 +73,7 @@ protected:
 	afx_msg void OnClickedReturn();
 	afx_msg void OnClickedQuit();
 	afx_msg void OnDestroy();
-//	afx_msg void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized);
+//	afx_msg void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/engines/bagel/hodjnpodj/peggle/optsub.cpp b/engines/bagel/hodjnpodj/peggle/optsub.cpp
index 222e11ab352..3ed1ddcc407 100644
--- a/engines/bagel/hodjnpodj/peggle/optsub.cpp
+++ b/engines/bagel/hodjnpodj/peggle/optsub.cpp
@@ -256,7 +256,7 @@ void COptions::OnDestroy(void) {
 }
 
 /*
-void COptions::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized)
+void COptions::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized)
 {
 if (!bMinimized)
     switch(nState) {
@@ -369,7 +369,7 @@ void COptions::RefreshBackground(void) {
 }
 
 
-void COptions::OnShowWindow(BOOL bShow, UINT nStatus) {
+void COptions::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	CDialog::OnShowWindow(bShow, nStatus);
 
 	// TODO: Add your message handler code here
@@ -377,7 +377,7 @@ void COptions::OnShowWindow(BOOL bShow, UINT nStatus) {
 }
 
 
-void COptions::OnSize(UINT nType, int cx, int cy) {
+void COptions::OnSize(unsigned int nType, int cx, int cy) {
 	CDialog::OnSize(nType, cx, cy);
 
 	// TODO: Add your message handler code here
diff --git a/engines/bagel/hodjnpodj/poker/amtdlg.cpp b/engines/bagel/hodjnpodj/poker/amtdlg.cpp
index 2e1c7305f22..68e557f0566 100644
--- a/engines/bagel/hodjnpodj/poker/amtdlg.cpp
+++ b/engines/bagel/hodjnpodj/poker/amtdlg.cpp
@@ -62,7 +62,7 @@ static CColorButton    *pCancelButton = nullptr;
  *  n/a
  *
  ****************************************************************/
-CSetAmountDlg::CSetAmountDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CSetAmountDlg::CSetAmountDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	:  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	CDC *pDC = GetDC();
 
@@ -334,7 +334,7 @@ void CSetAmountDlg::OnPaint(void) {
  *  n/a
  *
  ****************************************************************/
-void CSetAmountDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void CSetAmountDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	int     oldAmnt = 0;
 	int         newAmnt = 0;
 	CDC         *pDC;
diff --git a/engines/bagel/hodjnpodj/poker/dialogs.h b/engines/bagel/hodjnpodj/poker/dialogs.h
index 70565a38438..5a6b7f7a7a9 100644
--- a/engines/bagel/hodjnpodj/poker/dialogs.h
+++ b/engines/bagel/hodjnpodj/poker/dialogs.h
@@ -42,7 +42,7 @@ private:
 	// "Set Amount" and "Set Payoffs" buttons
 
 public:
-	COptionsDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_OPTIONS);
+	COptionsDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_OPTIONS);
 	void SetInitialOptions(BOOL = FALSE, BOOL = TRUE);   // Sets the private members
 	void ClearDialogImage();
 
@@ -65,7 +65,7 @@ private:
 	CRect   rectDisplayAmount;
 
 public:
-	CSetAmountDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_SETAMOUNT);
+	CSetAmountDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_SETAMOUNT);
 	void SetInitialOptions(long = 0);    // Sets the private members
 	void ClearDialogImage();
 	BOOL OnInitDialog() override;
@@ -73,7 +73,7 @@ public:
 protected:
 	//{{AFX_MSG(COptions)
 	virtual BOOL OnCommand(WPARAM, LPARAM) override;
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnPaint();
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
 	afx_msg void OnDestroy();
@@ -106,7 +106,7 @@ private:
 	CRect rectRoyalFlush;
 
 public:
-	CSetPayoffsDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_WINRATIO, int = IDC_POPO, BOOL = FALSE);
+	CSetPayoffsDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_WINRATIO, int = IDC_POPO, BOOL = FALSE);
 	void ClearDialogImage();
 	void OnKlingon(BOOL = TRUE);
 	void OnKuwaiti(BOOL = TRUE);
@@ -134,7 +134,7 @@ private:
 	int m_nWinPhrase;
 
 public:
-	CUserWonDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_USERWON);
+	CUserWonDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_USERWON);
 	void SetInitialOptions(int = 0);
 	void ClearDialogImage();
 	BOOL OnInitDialog() override;
diff --git a/engines/bagel/hodjnpodj/poker/optdlg.cpp b/engines/bagel/hodjnpodj/poker/optdlg.cpp
index 75a5eb549d3..de9692fcde8 100644
--- a/engines/bagel/hodjnpodj/poker/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/poker/optdlg.cpp
@@ -60,7 +60,7 @@ static CColorButton    *pCancelButton = nullptr;
  *
  ****************************************************************/
 
-COptionsDlg::COptionsDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+COptionsDlg::COptionsDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	:  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	m_bSoundOn = TRUE;
 	m_bDisableSets = FALSE;
diff --git a/engines/bagel/hodjnpodj/poker/options.h b/engines/bagel/hodjnpodj/poker/options.h
index 60b2c1429d7..1ccc8590beb 100644
--- a/engines/bagel/hodjnpodj/poker/options.h
+++ b/engines/bagel/hodjnpodj/poker/options.h
@@ -66,10 +66,10 @@ protected:
 	virtual void OnOK();
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy);
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point);
 	afx_msg void OnClickedRules() ;
 	afx_msg void OnClickedNewgame() ;
 	afx_msg void OnClickedOptions() ;
diff --git a/engines/bagel/hodjnpodj/poker/poffsdlg.cpp b/engines/bagel/hodjnpodj/poker/poffsdlg.cpp
index bd513e0d3f1..eb788e295e2 100644
--- a/engines/bagel/hodjnpodj/poker/poffsdlg.cpp
+++ b/engines/bagel/hodjnpodj/poker/poffsdlg.cpp
@@ -51,7 +51,7 @@ static CRadioButton    *pPoPorButton = nullptr;
 static CRadioButton    *pKuwaitiButton = nullptr;
 static CRadioButton    *pMartianButton = nullptr;
 
-CSetPayoffsDlg::CSetPayoffsDlg(CWnd *pParent, CPalette *pPalette, UINT nID, int nOdds, BOOL bJustDisplay)
+CSetPayoffsDlg::CSetPayoffsDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID, int nOdds, BOOL bJustDisplay)
 	:  CBmpDialog(pParent, pPalette, nID, ".\\ART\\MSCROLL.BMP"),
 		crectRedraw(10, 140, 44, 290),
 		rectPair(10, 131, 80, 146),
diff --git a/engines/bagel/hodjnpodj/poker/poker.cpp b/engines/bagel/hodjnpodj/poker/poker.cpp
index 6e511873662..a19a083d576 100644
--- a/engines/bagel/hodjnpodj/poker/poker.cpp
+++ b/engines/bagel/hodjnpodj/poker/poker.cpp
@@ -836,7 +836,7 @@ void CALLBACK lpfnOptionCallback(CWnd * pWnd) {                          // do t
 	int     nOption = 0;         // return from the Options dialog
 	int     nSetAmount = 0;      // return from the Set User Amount dialog
 	int     nSetPayOff = 0;      // return from the Set Payoffs dialog
-//	UINT x = IDD_MINIOPTIONS_DIALOG;
+//	unsigned int x = IDD_MINIOPTIONS_DIALOG;
 
 	COptionsDlg     dlgOptions(pWnd, pGamePalette, IDD_OPTIONS);
 	CSetAmountDlg   dlgSetAmt(pWnd, pGamePalette, IDD_SETAMOUNT);
@@ -1081,7 +1081,7 @@ BOOL CMainPokerWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return TRUE;
 }
 
-void CMainPokerWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainPokerWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	CSetPayoffsDlg  dlgPayOff((CWnd *)this, pGamePalette, IDD_WINRATIO, nPayOff, TRUE);
 
 	(void)dlgPayOff.DoModal();
@@ -1089,7 +1089,7 @@ void CMainPokerWindow::OnRButtonDown(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonDown(nFlags, point);
 }
 
-void CMainPokerWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainPokerWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 	CRect   rClock,
 	        rBoom,
@@ -1225,7 +1225,7 @@ void CMainPokerWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonDown(nFlags, point);
 }
 
-void CMainPokerWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainPokerWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	if (m_bMouseCaptured) {
 		m_bMouseCaptured = FALSE;
 		ReleaseCapture();
@@ -1235,7 +1235,7 @@ void CMainPokerWindow::OnLButtonUp(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonUp(nFlags, point);
 }
 
-void CMainPokerWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainPokerWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CRules  dlgRules((CWnd *)this, RULESFILE, pGamePalette,
 	                 (m_lpGameStruct->bSoundEffectsEnabled ? RULES_WAV : nullptr));
 
@@ -1824,7 +1824,7 @@ BOOL CMainPokerWindow::OnEraseBkgnd(CDC *pDC) {
 	return TRUE;
 }
 
-void CMainPokerWindow::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CMainPokerWindow::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	if (!bMinimized)
 		switch (nState) {
 		case WA_ACTIVE:
diff --git a/engines/bagel/hodjnpodj/poker/poker.h b/engines/bagel/hodjnpodj/poker/poker.h
index 79636fb99ab..6a7e77c3770 100644
--- a/engines/bagel/hodjnpodj/poker/poker.h
+++ b/engines/bagel/hodjnpodj/poker/poker.h
@@ -296,13 +296,13 @@ protected:
 	afx_msg void OnPaint();
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnRButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnKeyDown(UINT, UINT, UINT);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnRButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
 	afx_msg void OnDrawItem(int, LPDRAWITEMSTRUCT);
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	afx_msg void OnActivate(UINT nState, CWnd   *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) override;
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
 	//}}AFX_MSG
diff --git a/engines/bagel/hodjnpodj/poker/uwondlg.cpp b/engines/bagel/hodjnpodj/poker/uwondlg.cpp
index 2a94ea3d720..070c70a4b2d 100644
--- a/engines/bagel/hodjnpodj/poker/uwondlg.cpp
+++ b/engines/bagel/hodjnpodj/poker/uwondlg.cpp
@@ -59,7 +59,7 @@ CColorButton    *pOKButton = nullptr;
  *  n/a
  *
  ****************************************************************/
-CUserWonDlg::CUserWonDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CUserWonDlg::CUserWonDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	:  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	pUWonPalette = pPalette;
 }
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.cpp b/engines/bagel/hodjnpodj/riddles/riddles.cpp
index 888db9ef573..2d797815060 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.cpp
+++ b/engines/bagel/hodjnpodj/riddles/riddles.cpp
@@ -679,7 +679,7 @@ void CRiddlesWindow::GameReset(void) {
 
 
 ERROR_CODE CRiddlesWindow::LoadRiddle() {
-	STATIC UINT nLast;
+	STATIC unsigned int nLast;
 	int n, nMin, nMax;
 	ERROR_CODE errCode;
 
@@ -823,7 +823,7 @@ ERROR_CODE CRiddlesWindow::ValidateRiddle(RIDDLE *pRiddle) {
 ERROR_CODE CRiddlesWindow::BuildSpriteList(void) {
 	char *pRiddle, *p;
 	int x, y;
-	UINT nCharsPerLine;
+	unsigned int nCharsPerLine;
 	ERROR_CODE errCode;
 
 	// can't access a null pointer
@@ -1075,7 +1075,7 @@ ERROR_CODE CRiddlesWindow::RepaintSpriteList() {
 }
 
 
-void CRiddlesWindow::OnTimer(UINT_PTR nEvent) {
+void CRiddlesWindow::OnTimer(uintptr nEvent) {
 	CDC *pDC;
 
 	// there should be only one timer
@@ -1147,11 +1147,11 @@ void CRiddlesWindow::OnTimer(UINT_PTR nEvent) {
 }
 
 
-void CRiddlesWindow::OnMouseMove(UINT, CPoint) {
+void CRiddlesWindow::OnMouseMove(unsigned int, CPoint) {
 	SetCursor(LoadCursor(nullptr, IDC_ARROW));
 }
 
-HBRUSH CRiddlesWindow::OnCtlColor(CDC *pDC, CWnd *pWnd, UINT nCtlColor) {
+HBRUSH CRiddlesWindow::OnCtlColor(CDC *pDC, CWnd *pWnd, unsigned int nCtlColor) {
 	switch (nCtlColor) {
 	case CTLCOLOR_MSGBOX:
 		pDC->SetTextColor(PALETTEINDEX(5));
@@ -1168,7 +1168,7 @@ HBRUSH CRiddlesWindow::OnCtlColor(CDC *pDC, CWnd *pWnd, UINT nCtlColor) {
 	}
 }
 
-void CMyEdit::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMyEdit::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_Q
 	//
 	if ((nChar == 'q') && (nFlags & 0x2000)) {
@@ -1182,7 +1182,7 @@ void CMyEdit::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	}
 }
 
-void CMyEdit::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMyEdit::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_F4
 	//
 	if ((nChar == VK_F4) && (nFlags & 0x2000)) {
@@ -1197,7 +1197,7 @@ void CMyEdit::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMyEdit::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMyEdit::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CWnd *pParent;
 
 	pParent = GetParent();
@@ -1232,7 +1232,7 @@ void CMyEdit::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMyEdit::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMyEdit::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	char szBuf[MAX_ANSWER_LENGTH + 1];
 
 	//
@@ -1334,7 +1334,7 @@ BOOL CRiddlesWindow::CheckUserGuess(const char *pszGuess) {
 	return FALSE;
 }
 
-void CRiddlesWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CRiddlesWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 	CRect   animRect;                   // All three Easter Egg animations are in the same place
 	CRect   col1Rect,
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.h b/engines/bagel/hodjnpodj/riddles/riddles.h
index e53ee637a9a..e2b39179eda 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.h
+++ b/engines/bagel/hodjnpodj/riddles/riddles.h
@@ -112,10 +112,10 @@ struct RIDDLE {
 
 class CMyEdit: public CEdit {
 protected:
-	void OnChar(UINT, UINT, UINT);
-	void OnSysChar(UINT, UINT, UINT);
-	void OnKeyDown(UINT, UINT, UINT);
-	void OnSysKeyDown(UINT, UINT, UINT);
+	void OnChar(unsigned int, unsigned int, unsigned int);
+	void OnSysChar(unsigned int, unsigned int, unsigned int);
+	void OnKeyDown(unsigned int, unsigned int, unsigned int);
+	void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 
 	DECLARE_MESSAGE_MAP()
 };
@@ -152,14 +152,14 @@ protected:
 	void        DeleteSprite(CSprite *);
 
 	void        OnPaint();
-	void        OnMouseMove(UINT, CPoint);
-	void        OnLButtonDown(UINT, CPoint);
+	void        OnMouseMove(unsigned int, CPoint);
+	void        OnLButtonDown(unsigned int, CPoint);
 	void        OnClose();
 	void        OnSetFocus(CWnd *);
-	void        OnTimer(UINT_PTR);
+	void        OnTimer(uintptr);
 	LRESULT     OnMCINotify(WPARAM, LPARAM);
 	LRESULT     OnMMIONotify(WPARAM, LPARAM);
-	HBRUSH      OnCtlColor(CDC *, CWnd *, UINT);
+	HBRUSH      OnCtlColor(CDC *, CWnd *, unsigned int);
 
 	DECLARE_MESSAGE_MAP()
 
@@ -174,7 +174,7 @@ protected:
 	int         m_nInitTimeLimit;
 	int         m_nTimer;
 	int         m_nDifficultyLevel;
-	UINT        m_nRiddleNumber;
+	unsigned int        m_nRiddleNumber;
 	BOOL        m_bGameActive;
 	BOOL        m_bPause;
 	BOOL        m_bIgnoreScrollClick;
diff --git a/engines/bagel/hodjnpodj/riddles/usercfg.cpp b/engines/bagel/hodjnpodj/riddles/usercfg.cpp
index 98464b876f2..6673534ca29 100644
--- a/engines/bagel/hodjnpodj/riddles/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/riddles/usercfg.cpp
@@ -81,7 +81,7 @@ static  CColorButton *pOKButton = nullptr;                     // OKAY button on
 static  CColorButton *pCancelButton = nullptr;                 // Cancel button on scroll
 static  CColorButton *pDefaultsButton = nullptr;               // Defaults button on scroll
 
-CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	: CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	DoModal();
 }
@@ -154,8 +154,8 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CDialog::OnCommand(wParam, lParam);
 }
 
-void CUserCfgDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScroll) {
-	UINT nCurPos;
+void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *pScroll) {
+	unsigned int nCurPos;
 
 	// can't access a null pointer
 	assert(pScroll != nullptr);
@@ -341,7 +341,7 @@ void CUserCfgDlg::OnPaint(void) {
 	DispLevel();
 }
 
-void CUserCfgDlg::OnLButtonDown(UINT nFlags, CPoint point) {
+void CUserCfgDlg::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CBmpDialog::OnLButtonDown(nFlags, point);
 }
 
diff --git a/engines/bagel/hodjnpodj/riddles/usercfg.h b/engines/bagel/hodjnpodj/riddles/usercfg.h
index 9f228299c97..993aa15b10a 100644
--- a/engines/bagel/hodjnpodj/riddles/usercfg.h
+++ b/engines/bagel/hodjnpodj/riddles/usercfg.h
@@ -42,7 +42,7 @@ namespace Riddles {
 
 class CUserCfgDlg : public CBmpDialog {
 public:
-	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_USERCFG);
+	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_USERCFG);
 	void ClearDialogImage(void);
 
 protected:
@@ -56,10 +56,10 @@ protected:
 	void DispLevel(void);
 	int GetIndex(int);
 
-	void OnHScroll(UINT, UINT, CScrollBar *);
+	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnClose();
 	void OnPaint();
-	void OnLButtonDown(UINT, CPoint);
+	void OnLButtonDown(unsigned int, CPoint);
 	DECLARE_MESSAGE_MAP()
 
 	CText *m_pTxtTimeLimit;
@@ -67,7 +67,7 @@ protected:
 	CText *m_pTxtLevel;
 	CScrollBar *m_pScrollBar;
 	CScrollBar *m_pLevelScroll;
-	UINT        m_nTimeLimit;
+	unsigned int        m_nTimeLimit;
 	int         m_nDifficultyLevel;
 	BOOL        m_bSave;                    // True if should save theses values
 };
diff --git a/engines/bagel/hodjnpodj/wordsearch/dialogs.h b/engines/bagel/hodjnpodj/wordsearch/dialogs.h
index f20c7b16edd..adc48d29017 100644
--- a/engines/bagel/hodjnpodj/wordsearch/dialogs.h
+++ b/engines/bagel/hodjnpodj/wordsearch/dialogs.h
@@ -40,7 +40,7 @@ private:
 	CRect   rDisplayTime;
 
 public:
-	CWSOptDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_MINIOPTIONS_DIALOG);
+	CWSOptDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MINIOPTIONS_DIALOG);
 	void SetInitialOptions(int = 0, BOOL = TRUE, BOOL = FALSE);  // Sets the private members
 	void ClearDialogImage();
 	BOOL OnInitDialog() override;
@@ -50,7 +50,7 @@ protected:
 	virtual void OnCancel(void) override;
 	virtual void OnOK(void) override;
 	virtual BOOL OnCommand(WPARAM, LPARAM) override;
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
 	//}}AFX_MSG
@@ -66,7 +66,7 @@ private:
 	long    m_nWordsLeft;
 
 public:
-	CMsgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, UINT = IDD_MESSAGEBOX);
+	CMsgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MESSAGEBOX);
 	void SetInitialOptions(int, int);    // Sets the private members
 	void ClearDialogImage();
 	BOOL OnInitDialog() override;
diff --git a/engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp b/engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
index 451f8a51453..34f7b6ca181 100644
--- a/engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
@@ -60,7 +60,7 @@ CColorButton    *pMsgOKButton = nullptr;
  *      n/a
  *
  ****************************************************************/
-CMsgDlg::CMsgDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CMsgDlg::CMsgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	:  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP") {
 	pPackRatOptPalette = pPalette;
 	m_nWhichMsg = 1;
diff --git a/engines/bagel/hodjnpodj/wordsearch/optdlg.cpp b/engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
index dede5c0b112..f22d08ddf1f 100644
--- a/engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
@@ -68,7 +68,7 @@ CCheckButton    *pWordForwardButton = nullptr;
  *      n/a
  *
  ****************************************************************/
-CWSOptDlg::CWSOptDlg(CWnd *pParent, CPalette *pPalette, UINT nID)
+CWSOptDlg::CWSOptDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 		:  CBmpDialog(pParent, pPalette, nID, ".\\ART\\SSCROLL.BMP"),
 		rDisplayTime(35, 90, 200, 110) {
 	CDC     *pDC = GetDC();
@@ -465,7 +465,7 @@ void CWSOptDlg::OnPaint(void) {
  *      n/a
  *
  ****************************************************************/
-void CWSOptDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) {
+void CWSOptDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	int     oldAmnt = 0;
 	int     newAmnt = 0;
 	CDC     *pDC;
diff --git a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
index 6ac66c16349..77a7907bb91 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
@@ -69,7 +69,7 @@ static  CSound  *pGameSound = nullptr;                             // Game theme
 
 CSprite *pTimerSprite = nullptr;
 int     nLastCell;
-UINT    nTimerRes;
+unsigned int    nTimerRes;
 long    lCurrentTimer;
 
 int     nWordsLeft;
@@ -256,15 +256,15 @@ CMainWSWindow::CMainWSWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
 //	SetTimer( GAMETIMER, nTimerRes, nullptr );
 		long    lTemp = (long)m_nTimeForGame * 1000;
 
-//	nTimerRes = (UINT)( lTemp / ( TIMERSPRITECELS - 1) );
-		nTimerRes = (UINT)(lTemp / (TIMERSPRITECELS - 2));
+//	nTimerRes = (unsigned int)( lTemp / ( TIMERSPRITECELS - 1) );
+		nTimerRes = (unsigned int)(lTemp / (TIMERSPRITECELS - 2));
 		nLastCell = -1;
 		pTimerSprite->SetCel(nLastCell);
 		ReleaseDC(pDC);
 	} else {
 		m_nTimeForGame = 300;
-//	nTimerRes = (UINT)( (m_nTimeForGame * 1000) / ( TIMERSPRITECELS - 1) );
-		nTimerRes = (UINT)((m_nTimeForGame * 1000) / (TIMERSPRITECELS - 2));
+//	nTimerRes = (unsigned int)( (m_nTimeForGame * 1000) / ( TIMERSPRITECELS - 1) );
+		nTimerRes = (unsigned int)((m_nTimeForGame * 1000) / (TIMERSPRITECELS - 2));
 		nLastCell = -1;
 		m_bShowWordList = TRUE;
 		m_bWordsForwardOnly  = FALSE;
@@ -426,7 +426,7 @@ void CMainWSWindow::ResetGame() {
 	if (m_nTimeForGame > 0) {
 		long    lTemp = (long)m_nTimeForGame * 1000;
 
-		nTimerRes = (UINT)(lTemp / (TIMERSPRITECELS - 2));
+		nTimerRes = (unsigned int)(lTemp / (TIMERSPRITECELS - 2));
 		SetTimer(GAMETIMER, nTimerRes, nullptr);
 	}
 
@@ -870,7 +870,7 @@ BOOL CMainWSWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			else if ((m_nTimeForGame > 0) && (m_bNoGrid == FALSE)) {
 				long    lTemp = (long)m_nTimeForGame * 1000;
 
-				nTimerRes = (UINT)(lTemp / (TIMERSPRITECELS - 1));
+				nTimerRes = (unsigned int)(lTemp / (TIMERSPRITECELS - 1));
 //					nTimerRes = ( ( m_nTimeForGame * 1000 ) / TIMERSPRITECELS );
 				SetTimer(GAMETIMER, nTimerRes, nullptr);
 			}
@@ -882,7 +882,7 @@ BOOL CMainWSWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return TRUE;
 }
 
-void CMainWSWindow::OnLButtonDown(UINT nFlags, CPoint point) {
+void CMainWSWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CDC         *pDC = nullptr;
 	CPalette    *pTempPal = nullptr;
 	CRect       rChicken,
@@ -958,7 +958,7 @@ void CMainWSWindow::OnLButtonDown(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonDown(nFlags, point);
 }
 
-void CMainWSWindow::OnMouseMove(UINT nFlags, CPoint point) {
+void CMainWSWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 	CDC     *pDC = nullptr;
 	CBrush  cBrush((COLORREF)RGB(0, 255, 255));
 	CPalette    *pTempPal = nullptr;
@@ -1167,7 +1167,7 @@ void CMainWSWindow::OnMouseMove(UINT nFlags, CPoint point) {
 	CWnd::OnMouseMove(nFlags, point);
 }
 
-void CMainWSWindow::OnLButtonUp(UINT nFlags, CPoint point) {
+void CMainWSWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	int     x, y;
 	POINT   ptTemp;
 	BOOL    bFoundWord = FALSE;
@@ -1321,14 +1321,14 @@ void CMainWSWindow::OnLButtonUp(UINT nFlags, CPoint point) {
 	CWnd::OnLButtonUp(nFlags, point);
 }
 
-void CMainWSWindow::OnRButtonDown(UINT nFlags, CPoint point) {
+void CMainWSWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	if (m_bShowWordList) {
 		CLongDialog dlgWordlist((CWnd *)this, pGamePalette, "OK", "Word", "list");
 		dlgWordlist.DoModal();
 	}
 }
 
-void CMainWSWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWSWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// terminate app on ALT_F4
 	//
 	if ((nChar == VK_F4) && (nFlags & 0x2000)) {
@@ -1343,7 +1343,7 @@ void CMainWSWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 }
 
 
-void CMainWSWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CMainWSWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	CRules  dlgRules((CWnd *)this, RULESFILE, pGamePalette, nullptr);
 
 	switch (nChar) {
@@ -1364,7 +1364,7 @@ void CMainWSWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	return;
 }
 
-void CMainWSWindow::OnTimer(UINT_PTR nWhichTimer) {
+void CMainWSWindow::OnTimer(uintptr nWhichTimer) {
 	if (nWhichTimer == GAMETIMER) {
 		if (lCurrentTimer == (TIMERSPRITECELS - 1)) {        //> ( TIMERSPRITECELS - 1 ) ) {
 			CDC *pDC = GetDC();
@@ -1444,7 +1444,7 @@ BOOL CMainWSWindow::OnEraseBkgnd(CDC *pDC) {
 	return TRUE;
 }
 
-void CMainWSWindow::OnActivate(UINT nState, CWnd    *pWndOther, BOOL bMinimized) {
+void CMainWSWindow::OnActivate(unsigned int nState, CWnd    *pWndOther, BOOL bMinimized) {
 	if (!bMinimized)
 		switch (nState) {
 		case WA_ACTIVE:
diff --git a/engines/bagel/hodjnpodj/wordsearch/wordsearch.h b/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
index 74cb6abfc4f..635dafd7ef8 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
+++ b/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
@@ -123,7 +123,7 @@ namespace WordSearch {
 
 class CMainWSWindow : public CFrameWnd {
 public:
-	UINT            m_nTimeForGame;
+	unsigned int            m_nTimeForGame;
 	BOOL            m_bShowWordList;
 	BOOL            m_bWordsForwardOnly;
 
@@ -174,15 +174,15 @@ protected:
 	afx_msg void OnPaint();
 	afx_msg void OnClose();
 	afx_msg void OnDestroy();
-	afx_msg void OnTimer(UINT_PTR);
-	afx_msg void OnLButtonDown(UINT, CPoint);
-	afx_msg void OnLButtonUp(UINT, CPoint);
-	afx_msg void OnRButtonDown(UINT, CPoint);
-	afx_msg void OnMouseMove(UINT, CPoint);
-	afx_msg void OnKeyDown(UINT, UINT, UINT);
-	afx_msg void OnSysKeyDown(UINT, UINT, UINT);
+	afx_msg void OnTimer(uintptr);
+	afx_msg void OnLButtonDown(unsigned int, CPoint);
+	afx_msg void OnLButtonUp(unsigned int, CPoint);
+	afx_msg void OnRButtonDown(unsigned int, CPoint);
+	afx_msg void OnMouseMove(unsigned int, CPoint);
+	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
+	afx_msg void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	afx_msg BOOL OnEraseBkgnd(CDC *);
-	afx_msg void OnActivate(UINT nState, CWnd   *pWndOther, BOOL bMinimized) override;
+	afx_msg void OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) override;
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
 	//}}AFX_MSG
diff --git a/engines/bagel/mfc/afx.h b/engines/bagel/mfc/afx.h
index 8b7ab8acb36..2bedf07bfb5 100644
--- a/engines/bagel/mfc/afx.h
+++ b/engines/bagel/mfc/afx.h
@@ -64,7 +64,7 @@ class CFileException;
 struct CRuntimeClass {
 	const char *m_lpszClassName;
 	int m_nObjectSize;
-	UINT m_wSchema;
+	unsigned int m_wSchema;
 	CObject *(*m_pfnCreateObject)();
 	const CRuntimeClass *m_pBaseClass;
 
@@ -145,25 +145,25 @@ private:
 
 public:
 	CFile() {}
-	CFile(const char *lpszFileName, UINT nOpenFlags);
+	CFile(const char *lpszFileName, unsigned int nOpenFlags);
 	~CFile() {
 		Close();
 	}
 
 	BOOL Open(const char *lpszFileName,
-		UINT nOpenFlags = CFile::modeRead,
+		unsigned int nOpenFlags = CFile::modeRead,
 		CFileException *pError = nullptr);
 	void Close();
 	void Abort();
-	ULONGLONG SeekToEnd();
+	uint64 SeekToEnd();
 	void SeekToBegin();
-	virtual ULONGLONG Seek(LONGLONG lOff, UINT nFrom);
-	virtual ULONGLONG GetLength() const;
-	virtual ULONGLONG GetPosition() const;
+	virtual uint64 Seek(int64 lOff, unsigned int nFrom);
+	virtual uint64 GetLength() const;
+	virtual uint64 GetPosition() const;
 
-	virtual UINT Read(void *lpBuf, UINT nCount);
-	virtual void Write(const void *lpBuf, UINT nCount);
-	UINT ReadHuge(void *lpBuf, UINT nCount) {
+	virtual unsigned int Read(void *lpBuf, unsigned int nCount);
+	virtual void Write(const void *lpBuf, unsigned int nCount);
+	unsigned int ReadHuge(void *lpBuf, unsigned int nCount) {
 		return Read(lpBuf, nCount);
 	}
 
diff --git a/engines/bagel/mfc/afxmsg.h b/engines/bagel/mfc/afxmsg.h
index d6a93fc6457..1e0e2982a8f 100644
--- a/engines/bagel/mfc/afxmsg.h
+++ b/engines/bagel/mfc/afxmsg.h
@@ -214,7 +214,7 @@ namespace MFC {
 #define ON_COMMAND_RANGE(id, idLast, memberFxn) \
 	{ WM_COMMAND, CN_COMMAND, (uint16)id, (uint16)idLast, AfxSigCmd_RANGE, \
 		(AFX_PMSG) \
-		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(UINT) > \
+		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(unsigned int) > \
 		 (memberFxn)) },
 // ON_COMMAND_RANGE(id, idLast, OnBar) is the same as
 //   ON_CONTROL_RANGE(0, id, idLast, OnBar)
@@ -222,13 +222,13 @@ namespace MFC {
 #define ON_COMMAND_EX(id, memberFxn) \
 	{ WM_COMMAND, CN_COMMAND, (uint16)id, (uint16)id, AfxSigCmd_EX, \
 		(AFX_PMSG) \
-		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(UINT) > \
+		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(unsigned int) > \
 		 (memberFxn)) },
 
 #define ON_COMMAND_EX_RANGE(id, idLast, memberFxn) \
 	{ WM_COMMAND, CN_COMMAND, (uint16)id, (uint16)idLast, AfxSigCmd_EX, \
 		(AFX_PMSG) \
-		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(UINT) > \
+		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(unsigned int) > \
 		 (memberFxn)) },
 
 // update ui's are listed as WM_COMMAND's so they get routed like commands
@@ -253,19 +253,19 @@ namespace MFC {
 #define ON_NOTIFY_RANGE(wNotifyCode, id, idLast, memberFxn) \
 	{ WM_NOTIFY, (uint16)(int)wNotifyCode, (uint16)id, (uint16)idLast, AfxSigNotify_RANGE, \
 		(AFX_PMSG) \
-		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(UINT, NMHDR*, LRESULT*) > \
+		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(unsigned int, NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 #define ON_NOTIFY_EX(wNotifyCode, id, memberFxn) \
 	{ WM_NOTIFY, (uint16)(int)wNotifyCode, (uint16)id, (uint16)id, AfxSigNotify_EX, \
 		(AFX_PMSG) \
-		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(UINT, NMHDR*, LRESULT*) > \
+		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(unsigned int, NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 #define ON_NOTIFY_EX_RANGE(wNotifyCode, id, idLast, memberFxn) \
 	{ WM_NOTIFY, (uint16)(int)wNotifyCode, (uint16)id, (uint16)idLast, AfxSigNotify_EX, \
 		(AFX_PMSG) \
-		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(UINT, NMHDR*, LRESULT*) > \
+		(static_cast< BOOL (AFX_MSG_CALL CCmdTarget::*)(unsigned int, NMHDR*, LRESULT*) > \
 		 (memberFxn)) },
 
 // for general controls
@@ -276,7 +276,7 @@ namespace MFC {
 #define ON_CONTROL_RANGE(wNotifyCode, id, idLast, memberFxn) \
 	{ WM_COMMAND, (uint16)wNotifyCode, (uint16)id, (uint16)idLast, AfxSigCmd_RANGE, \
 		(AFX_PMSG) \
-		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(UINT) > (memberFxn)) },
+		(static_cast< void (AFX_MSG_CALL CCmdTarget::*)(unsigned int) > (memberFxn)) },
 
 #define WM_REFLECT_BASE 0xBC00
 
@@ -334,12 +334,12 @@ namespace MFC {
 #define ON_WM_SIZE() \
 	{ WM_SIZE, 0, 0, 0, AfxSig_vwii, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, int, int) > ( &ThisClass::OnSize)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, int, int) > ( &ThisClass::OnSize)) },
 
 #define ON_WM_ACTIVATE() \
 	{ WM_ACTIVATE, 0, 0, 0, AfxSig_vwWb, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CWnd*, BOOL) > ( &ThisClass::OnActivate)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CWnd*, BOOL) > ( &ThisClass::OnActivate)) },
 
 #define ON_WM_SETFOCUS() \
 	{ WM_SETFOCUS, 0, 0, 0, AfxSig_vW, \
@@ -394,7 +394,7 @@ namespace MFC {
 #define ON_WM_PRINTCLIENT() \
 	{ WM_PRINTCLIENT, 0, 0, 0, AfxSig_l_D_u, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< LRESULT (AFX_MSG_CALL CWnd::*)(CDC*, UINT) > ( &ThisClass::OnPrintClient)) },
+		(static_cast< LRESULT (AFX_MSG_CALL CWnd::*)(CDC*, unsigned int) > ( &ThisClass::OnPrintClient)) },
 
 #define ON_WM_SYSCOLORCHANGE() \
 	{ WM_SYSCOLORCHANGE, 0, 0, 0, AfxSig_vv, \
@@ -414,12 +414,12 @@ namespace MFC {
 #define ON_WM_GETTEXT() \
 	{ WM_GETTEXT, 0, 0, 0, AfxSig_i_i_s, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< int (AFX_MSG_CALL CWnd::*)(int, LPTSTR) > ( &ThisClass::OnGetText)) },
+		(static_cast< int (AFX_MSG_CALL CWnd::*)(int, uint16 *) > ( &ThisClass::OnGetText)) },
 
 #define ON_WM_GETTEXTLENGTH() \
 	{ WM_GETTEXTLENGTH, 0, 0, 0, AfxSig_u_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< UINT (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnGetTextLength)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnGetTextLength)) },
 
 #define ON_WM_SETFONT() \
 	{ WM_SETFONT, 0, 0, 0, AfxSig_vwpb, \
@@ -479,12 +479,12 @@ namespace MFC {
 #define  ON_WM_DISPLAYCHANGE() \
 	{ WM_DISPLAYCHANGE, 0, 0, 0, AfxSig_v_u_ii, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, int, int) > ( &ThisClass::OnDisplayChange)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, int, int) > ( &ThisClass::OnDisplayChange)) },
 
 #define  ON_WM_DDE_INITIATE() \
 	{ WM_DDE_INITIATE, 0, 0, 0, AfxSig_v_W_uu, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(CWnd*, UINT, UINT) > ( &ThisClass::OnDDEInitiate)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(CWnd*, unsigned int, unsigned int) > ( &ThisClass::OnDDEInitiate)) },
 
 #define  ON_WM_DDE_EXECUTE() \
 	{ WM_DDE_EXECUTE, 0, 0, 0, AfxSig_v_W_h, \
@@ -499,27 +499,27 @@ namespace MFC {
 #define ON_WM_WTSSESSION_CHANGE() \
 	{ WM_WTSSESSION_CHANGE, 0, 0, 0, AfxSig_vww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::OnSessionChange)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::OnSessionChange)) },
 
 #define ON_WM_SHOWWINDOW() \
 	{ WM_SHOWWINDOW, 0, 0, 0, AfxSig_vbw, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(BOOL, UINT) > ( &ThisClass::OnShowWindow)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(BOOL, unsigned int) > ( &ThisClass::OnShowWindow)) },
 
 #define ON_WM_CTLCOLOR() \
 	{ WM_CTLCOLOR, 0, 0, 0, AfxSig_hDWw, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< HBRUSH (AFX_MSG_CALL CWnd::*)(CDC*, CWnd*, UINT)>  ( &ThisClass::OnCtlColor)) },
+		(static_cast< HBRUSH (AFX_MSG_CALL CWnd::*)(CDC*, CWnd*, unsigned int)>  ( &ThisClass::OnCtlColor)) },
 
 #define ON_WM_CTLCOLOR_REFLECT() \
 	{ WM_CTLCOLOR+WM_REFLECT_BASE, 0, 0, 0, AfxSig_hDw, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< HBRUSH (AFX_MSG_CALL CWnd::*)(CDC*, UINT) > ( &ThisClass::CtlColor)) },
+		(static_cast< HBRUSH (AFX_MSG_CALL CWnd::*)(CDC*, unsigned int) > ( &ThisClass::CtlColor)) },
 
 #define ON_WM_SETTINGCHANGE() \
 	{ WM_SETTINGCHANGE, 0, 0, 0, AfxSig_vws, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, const char *) > ( &ThisClass::OnSettingChange)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, const char *) > ( &ThisClass::OnSettingChange)) },
 
 #define ON_WM_WININICHANGE() \
 	{ WM_WININICHANGE, 0, 0, 0, AfxSig_vs, \
@@ -529,7 +529,7 @@ namespace MFC {
 #define ON_WM_DEVMODECHANGE() \
 	{ WM_DEVMODECHANGE, 0, 0, 0, AfxSig_vs, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(LPTSTR) > ( &ThisClass::OnDevModeChange)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(uint16 *) > ( &ThisClass::OnDevModeChange)) },
 
 #define ON_WM_ACTIVATEAPP() \
 	{ WM_ACTIVATEAPP, 0, 0, 0, AfxSig_vww, \
@@ -554,12 +554,12 @@ namespace MFC {
 #define ON_WM_SETCURSOR() \
 	{ WM_SETCURSOR, 0, 0, 0, AfxSig_bWww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< BOOL (AFX_MSG_CALL CWnd::*)(CWnd*, UINT, UINT) > ( &ThisClass::OnSetCursor)) },
+		(static_cast< BOOL (AFX_MSG_CALL CWnd::*)(CWnd*, unsigned int, unsigned int) > ( &ThisClass::OnSetCursor)) },
 
 #define ON_WM_MOUSEACTIVATE() \
 	{ WM_MOUSEACTIVATE, 0, 0, 0, AfxSig_iWww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< int (AFX_MSG_CALL CWnd::*)(CWnd*, UINT, UINT) > ( &ThisClass::OnMouseActivate)) },
+		(static_cast< int (AFX_MSG_CALL CWnd::*)(CWnd*, unsigned int, unsigned int) > ( &ThisClass::OnMouseActivate)) },
 
 #define ON_WM_CHILDACTIVATE() \
 	{ WM_CHILDACTIVATE, 0, 0, 0, AfxSig_vv, \
@@ -579,7 +579,7 @@ namespace MFC {
 #define ON_WM_SPOOLERSTATUS() \
 	{ WM_SPOOLERSTATUS, 0, 0, 0, AfxSig_vww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::OnSpoolerStatus)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::OnSpoolerStatus)) },
 
 #define ON_WM_DRAWITEM() \
 	{ WM_DRAWITEM, 0, 0, 0, AfxSig_vOWNER, \
@@ -614,22 +614,22 @@ namespace MFC {
 #define ON_WM_CHARTOITEM() \
 	{ WM_CHARTOITEM, 0, 0, 0, AfxSig_iwWw, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< int (AFX_MSG_CALL CWnd::*)(UINT, CListBox*, UINT) > ( &ThisClass::OnCharToItem)) },
+		(static_cast< int (AFX_MSG_CALL CWnd::*)(unsigned int, CListBox*, unsigned int) > ( &ThisClass::OnCharToItem)) },
 
 #define ON_WM_CHARTOITEM_REFLECT() \
 	{ WM_CHARTOITEM+WM_REFLECT_BASE, 0, 0, 0, AfxSig_iww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< int (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::CharToItem)) },
+		(static_cast< int (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::CharToItem)) },
 
 #define ON_WM_VKEYTOITEM() \
 	{ WM_VKEYTOITEM, 0, 0, 0, AfxSig_iwWw, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< int (AFX_MSG_CALL CWnd::*)(UINT, CListBox*, UINT) > ( &ThisClass::OnVKeyToItem)) },
+		(static_cast< int (AFX_MSG_CALL CWnd::*)(unsigned int, CListBox*, unsigned int) > ( &ThisClass::OnVKeyToItem)) },
 
 #define ON_WM_VKEYTOITEM_REFLECT() \
 	{ WM_VKEYTOITEM+WM_REFLECT_BASE, 0, 0, 0, AfxSig_iww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< int (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::VKeyToItem)) },
+		(static_cast< int (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::VKeyToItem)) },
 
 #define ON_WM_QUERYDRAGICON() \
 	{ WM_QUERYDRAGICON, 0, 0, 0, AfxSig_hv, \
@@ -649,7 +649,7 @@ namespace MFC {
 #define ON_WM_COMPACTING() \
 	{ WM_COMPACTING, 0, 0, 0, AfxSig_vw, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT) > ( &ThisClass::OnCompacting)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int) > ( &ThisClass::OnCompacting)) },
 
 #define ON_WM_NCCREATE() \
 	{ WM_NCCREATE, 0, 0, 0, AfxSig_is, \
@@ -684,17 +684,17 @@ namespace MFC {
 #define ON_WM_GETDLGCODE() \
 	{ WM_GETDLGCODE, 0, 0, 0, AfxSig_wv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< UINT (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnGetDlgCode)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnGetDlgCode)) },
 
 #define ON_WM_NCMOUSEMOVE() \
 	{ WM_NCMOUSEMOVE, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcMouseMove)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcMouseMove)) },
 
 #define ON_WM_NCMOUSEHOVER() \
 	{ WM_NCMOUSEHOVER, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcMouseHover)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcMouseHover)) },
 
 #define ON_WM_NCMOUSELEAVE() \
 	{ WM_NCMOUSELEAVE, 0, 0, 0, AfxSig_vv, \
@@ -704,137 +704,137 @@ namespace MFC {
 #define ON_WM_NCLBUTTONDOWN() \
 	{ WM_NCLBUTTONDOWN, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcLButtonDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcLButtonDown)) },
 
 #define ON_WM_NCLBUTTONUP() \
 	{ WM_NCLBUTTONUP, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcLButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcLButtonUp)) },
 
 #define ON_WM_NCLBUTTONDBLCLK() \
 	{ WM_NCLBUTTONDBLCLK, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcLButtonDblClk)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcLButtonDblClk)) },
 
 #define ON_WM_NCRBUTTONDOWN() \
 	{ WM_NCRBUTTONDOWN, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcRButtonDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcRButtonDown)) },
 
 #define ON_WM_NCRBUTTONUP() \
 	{ WM_NCRBUTTONUP, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcRButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcRButtonUp)) },
 
 #define ON_WM_NCRBUTTONDBLCLK() \
 	{ WM_NCRBUTTONDBLCLK, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcRButtonDblClk)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcRButtonDblClk)) },
 
 #define ON_WM_NCMBUTTONDOWN() \
 	{ WM_NCMBUTTONDOWN, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcMButtonDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcMButtonDown)) },
 
 #define ON_WM_NCMBUTTONUP() \
 	{ WM_NCMBUTTONUP, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcMButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcMButtonUp)) },
 
 #define ON_WM_NCMBUTTONDBLCLK() \
 	{ WM_NCMBUTTONDBLCLK, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnNcMButtonDblClk)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnNcMButtonDblClk)) },
 
 #define ON_WM_NCXBUTTONDOWN() \
 	{ WM_NCXBUTTONDOWN, 0, 0, 0, AfxSig_MOUSE_NCXBUTTON, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(short, UINT, CPoint) > ( &ThisClass::OnNcXButtonDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(short, unsigned int, CPoint) > ( &ThisClass::OnNcXButtonDown)) },
 
 #define ON_WM_NCXBUTTONUP() \
 	{ WM_NCXBUTTONUP, 0, 0, 0, AfxSig_MOUSE_NCXBUTTON, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(short, UINT, CPoint) > ( &ThisClass::OnNcXButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(short, unsigned int, CPoint) > ( &ThisClass::OnNcXButtonUp)) },
 
 #define ON_WM_NCXBUTTONDBLCLK() \
 	{ WM_NCXBUTTONDBLCLK, 0, 0, 0, AfxSig_MOUSE_NCXBUTTON, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(short, UINT, CPoint) > ( &ThisClass::OnNcXButtonDblClk)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(short, unsigned int, CPoint) > ( &ThisClass::OnNcXButtonDblClk)) },
 
 #define ON_WM_KEYDOWN() \
 	{ WM_KEYDOWN, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnKeyDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnKeyDown)) },
 
 #define ON_WM_KEYUP() \
 	{ WM_KEYUP, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnKeyUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnKeyUp)) },
 
 #define ON_WM_HOTKEY() \
 	{ WM_HOTKEY, 0, 0, 0, AfxSig_v_u_uu, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnHotKey)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnHotKey)) },
 
 #define ON_WM_CHAR() \
 	{ WM_CHAR, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnChar)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnChar)) },
 
 #define ON_WM_UNICHAR() \
 	{ WM_UNICHAR, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnUniChar)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnUniChar)) },
 
 #define ON_WM_DEADCHAR() \
 	{ WM_DEADCHAR, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnDeadChar)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnDeadChar)) },
 
 #define ON_WM_SYSKEYDOWN() \
 	{ WM_SYSKEYDOWN, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnSysKeyDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnSysKeyDown)) },
 
 #define ON_WM_SYSKEYUP() \
 	{ WM_SYSKEYUP, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnSysKeyUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnSysKeyUp)) },
 
 #define ON_WM_SYSCHAR() \
 	{ WM_SYSCHAR, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast<void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnSysChar)) },
+		(static_cast<void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnSysChar)) },
 
 #define ON_WM_SYSDEADCHAR() \
 	{ WM_SYSDEADCHAR, 0, 0, 0, AfxSig_vwww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, UINT) > ( &ThisClass::OnSysDeadChar)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnSysDeadChar)) },
 
 #define ON_WM_SYSCOMMAND() \
 	{ WM_SYSCOMMAND, 0, 0, 0, AfxSig_vwl, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, LPARAM) > ( &ThisClass::OnSysCommand)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, LPARAM) > ( &ThisClass::OnSysCommand)) },
 
 #define ON_WM_INPUTLANGCHANGE() \
 	{ WM_INPUTLANGCHANGE, 0, 0, 0, AfxSig_INPUTLANGCHANGE, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::OnInputLangChange)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::OnInputLangChange)) },
 
 #define ON_WM_INPUTLANGCHANGEREQUEST() \
 	{ WM_INPUTLANGCHANGEREQUEST, 0, 0, 0, AfxSig_vww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::OnInputLangChangeRequest)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::OnInputLangChangeRequest)) },
 
 #define ON_WM_APPCOMMAND() \
 	{ WM_APPCOMMAND, 0, 0, 0, AfxSig_APPCOMMAND, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(CWnd*, UINT, UINT, UINT) > ( &ThisClass::OnAppCommand)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(CWnd*, unsigned int, unsigned int, unsigned int) > ( &ThisClass::OnAppCommand)) },
 
 #define ON_WM_INPUT() \
 	{ WM_INPUT, 0, 0, 0, AfxSig_RAWINPUT, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, HRAWINPUT) > ( &ThisClass::OnRawInput)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, HRAWINPUT) > ( &ThisClass::OnRawInput)) },
 
 #define ON_WM_INPUT_DEVICE_CHANGE() \
 	{ WM_INPUT_DEVICE_CHANGE, 0, 0, 0, AfxSig_INPUTDEVICECHANGE, \
@@ -844,32 +844,32 @@ namespace MFC {
 #define ON_WM_TCARD() \
 	{ WM_TCARD, 0, 0, 0, AfxSig_vwl, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, uint32) > ( &ThisClass::OnTCard)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, uint32) > ( &ThisClass::OnTCard)) },
 
 #define ON_WM_TIMER() \
 	{ WM_TIMER, 0, 0, 0, AfxSig_vw, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT_PTR) > ( &ThisClass::OnTimer)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(uintptr) > ( &ThisClass::OnTimer)) },
 
 #define ON_WM_HSCROLL() \
 	{ WM_HSCROLL, 0, 0, 0, AfxSig_vwwW, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, CScrollBar*) > ( &ThisClass::OnHScroll)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, CScrollBar*) > ( &ThisClass::OnHScroll)) },
 
 #define ON_WM_HSCROLL_REFLECT() \
 	{ WM_HSCROLL+WM_REFLECT_BASE, 0, 0, 0, AfxSig_vwwx, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::HScroll)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::HScroll)) },
 
 #define ON_WM_VSCROLL() \
 	{ WM_VSCROLL, 0, 0, 0, AfxSig_vwwW, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, CScrollBar*) > ( &ThisClass::OnVScroll)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, CScrollBar*) > ( &ThisClass::OnVScroll)) },
 
 #define ON_WM_VSCROLL_REFLECT() \
 	{ WM_VSCROLL+WM_REFLECT_BASE, 0, 0, 0, AfxSig_vwwx, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::VScroll)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::VScroll)) },
 
 #define ON_WM_INITMENU() \
 	{ WM_INITMENU, 0, 0, 0, AfxSig_vM, \
@@ -879,57 +879,57 @@ namespace MFC {
 #define ON_WM_INITMENUPOPUP() \
 	{ WM_INITMENUPOPUP, 0, 0, 0, AfxSig_vMwb, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(CMenu*, UINT, BOOL) > ( &ThisClass::OnInitMenuPopup)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(CMenu*, unsigned int, BOOL) > ( &ThisClass::OnInitMenuPopup)) },
 
 #define ON_WM_MENUSELECT() \
 	{ WM_MENUSELECT, 0, 0, 0, AfxSig_vwwh, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, HMENU) > ( &ThisClass::OnMenuSelect)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, HMENU) > ( &ThisClass::OnMenuSelect)) },
 
 #define ON_WM_MENUCHAR() \
 	{ WM_MENUCHAR, 0, 0, 0, AfxSig_lwwM, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< LRESULT (AFX_MSG_CALL CWnd::*)(UINT, UINT, CMenu*) > ( &ThisClass::OnMenuChar)) },
+		(static_cast< LRESULT (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, CMenu*) > ( &ThisClass::OnMenuChar)) },
 
 #define ON_WM_MENURBUTTONUP() \
 	{ WM_MENURBUTTONUP, 0, 0, 0, AfxSig_v_u_M, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CMenu*) > ( &ThisClass::OnMenuRButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CMenu*) > ( &ThisClass::OnMenuRButtonUp)) },
 
 #define ON_WM_MENUDRAG() \
 	{ WM_MENUDRAG, 0, 0, 0, AfxSig_u_u_M, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< UINT (AFX_MSG_CALL CWnd::*)(UINT, CMenu*) > ( &ThisClass::OnMenuDrag)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(unsigned int, CMenu*) > ( &ThisClass::OnMenuDrag)) },
 
 #define ON_WM_MENUGETOBJECT() \
 	{ WM_MENUGETOBJECT, 0, 0, 0, AfxSig_u_v_MENUGETOBJECTINFO, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< UINT (AFX_MSG_CALL CWnd::*)(MENUGETOBJECTINFO*) > ( &ThisClass::OnMenuGetObject)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(MENUGETOBJECTINFO*) > ( &ThisClass::OnMenuGetObject)) },
 
 #define ON_WM_UNINITMENUPOPUP() \
 	{ WM_UNINITMENUPOPUP, 0, 0, 0, AfxSig_v_M_u, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(CMenu*, UINT) > ( &ThisClass::OnUnInitMenuPopup)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(CMenu*, unsigned int) > ( &ThisClass::OnUnInitMenuPopup)) },
 
 #define ON_WM_NEXTMENU() \
 	{ WM_NEXTMENU, 0, 0, 0, AfxSig_v_u_LPMDINEXTMENU, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, LPMDINEXTMENU) > ( &ThisClass::OnNextMenu)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, LPMDINEXTMENU) > ( &ThisClass::OnNextMenu)) },
 
 #define ON_WM_ENTERIDLE() \
 	{ WM_ENTERIDLE, 0, 0, 0, AfxSig_vwW, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CWnd*) > ( &ThisClass::OnEnterIdle)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CWnd*) > ( &ThisClass::OnEnterIdle)) },
 
 #define ON_WM_MOUSEMOVE() \
 	{ WM_MOUSEMOVE, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnMouseMove)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnMouseMove)) },
 
 #define ON_WM_MOUSEHOVER() \
 	{ WM_MOUSEHOVER, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnMouseHover)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnMouseHover)) },
 
 #define ON_WM_MOUSELEAVE() \
 	{ WM_MOUSELEAVE, 0, 0, 0, AfxSig_vv, \
@@ -939,87 +939,87 @@ namespace MFC {
 #define ON_WM_MOUSEWHEEL() \
 	{ WM_MOUSEWHEEL, 0, 0, 0, AfxSig_bwsp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< BOOL (AFX_MSG_CALL CWnd::*)(UINT, short, CPoint) > ( &ThisClass::OnMouseWheel)) },
+		(static_cast< BOOL (AFX_MSG_CALL CWnd::*)(unsigned int, short, CPoint) > ( &ThisClass::OnMouseWheel)) },
 
 #define ON_WM_MOUSEHWHEEL() \
 	{ WM_MOUSEHWHEEL, 0, 0, 0, AfxSig_MOUSEHWHEEL, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, short, CPoint) > ( &ThisClass::OnMouseHWheel)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, short, CPoint) > ( &ThisClass::OnMouseHWheel)) },
 
 #define ON_WM_LBUTTONDOWN() \
 	{ WM_LBUTTONDOWN, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnLButtonDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnLButtonDown)) },
 
 #define ON_WM_LBUTTONUP() \
 	{ WM_LBUTTONUP, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnLButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnLButtonUp)) },
 
 #define ON_WM_LBUTTONDBLCLK() \
 	{ WM_LBUTTONDBLCLK, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnLButtonDblClk)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnLButtonDblClk)) },
 
 #define ON_WM_RBUTTONDOWN() \
 	{ WM_RBUTTONDOWN, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnRButtonDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnRButtonDown)) },
 
 #define ON_WM_RBUTTONUP() \
 	{ WM_RBUTTONUP, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnRButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnRButtonUp)) },
 
 #define ON_WM_RBUTTONDBLCLK() \
 	{ WM_RBUTTONDBLCLK, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnRButtonDblClk)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnRButtonDblClk)) },
 
 #define ON_WM_MBUTTONDOWN() \
 	{ WM_MBUTTONDOWN, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnMButtonDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnMButtonDown)) },
 
 #define ON_WM_MBUTTONUP() \
 	{ WM_MBUTTONUP, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnMButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnMButtonUp)) },
 
 #define ON_WM_MBUTTONDBLCLK() \
 	{ WM_MBUTTONDBLCLK, 0, 0, 0, AfxSig_vwp, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, CPoint) > ( &ThisClass::OnMButtonDblClk)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, CPoint) > ( &ThisClass::OnMButtonDblClk)) },
 
 #define ON_WM_XBUTTONDOWN() \
 	{ WM_XBUTTONDOWN, 0, 0, 0, AfxSig_MOUSE_XBUTTON, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, CPoint) > ( &ThisClass::OnXButtonDown)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, CPoint) > ( &ThisClass::OnXButtonDown)) },
 
 #define ON_WM_XBUTTONUP() \
 	{ WM_XBUTTONUP, 0, 0, 0, AfxSig_MOUSE_XBUTTON, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, CPoint) > ( &ThisClass::OnXButtonUp)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, CPoint) > ( &ThisClass::OnXButtonUp)) },
 
 #define ON_WM_XBUTTONDBLCLK() \
 	{ WM_XBUTTONDBLCLK, 0, 0, 0, AfxSig_MOUSE_XBUTTON, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT, CPoint) > ( &ThisClass::OnXButtonDblClk)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int, CPoint) > ( &ThisClass::OnXButtonDblClk)) },
 
 #define ON_WM_PARENTNOTIFY() \
 	{ WM_PARENTNOTIFY, 0, 0, 0, AfxSig_vwl, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast<void (AFX_MSG_CALL CWnd::*)(UINT, LPARAM) > ( &ThisClass::OnParentNotify)) },
+		(static_cast<void (AFX_MSG_CALL CWnd::*)(unsigned int, LPARAM) > ( &ThisClass::OnParentNotify)) },
 
 #define ON_WM_PARENTNOTIFY_REFLECT() \
 	{ WM_PARENTNOTIFY+WM_REFLECT_BASE, 0, 0, 0, AfxSig_vwl, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, LPARAM) > ( &ThisClass::ParentNotify)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, LPARAM) > ( &ThisClass::ParentNotify)) },
 
 #define ON_WM_NOTIFYFORMAT() \
 	{ WM_NOTIFYFORMAT, 0, 0, 0, AfxSig_u_W_u, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< UINT (AFX_MSG_CALL CWnd::*)(CWnd*, UINT) > ( &ThisClass::OnNotifyFormat)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(CWnd*, unsigned int) > ( &ThisClass::OnNotifyFormat)) },
 
 #define ON_WM_MDIACTIVATE() \
 	{ WM_MDIACTIVATE, 0, 0, 0, AfxSig_vbWW, \
@@ -1029,7 +1029,7 @@ namespace MFC {
 #define ON_WM_RENDERFORMAT() \
 	{ WM_RENDERFORMAT, 0, 0, 0, AfxSig_vw, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT) > ( &ThisClass::OnRenderFormat)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int) > ( &ThisClass::OnRenderFormat)) },
 
 #define ON_WM_RENDERALLFORMATS() \
 	{ WM_RENDERALLFORMATS, 0, 0, 0, AfxSig_vv, \
@@ -1054,7 +1054,7 @@ namespace MFC {
 #define ON_WM_VSCROLLCLIPBOARD() \
 	{ WM_VSCROLLCLIPBOARD, 0, 0, 0, AfxSig_vWww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(CWnd*, UINT, UINT) > ( &ThisClass::OnVScrollClipboard)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(CWnd*, unsigned int, unsigned int) > ( &ThisClass::OnVScrollClipboard)) },
 
 #define ON_WM_CONTEXTMENU() \
 	{ WM_CONTEXTMENU, 0, 0, 0, AfxSig_vWp, \
@@ -1069,7 +1069,7 @@ namespace MFC {
 #define ON_WM_ASKCBFORMATNAME() \
 	{ WM_ASKCBFORMATNAME, 0, 0, 0, AfxSig_vwl, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, LPTSTR) > ( &ThisClass::OnAskCbFormatName)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, uint16 *) > ( &ThisClass::OnAskCbFormatName)) },
 
 #define ON_WM_CHANGECBCHAIN() \
 	{ WM_CHANGECBCHAIN, 0, 0, 0, AfxSig_vhh, \
@@ -1079,7 +1079,7 @@ namespace MFC {
 #define ON_WM_HSCROLLCLIPBOARD() \
 	{ WM_HSCROLLCLIPBOARD, 0, 0, 0, AfxSig_vWww, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(CWnd*, UINT, UINT) > ( &ThisClass::OnHScrollClipboard)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(CWnd*, unsigned int, unsigned int) > ( &ThisClass::OnHScrollClipboard)) },
 
 #define ON_WM_CLIPBOARDUPDATE() \
 	{ WM_CLIPBOARDUPDATE, 0, 0, 0, AfxSig_v_v_v, \
@@ -1139,12 +1139,12 @@ namespace MFC {
 #define ON_WM_SIZING() \
 	{ WM_SIZING, 0, 0, 0, AfxSig_vwSIZING, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, LPRECT) > ( &ThisClass::OnSizing)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, LPRECT) > ( &ThisClass::OnSizing)) },
 
 #define ON_WM_MOVING() \
 	{ WM_MOVING, 0, 0, 0, AfxSig_vwMOVING, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, LPRECT) > ( &ThisClass::OnMoving)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, LPRECT) > ( &ThisClass::OnMoving)) },
 
 #define ON_WM_ENTERSIZEMOVE() \
 	{ WM_ENTERSIZEMOVE, 0, 0, 0, AfxSig_v_v_v, \
@@ -1164,12 +1164,12 @@ namespace MFC {
 #define ON_WM_DEVICECHANGE() \
 	{ WM_DEVICECHANGE, 0, 0, 0, AfxSig_bwl, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< BOOL (AFX_MSG_CALL CWnd::*)(UINT, DWORD_PTR) > ( &ThisClass::OnDeviceChange)) },
+		(static_cast< BOOL (AFX_MSG_CALL CWnd::*)(unsigned int, uintptr) > ( &ThisClass::OnDeviceChange)) },
 
 #define ON_WM_POWERBROADCAST() \
 	{ WM_POWERBROADCAST, 0, 0, 0, AfxSig_u_u_l, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< UINT (AFX_MSG_CALL CWnd::*)(UINT, LPARAM) > ( &ThisClass::OnPowerBroadcast)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(unsigned int, LPARAM) > ( &ThisClass::OnPowerBroadcast)) },
 
 #define ON_WM_USERCHANGED() \
 	{ WM_USERCHANGED, 0, 0, 0, AfxSig_vv, \
@@ -1179,17 +1179,17 @@ namespace MFC {
 #define ON_WM_CHANGEUISTATE() \
 	{ WM_CHANGEUISTATE, 0, 0, 0, AfxSig_vww2, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::OnChangeUIState)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::OnChangeUIState)) },
 
 #define ON_WM_UPDATEUISTATE() \
 	{ WM_UPDATEUISTATE, 0, 0, 0, AfxSig_vww2, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(UINT, UINT) > ( &ThisClass::OnUpdateUIState)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)(unsigned int, unsigned int) > ( &ThisClass::OnUpdateUIState)) },
 
 #define ON_WM_QUERYUISTATE() \
 	{ WM_QUERYUISTATE, 0, 0, 0, AfxSig_wv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< UINT (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnQueryUIState)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnQueryUIState)) },
 
 #define ON_WM_THEMECHANGED() \
 	{ WM_THEMECHANGED, 0, 0, 0, AfxSig_l, \
@@ -1352,7 +1352,7 @@ namespace MFC {
 
 // for Registered Windows messages
 #define ON_REGISTERED_MESSAGE(nMessageVariable, memberFxn) \
-	{ 0xC000, 0, 0, 0, (UINT_PTR)(UINT*)(&nMessageVariable), \
+	{ 0xC000, 0, 0, 0, (uintptr)(unsigned int*)(&nMessageVariable), \
 		/*implied 'AfxSig_lwl'*/ \
 		(AFX_PMSG)(AFX_PMSGW) \
 		(static_cast< LRESULT (AFX_MSG_CALL CWnd::*)(WPARAM, LPARAM) > \
@@ -1367,7 +1367,7 @@ namespace MFC {
 
 // for Registered Windows messages
 #define ON_REGISTERED_THREAD_MESSAGE(nMessageVariable, memberFxn) \
-	{ 0xC000, 0, 0, 0, (UINT_PTR)(UINT*)(&nMessageVariable), \
+	{ 0xC000, 0, 0, 0, (uintptr)(unsigned int*)(&nMessageVariable), \
 		/*implied 'AfxSig_vwl'*/ \
 		(AFX_PMSG)(AFX_PMSGT) \
 		(static_cast< void (AFX_MSG_CALL CWinThread::*)(WPARAM, LPARAM) > \
diff --git a/engines/bagel/mfc/afxstr.h b/engines/bagel/mfc/afxstr.h
index b416618b2d0..20f70d021d6 100644
--- a/engines/bagel/mfc/afxstr.h
+++ b/engines/bagel/mfc/afxstr.h
@@ -75,7 +75,7 @@ public:
 		return *this;
 	}
 
-	BOOL LoadString(UINT nID);
+	BOOL LoadString(unsigned int nID);
 };
 
 
diff --git a/engines/bagel/mfc/afxwin.h b/engines/bagel/mfc/afxwin.h
index 4cb75691b6b..1adbe0ae827 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/engines/bagel/mfc/afxwin.h
@@ -80,13 +80,13 @@ public:
 	BOOL CreateMenu();
 	BOOL CreatePopupMenu();
 	BOOL LoadMenu(const char *lpszResourceName);
-	BOOL LoadMenu(UINT nIDResource);
+	BOOL LoadMenu(unsigned int nIDResource);
 	BOOL LoadMenuIndirect(const void *lpMenuTemplate);
 	BOOL DestroyMenu();
 
 	static CMenu *FromHandle(HMENU hMenu);
 
-	UINT CheckMenuItem(UINT nIDCheckItem, UINT nCheck);
+	unsigned int CheckMenuItem(unsigned int nIDCheckItem, unsigned int nCheck);
 };
 
 /*============================================================================*/
@@ -98,90 +98,90 @@ enum AfxSig {
 
 	AfxSig_b_D_v,               // BOOL (CDC*)
 	AfxSig_b_b_v,               // BOOL (BOOL)
-	AfxSig_b_u_v,               // BOOL (UINT)
+	AfxSig_b_u_v,               // BOOL (unsigned int)
 	AfxSig_b_h_v,               // BOOL (HANDLE)
-	AfxSig_b_W_uu,              // BOOL (CWnd*, UINT, UINT)
+	AfxSig_b_W_uu,              // BOOL (CWnd*, unsigned int, unsigned int)
 	AfxSig_b_W_COPYDATASTRUCT,              // BOOL (CWnd*, COPYDATASTRUCT*)
 	AfxSig_b_v_HELPINFO,        // BOOL (LPHELPINFO);
-	AfxSig_CTLCOLOR,            // HBRUSH (CDC*, CWnd*, UINT)
-	AfxSig_CTLCOLOR_REFLECT,    // HBRUSH (CDC*, UINT)
-	AfxSig_i_u_W_u,             // int (UINT, CWnd*, UINT)  // ?TOITEM
-	AfxSig_i_uu_v,              // int (UINT, UINT)
-	AfxSig_i_W_uu,              // int (CWnd*, UINT, UINT)
-	AfxSig_i_v_s,               // int (LPTSTR)
+	AfxSig_CTLCOLOR,            // HBRUSH (CDC*, CWnd*, unsigned int)
+	AfxSig_CTLCOLOR_REFLECT,    // HBRUSH (CDC*, unsigned int)
+	AfxSig_i_u_W_u,             // int (unsigned int, CWnd*, unsigned int)  // ?TOITEM
+	AfxSig_i_uu_v,              // int (unsigned int, unsigned int)
+	AfxSig_i_W_uu,              // int (CWnd*, unsigned int, unsigned int)
+	AfxSig_i_v_s,               // int (uint16 *)
 	AfxSig_l_w_l,               // LRESULT (WPARAM, LPARAM)
-	AfxSig_l_uu_M,              // LRESULT (UINT, UINT, CMenu*)
+	AfxSig_l_uu_M,              // LRESULT (unsigned int, unsigned int, CMenu*)
 	AfxSig_v_b_h,               // void (BOOL, HANDLE)
 	AfxSig_v_h_v,               // void (HANDLE)
 	AfxSig_v_h_h,               // void (HANDLE, HANDLE)
 	AfxSig_v_v_v,               // void ()
-	AfxSig_v_u_v,               // void (UINT)
-	AfxSig_v_up_v,              // void (UINT_PTR)
-	AfxSig_v_u_u,               // void (UINT, UINT)
-	AfxSig_v_uu_v,              // void (UINT, UINT)
+	AfxSig_v_u_v,               // void (unsigned int)
+	AfxSig_v_up_v,              // void (uintptr)
+	AfxSig_v_u_u,               // void (unsigned int, unsigned int)
+	AfxSig_v_uu_v,              // void (unsigned int, unsigned int)
 	AfxSig_v_v_ii,              // void (int, int)
-	AfxSig_v_u_uu,              // void (UINT, UINT, UINT)
-	AfxSig_v_u_ii,              // void (UINT, int, int)
-	AfxSig_v_u_W,               // void (UINT, CWnd*)
-	AfxSig_i_u_v,               // int (UINT)
-	AfxSig_u_u_v,               // UINT (UINT)
+	AfxSig_v_u_uu,              // void (unsigned int, unsigned int, unsigned int)
+	AfxSig_v_u_ii,              // void (unsigned int, int, int)
+	AfxSig_v_u_W,               // void (unsigned int, CWnd*)
+	AfxSig_i_u_v,               // int (unsigned int)
+	AfxSig_u_u_v,               // unsigned int (unsigned int)
 	AfxSig_b_v_v,               // BOOL ()
 	AfxSig_v_w_l,               // void (WPARAM, LPARAM)
 	AfxSig_MDIACTIVATE,         // void (BOOL, CWnd*, CWnd*)
 	AfxSig_v_D_v,               // void (CDC*)
 	AfxSig_v_M_v,               // void (CMenu*)
-	AfxSig_v_M_ub,              // void (CMenu*, UINT, BOOL)
+	AfxSig_v_M_ub,              // void (CMenu*, unsigned int, BOOL)
 	AfxSig_v_W_v,               // void (CWnd*)
 	AfxSig_v_v_W,               // void (CWnd*)
-	AfxSig_v_W_uu,              // void (CWnd*, UINT, UINT)
+	AfxSig_v_W_uu,              // void (CWnd*, unsigned int, unsigned int)
 	AfxSig_v_W_p,               // void (CWnd*, CPoint)
 	AfxSig_v_W_h,               // void (CWnd*, HANDLE)
 	AfxSig_C_v_v,               // HCURSOR ()
-	AfxSig_ACTIVATE,            // void (UINT, CWnd*, BOOL)
-	AfxSig_SCROLL,              // void (UINT, UINT, CWnd*)
-	AfxSig_SCROLL_REFLECT,      // void (UINT, UINT)
-	AfxSig_v_v_s,               // void (LPTSTR)
-	AfxSig_v_u_cs,              // void (UINT, const char *)
-	AfxSig_OWNERDRAW,           // void (int, LPTSTR) force return TRUE
-	AfxSig_i_i_s,               // int (int, LPTSTR)
-	AfxSig_u_v_p,               // UINT (CPoint)
-	AfxSig_u_v_v,               // UINT ()
+	AfxSig_ACTIVATE,            // void (unsigned int, CWnd*, BOOL)
+	AfxSig_SCROLL,              // void (unsigned int, unsigned int, CWnd*)
+	AfxSig_SCROLL_REFLECT,      // void (unsigned int, unsigned int)
+	AfxSig_v_v_s,               // void (uint16 *)
+	AfxSig_v_u_cs,              // void (unsigned int, const char *)
+	AfxSig_OWNERDRAW,           // void (int, uint16 *) force return TRUE
+	AfxSig_i_i_s,               // int (int, uint16 *)
+	AfxSig_u_v_p,               // unsigned int (CPoint)
+	AfxSig_u_v_v,               // unsigned int ()
 	AfxSig_v_b_NCCALCSIZEPARAMS,        // void (BOOL, NCCALCSIZE_PARAMS*)
 	AfxSig_v_v_WINDOWPOS,           // void (WINDOWPOS*)
-	AfxSig_v_uu_M,              // void (UINT, UINT, HMENU)
-	AfxSig_v_u_p,               // void (UINT, CPoint)
-	AfxSig_SIZING,              // void (UINT, LPRECT)
-	AfxSig_MOUSEWHEEL,          // BOOL (UINT, short, CPoint)
-	AfxSig_MOUSEHWHEEL,         // void (UINT, short, CPoint)
+	AfxSig_v_uu_M,              // void (unsigned int, unsigned int, HMENU)
+	AfxSig_v_u_p,               // void (unsigned int, CPoint)
+	AfxSig_SIZING,              // void (unsigned int, LPRECT)
+	AfxSig_MOUSEWHEEL,          // BOOL (unsigned int, short, CPoint)
+	AfxSig_MOUSEHWHEEL,         // void (unsigned int, short, CPoint)
 	AfxSigCmd_v,                // void ()
 	AfxSigCmd_b,                // BOOL ()
-	AfxSigCmd_RANGE,            // void (UINT)
-	AfxSigCmd_EX,               // BOOL (UINT)
+	AfxSigCmd_RANGE,            // void (unsigned int)
+	AfxSigCmd_EX,               // BOOL (unsigned int)
 	AfxSigNotify_v,             // void (NMHDR*, LRESULT*)
 	AfxSigNotify_b,             // BOOL (NMHDR*, LRESULT*)
-	AfxSigNotify_RANGE,         // void (UINT, NMHDR*, LRESULT*)
-	AfxSigNotify_EX,            // BOOL (UINT, NMHDR*, LRESULT*)
+	AfxSigNotify_RANGE,         // void (unsigned int, NMHDR*, LRESULT*)
+	AfxSigNotify_EX,            // BOOL (unsigned int, NMHDR*, LRESULT*)
 	AfxSigCmdUI,                // void (CCmdUI*)
-	AfxSigCmdUI_RANGE,          // void (CCmdUI*, UINT)
+	AfxSigCmdUI_RANGE,          // void (CCmdUI*, unsigned int)
 	AfxSigCmd_v_pv,             // void (void*)
 	AfxSigCmd_b_pv,             // BOOL (void*)
 	AfxSig_l,               // LRESULT ()
 	AfxSig_l_p,             // LRESULT (CPOINT)
-	AfxSig_u_W_u,               // UINT (CWnd*, UINT)
-	AfxSig_v_u_M,               // void (UINT, CMenu* )
-	AfxSig_u_u_M,               // UINT (UINT, CMenu* )
-	AfxSig_u_v_MENUGETOBJECTINFO,       // UINT (MENUGETOBJECTINFO*)
-	AfxSig_v_M_u,               // void (CMenu*, UINT)
-	AfxSig_v_u_LPMDINEXTMENU,       // void (UINT, LPMDINEXTMENU)
-	AfxSig_APPCOMMAND,          // void (CWnd*, UINT, UINT, UINT)
-	AfxSig_RAWINPUT,            // void (UINT, HRAWINPUT)
-	AfxSig_u_u_u,               // UINT (UINT, UINT)
-	AfxSig_MOUSE_XBUTTON,           // void (UINT, UINT, CPoint)
-	AfxSig_MOUSE_NCXBUTTON,         // void (short, UINT, CPoint)
-	AfxSig_INPUTLANGCHANGE,         // void (UINT, UINT)
-	AfxSig_v_u_hkl,                 // void (UINT, HKL)
+	AfxSig_u_W_u,               // unsigned int (CWnd*, unsigned int)
+	AfxSig_v_u_M,               // void (unsigned int, CMenu* )
+	AfxSig_u_u_M,               // unsigned int (unsigned int, CMenu* )
+	AfxSig_u_v_MENUGETOBJECTINFO,       // unsigned int (MENUGETOBJECTINFO*)
+	AfxSig_v_M_u,               // void (CMenu*, unsigned int)
+	AfxSig_v_u_LPMDINEXTMENU,       // void (unsigned int, LPMDINEXTMENU)
+	AfxSig_APPCOMMAND,          // void (CWnd*, unsigned int, unsigned int, unsigned int)
+	AfxSig_RAWINPUT,            // void (unsigned int, HRAWINPUT)
+	AfxSig_u_u_u,               // unsigned int (unsigned int, unsigned int)
+	AfxSig_MOUSE_XBUTTON,           // void (unsigned int, unsigned int, CPoint)
+	AfxSig_MOUSE_NCXBUTTON,         // void (short, unsigned int, CPoint)
+	AfxSig_INPUTLANGCHANGE,         // void (unsigned int, unsigned int)
+	AfxSig_v_u_hkl,                 // void (unsigned int, HKL)
 	AfxSig_INPUTDEVICECHANGE,       // void (unsigned short, HANDLE)
-	AfxSig_l_D_u,                   // LRESULT (CDC*, UINT)
+	AfxSig_l_D_u,                   // LRESULT (CDC*, unsigned int)
 	AfxSig_i_v_S,               // int (const char *)
 	AfxSig_vwpb,                // void (HFONT, BOOL)
 	AfxSig_h_v_v,               // HANDLE ()
@@ -189,92 +189,92 @@ enum AfxSig {
 	AfxSig_b_v_ii,              // BOOL (int, int)
 	AfxSig_h_h_h,               // HANDLE (HANDLE, HANDLE)
 	AfxSig_MDINext,             // void (CWnd*, BOOL)
-	AfxSig_u_u_l,               // UINT (UINT, LPARAM)
+	AfxSig_u_u_l,               // unsigned int (unsigned int, LPARAM)
 
 	// Old
 	AfxSig_bD = AfxSig_b_D_v,      // BOOL (CDC*)
 	AfxSig_bb = AfxSig_b_b_v,      // BOOL (BOOL)
-	AfxSig_bWww = AfxSig_b_W_uu,    // BOOL (CWnd*, UINT, UINT)
-	AfxSig_hDWw = AfxSig_CTLCOLOR,    // HBRUSH (CDC*, CWnd*, UINT)
-	AfxSig_hDw = AfxSig_CTLCOLOR_REFLECT,     // HBRUSH (CDC*, UINT)
-	AfxSig_iwWw = AfxSig_i_u_W_u,    // int (UINT, CWnd*, UINT)
-	AfxSig_iww = AfxSig_i_uu_v,     // int (UINT, UINT)
-	AfxSig_iWww = AfxSig_i_W_uu,    // int (CWnd*, UINT, UINT)
-	AfxSig_is = AfxSig_i_v_s,      // int (LPTSTR)
+	AfxSig_bWww = AfxSig_b_W_uu,    // BOOL (CWnd*, unsigned int, unsigned int)
+	AfxSig_hDWw = AfxSig_CTLCOLOR,    // HBRUSH (CDC*, CWnd*, unsigned int)
+	AfxSig_hDw = AfxSig_CTLCOLOR_REFLECT,     // HBRUSH (CDC*, unsigned int)
+	AfxSig_iwWw = AfxSig_i_u_W_u,    // int (unsigned int, CWnd*, unsigned int)
+	AfxSig_iww = AfxSig_i_uu_v,     // int (unsigned int, unsigned int)
+	AfxSig_iWww = AfxSig_i_W_uu,    // int (CWnd*, unsigned int, unsigned int)
+	AfxSig_is = AfxSig_i_v_s,      // int (uint16 *)
 	AfxSig_lwl = AfxSig_l_w_l,     // LRESULT (WPARAM, LPARAM)
-	AfxSig_lwwM = AfxSig_l_uu_M,    // LRESULT (UINT, UINT, CMenu*)
+	AfxSig_lwwM = AfxSig_l_uu_M,    // LRESULT (unsigned int, unsigned int, CMenu*)
 	AfxSig_vv = AfxSig_v_v_v,      // void (void)
 
-	AfxSig_vw = AfxSig_v_u_v,      // void (UINT)
-	AfxSig_vww = AfxSig_v_u_u,     // void (UINT, UINT)
-	AfxSig_vww2 = AfxSig_v_uu_v,    // void (UINT, UINT) // both come from wParam
+	AfxSig_vw = AfxSig_v_u_v,      // void (unsigned int)
+	AfxSig_vww = AfxSig_v_u_u,     // void (unsigned int, unsigned int)
+	AfxSig_vww2 = AfxSig_v_uu_v,    // void (unsigned int, unsigned int) // both come from wParam
 	AfxSig_vvii = AfxSig_v_v_ii,    // void (int, int) // wParam is ignored
-	AfxSig_vwww = AfxSig_v_u_uu,    // void (UINT, UINT, UINT)
-	AfxSig_vwii = AfxSig_v_u_ii,    // void (UINT, int, int)
-	AfxSig_vwl = AfxSig_v_w_l,     // void (UINT, LPARAM)
+	AfxSig_vwww = AfxSig_v_u_uu,    // void (unsigned int, unsigned int, unsigned int)
+	AfxSig_vwii = AfxSig_v_u_ii,    // void (unsigned int, int, int)
+	AfxSig_vwl = AfxSig_v_w_l,     // void (unsigned int, LPARAM)
 	AfxSig_vbWW = AfxSig_MDIACTIVATE,    // void (BOOL, CWnd*, CWnd*)
 	AfxSig_vD = AfxSig_v_D_v,      // void (CDC*)
 	AfxSig_vM = AfxSig_v_M_v,      // void (CMenu*)
-	AfxSig_vMwb = AfxSig_v_M_ub,    // void (CMenu*, UINT, BOOL)
+	AfxSig_vMwb = AfxSig_v_M_ub,    // void (CMenu*, unsigned int, BOOL)
 
 	AfxSig_vW = AfxSig_v_W_v,      // void (CWnd*)
-	AfxSig_vWww = AfxSig_v_W_uu,    // void (CWnd*, UINT, UINT)
+	AfxSig_vWww = AfxSig_v_W_uu,    // void (CWnd*, unsigned int, unsigned int)
 	AfxSig_vWp = AfxSig_v_W_p,     // void (CWnd*, CPoint)
 	AfxSig_vWh = AfxSig_v_W_h,     // void (CWnd*, HANDLE)
-	AfxSig_vwW = AfxSig_v_u_W,     // void (UINT, CWnd*)
-	AfxSig_vwWb = AfxSig_ACTIVATE,    // void (UINT, CWnd*, BOOL)
-	AfxSig_vwwW = AfxSig_SCROLL,    // void (UINT, UINT, CWnd*)
-	AfxSig_vwwx = AfxSig_SCROLL_REFLECT,    // void (UINT, UINT)
-	AfxSig_vs = AfxSig_v_v_s,      // void (LPTSTR)
-	AfxSig_vOWNER = AfxSig_OWNERDRAW,  // void (int, LPTSTR), force return TRUE
-	AfxSig_iis = AfxSig_i_i_s,     // int (int, LPTSTR)
-	AfxSig_wp = AfxSig_u_v_p,      // UINT (CPoint)
-	AfxSig_wv = AfxSig_u_v_v,      // UINT (void)
+	AfxSig_vwW = AfxSig_v_u_W,     // void (unsigned int, CWnd*)
+	AfxSig_vwWb = AfxSig_ACTIVATE,    // void (unsigned int, CWnd*, BOOL)
+	AfxSig_vwwW = AfxSig_SCROLL,    // void (unsigned int, unsigned int, CWnd*)
+	AfxSig_vwwx = AfxSig_SCROLL_REFLECT,    // void (unsigned int, unsigned int)
+	AfxSig_vs = AfxSig_v_v_s,      // void (uint16 *)
+	AfxSig_vOWNER = AfxSig_OWNERDRAW,  // void (int, uint16 *), force return TRUE
+	AfxSig_iis = AfxSig_i_i_s,     // int (int, uint16 *)
+	AfxSig_wp = AfxSig_u_v_p,      // unsigned int (CPoint)
+	AfxSig_wv = AfxSig_u_v_v,      // unsigned int (void)
 	AfxSig_vPOS = AfxSig_v_v_WINDOWPOS,    // void (WINDOWPOS*)
 	AfxSig_vCALC = AfxSig_v_b_NCCALCSIZEPARAMS,   // void (BOOL, NCCALCSIZE_PARAMS*)
 	AfxSig_vNMHDRpl = AfxSigNotify_v,    // void (NMHDR*, LRESULT*)
 	AfxSig_bNMHDRpl = AfxSigNotify_b,    // BOOL (NMHDR*, LRESULT*)
-	AfxSig_vwNMHDRpl = AfxSigNotify_RANGE,   // void (UINT, NMHDR*, LRESULT*)
-	AfxSig_bwNMHDRpl = AfxSigNotify_EX,   // BOOL (UINT, NMHDR*, LRESULT*)
+	AfxSig_vwNMHDRpl = AfxSigNotify_RANGE,   // void (unsigned int, NMHDR*, LRESULT*)
+	AfxSig_bwNMHDRpl = AfxSigNotify_EX,   // BOOL (unsigned int, NMHDR*, LRESULT*)
 	AfxSig_bHELPINFO = AfxSig_b_v_HELPINFO,   // BOOL (HELPINFO*)
-	AfxSig_vwSIZING = AfxSig_SIZING,    // void (UINT, LPRECT) -- return TRUE
+	AfxSig_vwSIZING = AfxSig_SIZING,    // void (unsigned int, LPRECT) -- return TRUE
 
 	// signatures specific to CCmdTarget
 	AfxSig_cmdui = AfxSigCmdUI,   // void (CCmdUI*)
-	AfxSig_cmduiw = AfxSigCmdUI_RANGE,  // void (CCmdUI*, UINT)
+	AfxSig_cmduiw = AfxSigCmdUI_RANGE,  // void (CCmdUI*, unsigned int)
 	AfxSig_vpv = AfxSigCmd_v_pv,     // void (void*)
 	AfxSig_bpv = AfxSigCmd_b_pv,     // BOOL (void*)
 
 	// Other aliases (based on implementation)
-	AfxSig_vwwh = AfxSig_v_uu_M,                // void (UINT, UINT, HMENU)
-	AfxSig_vwp = AfxSig_v_u_p,                 // void (UINT, CPoint)
-	AfxSig_bw = AfxSig_b_u_v,      // BOOL (UINT)
+	AfxSig_vwwh = AfxSig_v_uu_M,                // void (unsigned int, unsigned int, HMENU)
+	AfxSig_vwp = AfxSig_v_u_p,                 // void (unsigned int, CPoint)
+	AfxSig_bw = AfxSig_b_u_v,      // BOOL (unsigned int)
 	AfxSig_bh = AfxSig_b_h_v,      // BOOL (HANDLE)
-	AfxSig_iw = AfxSig_i_u_v,      // int (UINT)
-	AfxSig_ww = AfxSig_u_u_v,      // UINT (UINT)
+	AfxSig_iw = AfxSig_i_u_v,      // int (unsigned int)
+	AfxSig_ww = AfxSig_u_u_v,      // unsigned int (unsigned int)
 	AfxSig_bv = AfxSig_b_v_v,      // BOOL (void)
 	AfxSig_hv = AfxSig_C_v_v,      // HANDLE (void)
 	AfxSig_vb = AfxSig_vw,      // void (BOOL)
 	AfxSig_vbh = AfxSig_v_b_h,    // void (BOOL, HANDLE)
-	AfxSig_vbw = AfxSig_vww,    // void (BOOL, UINT)
+	AfxSig_vbw = AfxSig_vww,    // void (BOOL, unsigned int)
 	AfxSig_vhh = AfxSig_v_h_h,    // void (HANDLE, HANDLE)
 	AfxSig_vh = AfxSig_v_h_v,      // void (HANDLE)
 	AfxSig_viSS = AfxSig_vwl,   // void (int, STYLESTRUCT*)
 	AfxSig_bwl = AfxSig_lwl,
-	AfxSig_vwMOVING = AfxSig_vwSIZING,  // void (UINT, LPRECT) -- return TRUE
+	AfxSig_vwMOVING = AfxSig_vwSIZING,  // void (unsigned int, LPRECT) -- return TRUE
 
 	AfxSig_vW2 = AfxSig_v_v_W,                 // void (CWnd*) (CWnd* comes from lParam)
 	AfxSig_bWCDS = AfxSig_b_W_COPYDATASTRUCT,               // BOOL (CWnd*, COPYDATASTRUCT*)
-	AfxSig_bwsp = AfxSig_MOUSEWHEEL,                // BOOL (UINT, short, CPoint)
+	AfxSig_bwsp = AfxSig_MOUSEWHEEL,                // BOOL (unsigned int, short, CPoint)
 	AfxSig_vws = AfxSig_v_u_cs,
 };
 
 
 #define CN_COMMAND              0               // void ()
-#define CN_UPDATE_COMMAND_UI    ((UINT)(-1))    // void (CCmdUI*)
-#define CN_EVENT                ((UINT)(-2))    // OLE event
-#define CN_OLECOMMAND           ((UINT)(-3))    // OLE document command
-#define CN_OLE_UNREGISTER       ((UINT)(-4))    // OLE unregister
+#define CN_UPDATE_COMMAND_UI    ((unsigned int)(-1))    // void (CCmdUI*)
+#define CN_EVENT                ((unsigned int)(-2))    // OLE event
+#define CN_OLECOMMAND           ((unsigned int)(-3))    // OLE document command
+#define CN_OLE_UNREGISTER       ((unsigned int)(-4))    // OLE unregister
 // > 0 are control notifications
 // < 0 are for MFC's use
 
@@ -290,10 +290,10 @@ typedef void (CWnd::*AFX_PMSGW)(void);
 
 #pragma warning(disable: 4121)
 struct AFX_MSGMAP_ENTRY {
-	UINT nMessage;   // windows message
-	UINT nCode;      // control code or WM_NOTIFY code
-	UINT nID;        // control ID (or 0 for windows messages)
-	UINT nLastID;    // used for entries specifying a range of control id's
+	unsigned int nMessage;   // windows message
+	unsigned int nCode;      // control code or WM_NOTIFY code
+	unsigned int nID;        // control ID (or 0 for windows messages)
+	unsigned int nLastID;    // used for entries specifying a range of control id's
 	int nSig;   // signature type (action) or pointer to message #
 	AFX_PMSG pfn;    // routine to call (or special value)
 };
@@ -356,18 +356,18 @@ union MessageMapFunctions {
 	// specific type safe variants for WM_COMMAND and WM_NOTIFY messages
 	void (AFX_MSG_CALL CCmdTarget:: *pfn_COMMAND)();
 	BOOL(AFX_MSG_CALL CCmdTarget:: *pfn_bCOMMAND)();
-	void (AFX_MSG_CALL CCmdTarget:: *pfn_COMMAND_RANGE)(UINT);
-	BOOL(AFX_MSG_CALL CCmdTarget:: *pfn_COMMAND_EX)(UINT);
+	void (AFX_MSG_CALL CCmdTarget:: *pfn_COMMAND_RANGE)(unsigned int);
+	BOOL(AFX_MSG_CALL CCmdTarget:: *pfn_COMMAND_EX)(unsigned int);
 
 	void (AFX_MSG_CALL CCmdTarget:: *pfn_UPDATE_COMMAND_UI)(CCmdUI *);
-	void (AFX_MSG_CALL CCmdTarget:: *pfn_UPDATE_COMMAND_UI_RANGE)(CCmdUI *, UINT);
+	void (AFX_MSG_CALL CCmdTarget:: *pfn_UPDATE_COMMAND_UI_RANGE)(CCmdUI *, unsigned int);
 	void (AFX_MSG_CALL CCmdTarget:: *pfn_OTHER)(void *);
 	BOOL(AFX_MSG_CALL CCmdTarget:: *pfn_OTHER_EX)(void *);
 
 	void (AFX_MSG_CALL CCmdTarget:: *pfn_NOTIFY)(NMHDR *, LRESULT *);
 	BOOL(AFX_MSG_CALL CCmdTarget:: *pfn_bNOTIFY)(NMHDR *, LRESULT *);
-	void (AFX_MSG_CALL CCmdTarget:: *pfn_NOTIFY_RANGE)(UINT, NMHDR *, LRESULT *);
-	BOOL(AFX_MSG_CALL CCmdTarget:: *pfn_NOTIFY_EX)(UINT, NMHDR *, LRESULT *);
+	void (AFX_MSG_CALL CCmdTarget:: *pfn_NOTIFY_RANGE)(unsigned int, NMHDR *, LRESULT *);
+	BOOL(AFX_MSG_CALL CCmdTarget:: *pfn_NOTIFY_EX)(unsigned int, NMHDR *, LRESULT *);
 
 	// Type safe variant for thread messages
 
@@ -376,49 +376,49 @@ union MessageMapFunctions {
 	// Specific type safe variants for WM-style messages
 	BOOL(AFX_MSG_CALL CWnd:: *pfn_bD)(CDC *);
 	BOOL(AFX_MSG_CALL CWnd:: *pfn_bb)(BOOL);
-	BOOL(AFX_MSG_CALL CWnd:: *pfn_bWww)(CWnd *, UINT, UINT);
+	BOOL(AFX_MSG_CALL CWnd:: *pfn_bWww)(CWnd *, unsigned int, unsigned int);
 	BOOL(AFX_MSG_CALL CWnd:: *pfn_bHELPINFO)(HELPINFO *);
 	BOOL(AFX_MSG_CALL CWnd:: *pfn_bWCDS)(CWnd *, COPYDATASTRUCT *);
-	HBRUSH(AFX_MSG_CALL CWnd:: *pfn_hDWw)(CDC *, CWnd *, UINT);
-	HBRUSH(AFX_MSG_CALL CWnd:: *pfn_hDw)(CDC *, UINT);
-	int (AFX_MSG_CALL CWnd:: *pfn_iwWw)(UINT, CWnd *, UINT);
-	int (AFX_MSG_CALL CWnd:: *pfn_iww)(UINT, UINT);
-	int (AFX_MSG_CALL CWnd:: *pfn_iWww)(CWnd *, UINT, UINT);
-	int (AFX_MSG_CALL CWnd:: *pfn_is)(LPTSTR);
+	HBRUSH(AFX_MSG_CALL CWnd:: *pfn_hDWw)(CDC *, CWnd *, unsigned int);
+	HBRUSH(AFX_MSG_CALL CWnd:: *pfn_hDw)(CDC *, unsigned int);
+	int (AFX_MSG_CALL CWnd:: *pfn_iwWw)(unsigned int, CWnd *, unsigned int);
+	int (AFX_MSG_CALL CWnd:: *pfn_iww)(unsigned int, unsigned int);
+	int (AFX_MSG_CALL CWnd:: *pfn_iWww)(CWnd *, unsigned int, unsigned int);
+	int (AFX_MSG_CALL CWnd:: *pfn_is)(uint16 *);
 	LRESULT(AFX_MSG_CALL CWnd:: *pfn_lwl)(WPARAM, LPARAM);
-	LRESULT(AFX_MSG_CALL CWnd:: *pfn_lwwM)(UINT, UINT, CMenu *);
+	LRESULT(AFX_MSG_CALL CWnd:: *pfn_lwwM)(unsigned int, unsigned int, CMenu *);
 	void (AFX_MSG_CALL CWnd:: *pfn_vv)(void);
 
-	void (AFX_MSG_CALL CWnd:: *pfn_vw)(UINT);
-	void (AFX_MSG_CALL CWnd:: *pfn_vww)(UINT, UINT);
+	void (AFX_MSG_CALL CWnd:: *pfn_vw)(unsigned int);
+	void (AFX_MSG_CALL CWnd:: *pfn_vww)(unsigned int, unsigned int);
 	void (AFX_MSG_CALL CWnd:: *pfn_vvii)(int, int);
-	void (AFX_MSG_CALL CWnd:: *pfn_vwww)(UINT, UINT, UINT);
-	void (AFX_MSG_CALL CWnd:: *pfn_vwii)(UINT, int, int);
+	void (AFX_MSG_CALL CWnd:: *pfn_vwww)(unsigned int, unsigned int, unsigned int);
+	void (AFX_MSG_CALL CWnd:: *pfn_vwii)(unsigned int, int, int);
 	void (AFX_MSG_CALL CWnd:: *pfn_vwl)(WPARAM, LPARAM);
 	void (AFX_MSG_CALL CWnd:: *pfn_vbWW)(BOOL, CWnd *, CWnd *);
 	void (AFX_MSG_CALL CWnd:: *pfn_vD)(CDC *);
 	void (AFX_MSG_CALL CWnd:: *pfn_vM)(CMenu *);
-	void (AFX_MSG_CALL CWnd:: *pfn_vMwb)(CMenu *, UINT, BOOL);
+	void (AFX_MSG_CALL CWnd:: *pfn_vMwb)(CMenu *, unsigned int, BOOL);
 
 	void (AFX_MSG_CALL CWnd:: *pfn_vW)(CWnd *);
-	void (AFX_MSG_CALL CWnd:: *pfn_vWww)(CWnd *, UINT, UINT);
+	void (AFX_MSG_CALL CWnd:: *pfn_vWww)(CWnd *, unsigned int, unsigned int);
 	void (AFX_MSG_CALL CWnd:: *pfn_vWp)(CWnd *, CPoint);
 	void (AFX_MSG_CALL CWnd:: *pfn_vWh)(CWnd *, HANDLE);
-	void (AFX_MSG_CALL CWnd:: *pfn_vwW)(UINT, CWnd *);
-	void (AFX_MSG_CALL CWnd:: *pfn_vwWb)(UINT, CWnd *, BOOL);
-	void (AFX_MSG_CALL CWnd:: *pfn_vwwW)(UINT, UINT, CWnd *);
-	void (AFX_MSG_CALL CWnd:: *pfn_vwwx)(UINT, UINT);
-	void (AFX_MSG_CALL CWnd:: *pfn_vs)(LPTSTR);
-	void (AFX_MSG_CALL CWnd:: *pfn_vOWNER)(int, LPTSTR);      // force return TRUE
-	int (AFX_MSG_CALL CWnd:: *pfn_iis)(int, LPTSTR);
-	UINT(AFX_MSG_CALL CWnd:: *pfn_wp)(CPoint);
-	UINT(AFX_MSG_CALL CWnd:: *pfn_wv)(void);
+	void (AFX_MSG_CALL CWnd:: *pfn_vwW)(unsigned int, CWnd *);
+	void (AFX_MSG_CALL CWnd:: *pfn_vwWb)(unsigned int, CWnd *, BOOL);
+	void (AFX_MSG_CALL CWnd:: *pfn_vwwW)(unsigned int, unsigned int, CWnd *);
+	void (AFX_MSG_CALL CWnd:: *pfn_vwwx)(unsigned int, unsigned int);
+	void (AFX_MSG_CALL CWnd:: *pfn_vs)(uint16 *);
+	void (AFX_MSG_CALL CWnd:: *pfn_vOWNER)(int, uint16 *);      // force return TRUE
+	int (AFX_MSG_CALL CWnd:: *pfn_iis)(int, uint16 *);
+	unsigned int(AFX_MSG_CALL CWnd:: *pfn_wp)(CPoint);
+	unsigned int(AFX_MSG_CALL CWnd:: *pfn_wv)(void);
 	void (AFX_MSG_CALL CWnd:: *pfn_vPOS)(WINDOWPOS *);
 	void (AFX_MSG_CALL CWnd:: *pfn_vCALC)(BOOL, NCCALCSIZE_PARAMS *);
-	void (AFX_MSG_CALL CWnd:: *pfn_vwp)(UINT, CPoint);
-	void (AFX_MSG_CALL CWnd:: *pfn_vwwh)(UINT, UINT, HANDLE);
-	BOOL(AFX_MSG_CALL CWnd:: *pfn_bwsp)(UINT, short, CPoint);
-	void (AFX_MSG_CALL CWnd:: *pfn_vws)(UINT, const char *);
+	void (AFX_MSG_CALL CWnd:: *pfn_vwp)(unsigned int, CPoint);
+	void (AFX_MSG_CALL CWnd:: *pfn_vwwh)(unsigned int, unsigned int, HANDLE);
+	BOOL(AFX_MSG_CALL CWnd:: *pfn_bwsp)(unsigned int, short, CPoint);
+	void (AFX_MSG_CALL CWnd:: *pfn_vws)(unsigned int, const char *);
 	void (AFX_MSG_CALL CWnd:: *pfn_vFb)(HFONT, BOOL);
 };
 
@@ -621,8 +621,8 @@ public:
 	BOOL Attach(HBITMAP hObject);
 	HBITMAP Detach();
 	BOOL CreateCompatibleBitmap(CDC *pDC, int nWidth, int nHeight);
-	BOOL CreateBitmap(int nWidth, int nHeight, UINT nPlanes,
-	    UINT nBitcount, const void *lpBits);
+	BOOL CreateBitmap(int nWidth, int nHeight, unsigned int nPlanes,
+	    unsigned int nBitcount, const void *lpBits);
 	int GetObject(int nCount, void *lpObject) const;
 	long GetBitmapBits(long dwCount, void *lpBits) const;
 	BOOL GetBitmap(BITMAP *pBitMap) const {
@@ -653,15 +653,15 @@ public:
 
 	BOOL CreatePalette(LPLOGPALETTE lpLogPalette);
 	int GetObject(int nCount, void *lpObject) const;
-	UINT GetEntryCount() const;
-	UINT GetPaletteEntries(UINT nStartIndex, UINT nNumEntries,
+	unsigned int GetEntryCount() const;
+	unsigned int GetPaletteEntries(unsigned int nStartIndex, unsigned int nNumEntries,
 	                       LPPALETTEENTRY lpPaletteColors) const;
-	UINT SetPaletteEntries(UINT nStartIndex, UINT nNumEntries,
+	unsigned int SetPaletteEntries(unsigned int nStartIndex, unsigned int nNumEntries,
 	                       LPPALETTEENTRY lpPaletteColors);
-	UINT SetPaletteEntries(const Graphics::Palette &pal);
-	BOOL AnimatePalette(UINT nStartIndex, UINT nNumEntries,
+	unsigned int SetPaletteEntries(const Graphics::Palette &pal);
+	BOOL AnimatePalette(unsigned int nStartIndex, unsigned int nNumEntries,
 	                    const PALETTEENTRY *lpPaletteColors);
-	UINT GetNearestPaletteIndex(COLORREF crColor);
+	unsigned int GetNearestPaletteIndex(COLORREF crColor);
 	bool isEmpty() const {
 		return !palette() || palette()->empty();
 	}
@@ -738,7 +738,7 @@ public:
 
 		HPALETTE selectPalette(HPALETTE pal, BOOL bForceBackground);
 		CPalette *selectPalette(CPalette *pal, BOOL bForceBackground);
-		UINT realizePalette();
+		unsigned int realizePalette();
 		COLORREF GetNearestColor(COLORREF crColor) const;
 
 		void fillSolidRect(LPCRECT lpRect, COLORREF clr);
@@ -749,7 +749,7 @@ public:
 		void frameRgn(const CRgn *pRgn, CBrush *brush, int nWidth, int nHeight);
 		void floodFill(int x, int y, COLORREF crColor);
 		void floodFill(int x, int y, COLORREF crColor,
-			UINT nFillType);
+			unsigned int nFillType);
 		void rectangle(LPCRECT lpRect);
 		void rectangle(int x1, int y1, int x2, int y2);
 		void draw3dRect(const CRect &rect, COLORREF clrTopLeft, COLORREF clrBottomRight);
@@ -781,19 +781,19 @@ public:
 		BOOL textOut(int x, int y, const CString &str,
 			int nTabPositions = 0, const int *lpnTabStopPositions = nullptr,
 			int nTabOrigin = 0, CSize *size = nullptr);
-		BOOL extTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
-			const char *lpszString, UINT nCount, int *lpDxWidths);
-		BOOL extTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
+		BOOL extTextOut(int x, int y, unsigned int nOptions, LPCRECT lpRect,
+			const char *lpszString, unsigned int nCount, int *lpDxWidths);
+		BOOL extTextOut(int x, int y, unsigned int nOptions, LPCRECT lpRect,
 			const CString &str, int *lpDxWidths);
 		CSize tabbedTextOut(int x, int y, const char *lpszString, int nCount,
 			int nTabPositions, const int *lpnTabStopPositions, int nTabOrigin);
 		CSize tabbedTextOut(int x, int y, const CString &str,
 			int nTabPositions, const int *lpnTabStopPositions, int nTabOrigin);
 
-		int drawText(const char *lpszString, int nCount, LPRECT lpRect, UINT nFormat,
+		int drawText(const char *lpszString, int nCount, LPRECT lpRect, unsigned int nFormat,
 			int nTabPositions = 0, const int *lpnTabStopPositions = nullptr,
 			int nTabOrigin = 0, CSize *size = nullptr);
-		int drawText(const CString &str, LPRECT lpRect, UINT nFormat,
+		int drawText(const CString &str, LPRECT lpRect, unsigned int nFormat,
 			int nTabPositions = 0, const int *lpnTabStopPositions = nullptr,
 			int nTabOrigin = 0, CSize *size = nullptr);
 
@@ -812,8 +812,8 @@ public:
 		BOOL grayString(CBrush *pBrush,
 			BOOL(CALLBACK *lpfnOutput)(HDC, LPARAM, int), LPARAM lpData,
 			int nCount, int x, int y, int nWidth, int nHeight);
-		UINT getTextAlign() const;
-		UINT setTextAlign(UINT nFlags);
+		unsigned int getTextAlign() const;
+		unsigned int setTextAlign(unsigned int nFlags);
 		BOOL getTextMetrics(LPTEXTMETRIC lpMetrics) const;
 	};
 
@@ -885,10 +885,10 @@ public:
 	void FillSolidRect(LPCRECT lpRect, COLORREF crColor);
 	BOOL FloodFill(int x, int y, COLORREF crColor);
 	BOOL FloodFill(int x, int y, COLORREF crColor,
-	               UINT nFillType);
+	               unsigned int nFillType);
 	void Rectangle(LPCRECT lpRect);
 	void Rectangle(int x1, int y1, int x2, int y2);
-	BOOL DrawEdge(LPRECT lpRect, UINT nEdge, UINT nFlags);
+	BOOL DrawEdge(LPRECT lpRect, unsigned int nEdge, unsigned int nFlags);
 
 	BOOL Pie(
 	    int x1, int y1,     // Upper-left corner of bounding rectangle
@@ -920,7 +920,7 @@ public:
 
 	COLORREF GetNearestColor(COLORREF crColor) const;
 	CPalette *SelectPalette(CPalette *pPalette, BOOL bForceBackground);
-	UINT RealizePalette();
+	unsigned int RealizePalette();
 	void UpdateColors();
 	virtual COLORREF SetBkColor(COLORREF crColor);
 	COLORREF GetBkColor() const;
@@ -930,17 +930,17 @@ public:
 	virtual COLORREF SetTextColor(COLORREF crColor);
 	virtual BOOL TextOut(int x, int y, const char *lpszString, int nCount);
 	BOOL TextOut(int x, int y, const CString &str);
-	virtual BOOL ExtTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
-	                        const char *lpszString, UINT nCount, int *lpDxWidths);
-	BOOL ExtTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
+	virtual BOOL ExtTextOut(int x, int y, unsigned int nOptions, LPCRECT lpRect,
+	                        const char *lpszString, unsigned int nCount, int *lpDxWidths);
+	BOOL ExtTextOut(int x, int y, unsigned int nOptions, LPCRECT lpRect,
 	                const CString &str, int *lpDxWidths);
 	virtual CSize TabbedTextOut(int x, int y, const char *lpszString, int nCount,
 	                            int nTabPositions, int *lpnTabStopPositions, int nTabOrigin);
 	CSize TabbedTextOut(int x, int y, const CString &str,
 	                    int nTabPositions, int *lpnTabStopPositions, int nTabOrigin);
 	int DrawText(const char *lpszString, int nCount,
-	             LPRECT lpRect, UINT nFormat);
-	int DrawText(const CString &str, LPRECT lpRect, UINT nFormat);
+	             LPRECT lpRect, unsigned int nFormat);
+	int DrawText(const CString &str, LPRECT lpRect, unsigned int nFormat);
 
 
 	CSize GetTextExtent(const char *lpszString, int nCount) const;
@@ -958,8 +958,8 @@ public:
 	virtual BOOL GrayString(CBrush *pBrush,
 	                        BOOL(CALLBACK *lpfnOutput)(HDC, LPARAM, int), LPARAM lpData,
 	                        int nCount, int x, int y, int nWidth, int nHeight);
-	UINT GetTextAlign() const;
-	UINT SetTextAlign(UINT nFlags);
+	unsigned int GetTextAlign() const;
+	unsigned int SetTextAlign(unsigned int nFlags);
 	BOOL GetTextMetrics(LPTEXTMETRIC lpMetrics) const;
 };
 
@@ -982,13 +982,13 @@ class CCmdTarget : public CObject {
 	DECLARE_DYNAMIC(CCmdTarget)
 
 protected:
-	const AFX_MSGMAP_ENTRY *LookupMessage(UINT message);
+	const AFX_MSGMAP_ENTRY *LookupMessage(unsigned int message);
 	const AFX_MSGMAP_ENTRY *AfxFindMessageEntry(
 		const AFX_MSGMAP_ENTRY *lpEntry,
-		UINT nMsg, UINT nCode, UINT nID);
+		unsigned int nMsg, unsigned int nCode, unsigned int nID);
 	bool _AfxDispatchCmdMsg(CCmdTarget *pTarget,
-		UINT nID, int nCode, AFX_PMSG pfn, void *pExtra,
-		UINT nSig, AFX_CMDHANDLERINFO *pHandlerInfo);
+		unsigned int nID, int nCode, AFX_PMSG pfn, void *pExtra,
+		unsigned int nSig, AFX_CMDHANDLERINFO *pHandlerInfo);
 
 public:
 	~CCmdTarget() override {
@@ -1008,7 +1008,7 @@ public:
 	void EndWaitCursor();
 	void RestoreWaitCursor();
 
-	BOOL OnCmdMsg(UINT nID, int nCode, void *pExtra,
+	BOOL OnCmdMsg(unsigned int nID, int nCode, void *pExtra,
 		AFX_CMDHANDLERINFO *pHandlerInfo);
 };
 
@@ -1050,7 +1050,7 @@ public:
 	virtual BOOL IsModified();
 	virtual void SetModifiedFlag(BOOL bModified = TRUE);
 	virtual void ReportSaveLoadException(const char *lpszPathName,
-		CException *e, BOOL bSaving, UINT nIDPDefault);
+		CException *e, BOOL bSaving, unsigned int nIDPDefault);
 	bool SaveModified();
 
 	void AddView(CView *pView);
@@ -1127,15 +1127,15 @@ protected:
 	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT *pResult) {
 		return false;
 	}
-	virtual void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized);
+	virtual void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized);
 
-	virtual LRESULT DefWindowProc(UINT nMsg, WPARAM wParam, LPARAM lParam) {
+	virtual LRESULT DefWindowProc(unsigned int nMsg, WPARAM wParam, LPARAM lParam) {
 		return 0;
 	}
 	virtual void OnSetFont(CFont *pFont) {
 	}
 
-	BOOL OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult);
+	BOOL OnWndMsg(unsigned int message, WPARAM wParam, LPARAM lParam, LRESULT *pResult);
 
 	afx_msg void OnActivateApp(BOOL bActive, uint32 dwThreadID) {}
 	afx_msg LRESULT OnActivateTopLevel(WPARAM, LPARAM) {
@@ -1149,25 +1149,25 @@ protected:
 		return 0;
 	}
 
-	afx_msg HBRUSH OnCtlColor(CDC *pDC, CWnd *pWnd, UINT nCtlColor) {
+	afx_msg HBRUSH OnCtlColor(CDC *pDC, CWnd *pWnd, unsigned int nCtlColor) {
 		return 0;
 	}
 
 	afx_msg void OnDestroy() {}
 	afx_msg void OnEnable(BOOL bEnable) {}
 	afx_msg void OnEndSession(BOOL bEnding) {}
-	afx_msg void OnEnterIdle(UINT nWhy, CWnd *pWho) {}
+	afx_msg void OnEnterIdle(unsigned int nWhy, CWnd *pWho) {}
 	afx_msg BOOL OnEraseBkgnd(CDC *pDC) {
 		return false;
 	}
 	afx_msg void OnIconEraseBkgnd(CDC *pDC) {}
 	afx_msg void OnKillFocus(CWnd *pNewWnd) {}
-	afx_msg void OnMenuSelect(UINT nItemID, UINT nFlags, HMENU hSysMenu) {}
+	afx_msg void OnMenuSelect(unsigned int nItemID, unsigned int nFlags, HMENU hSysMenu) {}
 	afx_msg void OnMove(int x, int y) {}
 	afx_msg void OnPaint() {}
 	afx_msg void OnSyncPaint() {}
-	afx_msg void OnParentNotify(UINT message, LPARAM lParam) {}
-	afx_msg UINT OnNotifyFormat(CWnd *pWnd, UINT nCommand) {
+	afx_msg void OnParentNotify(unsigned int message, LPARAM lParam) {}
+	afx_msg unsigned int OnNotifyFormat(CWnd *pWnd, unsigned int nCommand) {
 		return 0;
 	}
 	afx_msg HCURSOR OnQueryDragIcon() {
@@ -1183,14 +1183,14 @@ protected:
 		return false;
 	}
 	afx_msg void OnSetFocus(CWnd *pOldWnd) {}
-	afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
-	afx_msg void OnSize(UINT nType, int cx, int cy) {}
-	afx_msg void OnTCard(UINT idAction, uint32 dwActionData) {}
-	afx_msg void OnSessionChange(UINT nSessionState, UINT nId) {}
-
-	afx_msg void OnChangeUIState(UINT nAction, UINT nUIElement) {}
-	afx_msg void OnUpdateUIState(UINT nAction, UINT nUIElement) {}
-	afx_msg UINT OnQueryUIState() {
+	afx_msg void OnShowWindow(BOOL bShow, unsigned int nStatus);
+	afx_msg void OnSize(unsigned int nType, int cx, int cy) {}
+	afx_msg void OnTCard(unsigned int idAction, uint32 dwActionData) {}
+	afx_msg void OnSessionChange(unsigned int nSessionState, unsigned int nId) {}
+
+	afx_msg void OnChangeUIState(unsigned int nAction, unsigned int nUIElement) {}
+	afx_msg void OnUpdateUIState(unsigned int nAction, unsigned int nUIElement) {}
+	afx_msg unsigned int OnQueryUIState() {
 		return 0;
 	}
 
@@ -1206,96 +1206,96 @@ protected:
 	afx_msg LRESULT OnNcHitTest(CPoint point) {
 		return 0;
 	}
-	afx_msg void OnNcLButtonDblClk(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcLButtonUp(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcMButtonDblClk(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcMButtonDown(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcMButtonUp(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcMouseHover(UINT nHitTest, CPoint point) {}
+	afx_msg void OnNcLButtonDblClk(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcLButtonDown(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcLButtonUp(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcMButtonDblClk(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcMButtonDown(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcMButtonUp(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcMouseHover(unsigned int nHitTest, CPoint point) {}
 	afx_msg void OnNcMouseLeave() {}
-	afx_msg void OnNcMouseMove(UINT nHitTest, CPoint point) {}
+	afx_msg void OnNcMouseMove(unsigned int nHitTest, CPoint point) {}
 	afx_msg void OnNcPaint() {}
-	afx_msg void OnNcRButtonDblClk(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcRButtonDown(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcRButtonUp(UINT nHitTest, CPoint point) {}
-	afx_msg void OnNcXButtonDown(short zHitTest, UINT nButton, CPoint point) {}
-	afx_msg void OnNcXButtonUp(short zHitTest, UINT nButton, CPoint point) {}
-	afx_msg void OnNcXButtonDblClk(short zHitTest, UINT nButton, CPoint point) {}
+	afx_msg void OnNcRButtonDblClk(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcRButtonDown(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcRButtonUp(unsigned int nHitTest, CPoint point) {}
+	afx_msg void OnNcXButtonDown(short zHitTest, unsigned int nButton, CPoint point) {}
+	afx_msg void OnNcXButtonUp(short zHitTest, unsigned int nButton, CPoint point) {}
+	afx_msg void OnNcXButtonDblClk(short zHitTest, unsigned int nButton, CPoint point) {}
 
 	// System message handler member functions
 	afx_msg void OnDropFiles(HDROP hDropInfo) {}
 	afx_msg void OnPaletteIsChanging(CWnd *pRealizeWnd) {}
-	afx_msg void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg void OnSysCommand(UINT nID, LPARAM lParam) {}
-	afx_msg void OnSysDeadChar(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg BOOL OnAppCommand(CWnd *pWnd, UINT nCmd, UINT nDevice, UINT nKey) {
+	afx_msg void OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg void OnSysCommand(unsigned int nID, LPARAM lParam) {}
+	afx_msg void OnSysDeadChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg void OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg void OnSysKeyUp(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg BOOL OnAppCommand(CWnd *pWnd, unsigned int nCmd, unsigned int nDevice, unsigned int nKey) {
 		return false;
 	}
-	afx_msg void OnRawInput(UINT nInputCode, HRAWINPUT hRawInput) {}
-	afx_msg void OnCompacting(UINT nCpuTime) {}
-	afx_msg void OnDevModeChange(_In_z_ LPTSTR lpDeviceName) {}
+	afx_msg void OnRawInput(unsigned int nInputCode, HRAWINPUT hRawInput) {}
+	afx_msg void OnCompacting(unsigned int nCpuTime) {}
+	afx_msg void OnDevModeChange(_In_z_ uint16 * lpDeviceName) {}
 	afx_msg void OnFontChange() {}
 	afx_msg void OnPaletteChanged(CWnd *pFocusWnd) {}
-	afx_msg void OnSpoolerStatus(UINT nStatus, UINT nJobs) {}
+	afx_msg void OnSpoolerStatus(unsigned int nStatus, unsigned int nJobs) {}
 	afx_msg void OnSysColorChange() {}
 	afx_msg void OnTimeChange() {}
-	afx_msg void OnSettingChange(UINT uFlags, const char *lpszSection) {}
+	afx_msg void OnSettingChange(unsigned int uFlags, const char *lpszSection) {}
 	afx_msg void OnWinIniChange(const char *lpszSection) {}
-	afx_msg UINT OnPowerBroadcast(UINT nPowerEvent, LPARAM lEventData) {
+	afx_msg unsigned int OnPowerBroadcast(unsigned int nPowerEvent, LPARAM lEventData) {
 		return 0;
 	}
 	afx_msg void OnUserChanged() {}
-	afx_msg void OnInputLangChange(UINT nCharSet, UINT nLocaleId) {}
-	afx_msg void OnInputLangChangeRequest(UINT nFlags, UINT nLocaleId) {}
+	afx_msg void OnInputLangChange(unsigned int nCharSet, unsigned int nLocaleId) {}
+	afx_msg void OnInputLangChangeRequest(unsigned int nFlags, unsigned int nLocaleId) {}
 	afx_msg void OnInputDeviceChange(unsigned short nFlags, HANDLE hDevice) {}
 
 	// Input message handler member functions
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg void OnDeadChar(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg void OnUniChar(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar *pScrollBar) {}
-	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar *pScrollBar) {}
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) {}
-	afx_msg void OnHotKey(UINT nHotKeyId, UINT nKey1, UINT nKey2) {}
-	afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point) {}
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point) {}
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point) {}
-	afx_msg void OnMButtonDblClk(UINT nFlags, CPoint point) {}
-	afx_msg void OnMButtonDown(UINT nFlags, CPoint point) {}
-	afx_msg void OnMButtonUp(UINT nFlags, CPoint point) {}
-	afx_msg void OnXButtonDblClk(UINT nFlags, UINT nButton, CPoint point) {}
-	afx_msg void OnXButtonDown(UINT nFlags, UINT nButton, CPoint point) {}
-	afx_msg void OnXButtonUp(UINT nFlags, UINT nButton, CPoint point) {}
-	afx_msg int OnMouseActivate(CWnd *pDesktopWnd, UINT nHitTest, UINT message) {
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg void OnDeadChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg void OnUniChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *pScrollBar) {}
+	afx_msg void OnVScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar *pScrollBar) {}
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg void OnKeyUp(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {}
+	afx_msg void OnHotKey(unsigned int nHotKeyId, unsigned int nKey1, unsigned int nKey2) {}
+	afx_msg void OnLButtonDblClk(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnLButtonDown(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnLButtonUp(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnMButtonDblClk(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnMButtonDown(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnMButtonUp(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnXButtonDblClk(unsigned int nFlags, unsigned int nButton, CPoint point) {}
+	afx_msg void OnXButtonDown(unsigned int nFlags, unsigned int nButton, CPoint point) {}
+	afx_msg void OnXButtonUp(unsigned int nFlags, unsigned int nButton, CPoint point) {}
+	afx_msg int OnMouseActivate(CWnd *pDesktopWnd, unsigned int nHitTest, unsigned int message) {
 		return 0;
 	}
-	afx_msg void OnMouseHover(UINT nFlags, CPoint point) {}
+	afx_msg void OnMouseHover(unsigned int nFlags, CPoint point) {}
 	afx_msg void OnMouseLeave() {}
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point) {}
-	afx_msg void OnMouseHWheel(UINT nFlags, short zDelta, CPoint pt) {}
-	afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) {
+	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnMouseHWheel(unsigned int nFlags, short zDelta, CPoint pt) {}
+	afx_msg BOOL OnMouseWheel(unsigned int nFlags, short zDelta, CPoint pt) {
 		return false;
 	}
-	afx_msg void OnRButtonDblClk(UINT nFlags, CPoint point) {}
-	afx_msg void OnRButtonDown(UINT nFlags, CPoint point) {}
-	afx_msg void OnRButtonUp(UINT nFlags, CPoint point) {}
-	afx_msg BOOL OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message);
-	afx_msg void OnTimer(UINT_PTR nIDEvent) {}
+	afx_msg void OnRButtonDblClk(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnRButtonDown(unsigned int nFlags, CPoint point) {}
+	afx_msg void OnRButtonUp(unsigned int nFlags, CPoint point) {}
+	afx_msg BOOL OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message);
+	afx_msg void OnTimer(uintptr nIDEvent) {}
 
 	// Control message handler member functions
 	afx_msg void OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct);
-	afx_msg UINT OnGetDlgCode() {
+	afx_msg unsigned int OnGetDlgCode() {
 		return 0;
 	}
 	afx_msg void OnMeasureItem(int nIDCtl, LPMEASUREITEMSTRUCT lpMeasureItemStruct) {}
-	afx_msg int OnCharToItem(UINT nChar, CListBox *pListBox, UINT nIndex) {
+	afx_msg int OnCharToItem(unsigned int nChar, CListBox *pListBox, unsigned int nIndex) {
 		return 0;
 	}
-	afx_msg int OnVKeyToItem(UINT nKey, CListBox *pListBox, UINT nIndex) {
+	afx_msg int OnVKeyToItem(unsigned int nKey, CListBox *pListBox, unsigned int nIndex) {
 		return 0;
 	}
 	afx_msg void OnSetFont(HFONT hFont, BOOL bRedraw);
@@ -1316,7 +1316,7 @@ protected:
 	 * be sent recursively to all child controls
 	 * in addition to the current.
 	 */
-	static bool isRecursiveMessage(UINT message);
+	static bool isRecursiveMessage(unsigned int message);
 
 public:
 	// For ScummVM the m_hWnd just points to the window itself,
@@ -1355,7 +1355,7 @@ public:
 	~CWnd() override;
 
 	BOOL Create(const char *lpszClassName, const char *lpszWindowName,
-	    uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID,
+	    uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, unsigned int nID,
 	    CCreateContext *pContext = nullptr);
 	BOOL CreateEx(uint32 dwExStyle, const char *lpszClassName,
 		const char *lpszWindowName, uint32 dwStyle,
@@ -1363,7 +1363,7 @@ public:
 		HWND hWndParent, LPARAM nIDorHMenu, void *lpParam = nullptr);
 	BOOL CreateEx(uint32 dwExStyle, const char *lpszClassName,
 		const char *lpszWindowName, uint32 dwStyle,
-		const RECT &rect, CWnd *pParentWnd, UINT nID,
+		const RECT &rect, CWnd *pParentWnd, unsigned int nID,
 		void *lpParam = nullptr);
 
 	/**
@@ -1385,7 +1385,7 @@ public:
 	BOOL RedrawWindow(
 	    LPCRECT lpRectUpdate = nullptr,
 	    CRgn *prgnUpdate = nullptr,
-	    UINT flags = RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN
+	    unsigned int flags = RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN
 	);
 	void SetActiveWindow();
 	void SetFocus();
@@ -1398,7 +1398,7 @@ public:
 	int GetWindowText(CString &rString) const;
 	int GetWindowText(char *lpszStringBuf, int nMaxCount) const;
 	BOOL SetWindowText(const char *lpszString);
-	UINT GetState() const;
+	unsigned int GetState() const;
 	uint32 GetStyle() const {
 		return m_nStyle;
 	}
@@ -1411,12 +1411,12 @@ public:
 	CDC *GetDC();
 	int ReleaseDC(CDC *pDC);
 
-	BOOL PostMessage(UINT message, WPARAM wParam = 0, LPARAM lParam = 0);
-	LRESULT SendMessage(UINT message, WPARAM wParam = 0, LPARAM lParam = 0);
-	void SendMessageToDescendants(UINT message,
+	BOOL PostMessage(unsigned int message, WPARAM wParam = 0, LPARAM lParam = 0);
+	LRESULT SendMessage(unsigned int message, WPARAM wParam = 0, LPARAM lParam = 0);
+	void SendMessageToDescendants(unsigned int message,
 		WPARAM wParam = 0, LPARAM lParam = 0,
 		bool bDeep = true, bool bOnlyPerm = false);
-	static void SendMessageToDescendants(HWND hWnd, UINT message,
+	static void SendMessageToDescendants(HWND hWnd, unsigned int message,
 		WPARAM wParam, LPARAM lParam, BOOL bDeep, BOOL bOnlyPerm);
 
 	BOOL Validate();
@@ -1442,16 +1442,16 @@ public:
 	CWnd *GetDlgItem(int nID) const;
 	CWnd *GetNextDlgGroupItem(CWnd *pWndCtl, BOOL bPrevious = FALSE) const;
 	BOOL GotoDlgCtrl(CWnd *pWndCtrl);
-	BOOL SubclassDlgItem(UINT nID, CWnd *pParent);
+	BOOL SubclassDlgItem(unsigned int nID, CWnd *pParent);
 	BOOL SetDlgItemText(int nIDDlgItem, const char *lpString);
 	int GetDlgCtrlID() const;
-	void CheckDlgButton(int nIDButton, UINT nCheck);
-	LRESULT SendDlgItemMessage(int nID, UINT message,
+	void CheckDlgButton(int nIDButton, unsigned int nCheck);
+	LRESULT SendDlgItemMessage(int nID, unsigned int message,
 	                           WPARAM wParam = 0, LPARAM lParam = 0) const;
 
-	UINT_PTR SetTimer(UINT_PTR nIDEvent, UINT nElapse,
-	    void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32) = nullptr);
-	BOOL KillTimer(UINT_PTR nIDEvent);
+	uintptr SetTimer(uintptr nIDEvent, unsigned int nElapse,
+	    void (CALLBACK *lpfnTimer)(HWND, unsigned int, uintptr, uint32) = nullptr);
+	BOOL KillTimer(uintptr nIDEvent);
 
 	virtual BOOL PreTranslateMessage(MSG *pMsg) {
 		return false;
@@ -1494,12 +1494,12 @@ class CFrameWnd : public CWnd {
 
 private:
 	CString m_strTitle;
-	UINT m_nIDHelp = 0;
+	unsigned int m_nIDHelp = 0;
 	CView *m_pViewActive = nullptr;
 
 	void ActivateFrame(int nCmdShow);
 	void OnUpdateFrameTitle(BOOL bAddToTitle);
-	CWnd *CreateView(CCreateContext *pContext, UINT nID);
+	CWnd *CreateView(CCreateContext *pContext, unsigned int nID);
 
 protected:
 	BOOL PreCreateWindow(CREATESTRUCT &cCs) override {
@@ -1508,16 +1508,16 @@ protected:
 	int OnCreate(LPCREATESTRUCT lpcs);
 	int OnCreateHelper(LPCREATESTRUCT lpcs, CCreateContext *pContext);
 	BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext *pContext);
-	void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) override;
+	void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) override;
 
 	enum RepositionFlags {
 		reposDefault = 0, reposQuery = 1, reposExtra = 2, reposNoPosLeftOver = 0x8000
 	};
 	BOOL RepositionBars(
-	    UINT nIDFirst,
-	    UINT nIDLast,
-	    UINT nIDLeftOver,
-	    UINT nFlag = reposDefault,
+	    unsigned int nIDFirst,
+	    unsigned int nIDLast,
+	    unsigned int nIDLeftOver,
+	    unsigned int nFlag = reposDefault,
 	    LPRECT lpRectParam = nullptr,
 	    LPCRECT lpRectClient = nullptr,
 	    BOOL bStretch = TRUE
@@ -1547,7 +1547,7 @@ public:
 	void RecalcLayout(BOOL bNotify = TRUE);
 	void InitialUpdateFrame(CDocument *pDoc, BOOL bMakeVisible);
 
-	BOOL LoadFrame(UINT nIDResource, uint32 dwDefaultStyle,
+	BOOL LoadFrame(unsigned int nIDResource, uint32 dwDefaultStyle,
 		CWnd *pParentWnd, CCreateContext *pContext);
 
 	CView *GetActiveView() const;
@@ -1562,7 +1562,7 @@ class CDialog : public CWnd {
 
 private:
 	const char *m_lpszTemplateName = nullptr;
-	UINT m_nIDHelp = 0;
+	unsigned int m_nIDHelp = 0;
 	LPCDLGTEMPLATE m_lpDialogTemplate = nullptr;
 	HGLOBAL m_hDialogTemplate = 0;
 	int _defaultId = 0;
@@ -1585,19 +1585,19 @@ protected:
 	virtual void PostModal() {
 	}
 
-	void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-	void OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) override;
+	void OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	void OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) override;
 
 public:
 	CDialog() {}
 	explicit CDialog(const char *lpszTemplateName,
 	                 CWnd *pParentWnd = nullptr);
-	explicit CDialog(UINT nIDTemplate,
+	explicit CDialog(unsigned int nIDTemplate,
 	                 CWnd *pParentWnd = nullptr);
 	~CDialog() override {}
 	BOOL Create(const char *lpszTemplateName,
 	            CWnd *pParentWnd = nullptr);
-	BOOL Create(UINT nIDTemplate,
+	BOOL Create(unsigned int nIDTemplate,
 	            CWnd *pParentWnd = nullptr);
 
 	int DoModal();
@@ -1608,7 +1608,7 @@ public:
 	BOOL PreTranslateMessage(MSG *pMsg) override;
 
 	uint32 GetDefID() const;
-	void SetDefID(UINT nID);
+	void SetDefID(unsigned int nID);
 	LRESULT HandleInitDialog(WPARAM, LPARAM);
 	LRESULT HandleSetFont(WPARAM, LPARAM);
 	void AFXAPI DDX_Control(CDataExchange *pDX, int nIDC, CWnd &rControl);
@@ -1617,7 +1617,7 @@ public:
 	void AFXAPI DDX_Text(CDataExchange *pDX,
 	                     int nIDC, int &value);
 	void AFXAPI DDX_Text(CDataExchange *pDX, int nIDC, CString &value);
-	void AFXAPI DDX_Text(CDataExchange *pDX, int nIDC, UINT &value);
+	void AFXAPI DDX_Text(CDataExchange *pDX, int nIDC, unsigned int &value);
 	void AFXAPI DDX_Text(CDataExchange *pDX, int nIDC, long &value);
 	void AFXAPI DDX_Text(CDataExchange *pDX, int nIDC, double &value);
 	void AFXAPI DDX_Check(CDataExchange *pDX,
@@ -1656,9 +1656,9 @@ protected:
 	DECLARE_MESSAGE_MAP()
 
 	void OnPaint();
-	void OnLButtonDown(UINT nFlags, CPoint point);
-	void OnLButtonUp(UINT nFlags, CPoint point);
-	void OnMouseMove(UINT nFlags, CPoint point);
+	void OnLButtonDown(unsigned int nFlags, CPoint point);
+	void OnLButtonUp(unsigned int nFlags, CPoint point);
+	void OnMouseMove(unsigned int nFlags, CPoint point);
 	LRESULT OnBnClicked(WPARAM wParam, LPARAM lParam);
 	LRESULT OnBnSetCheck(WPARAM wParam, LPARAM lParam);
 
@@ -1666,12 +1666,12 @@ public:
 	~CButton() override {
 	}
 	CVIRTUAL BOOL Create(const char *lpszCaption, uint32 dwStyle,
-	                     const RECT &rect, CWnd *pParentWnd, UINT nID);
+	                     const RECT &rect, CWnd *pParentWnd, unsigned int nID);
 
 	int GetCheck() const;
 	void SetCheck(int nCheck);
-	void SetButtonStyle(UINT nStyle, BOOL bRedraw = TRUE);
-	UINT GetButtonStyle() const;
+	void SetButtonStyle(unsigned int nStyle, BOOL bRedraw = TRUE);
+	unsigned int GetButtonStyle() const;
 };
 
 class CListBox : public CWnd {
@@ -1705,16 +1705,16 @@ protected:
 public:
 	~CEdit() override {
 	}
-	CVIRTUAL BOOL Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID);
+	CVIRTUAL BOOL Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, unsigned int nID);
 	void LimitText(int nChars);
 	void SetSel(int nStartChar, int nEndChar, BOOL bNoScroll = FALSE);
 
 	afx_msg void OnPaint();
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
+	afx_msg void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+	afx_msg void OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
 	afx_msg void OnSetFocus(CWnd *pOldWnd);
 	afx_msg void OnKillFocus(CWnd *pNewWnd);
-	afx_msg void OnTimer(UINT_PTR nTimerId);
+	afx_msg void OnTimer(uintptr nTimerId);
 };
 
 class CScrollBar : public CWnd {
@@ -1735,13 +1735,13 @@ private:
 protected:
 	DECLARE_MESSAGE_MAP()
 	void OnPaint();
-	void OnLButtonDown(UINT nFlags, CPoint point);
-	void OnLButtonUp(UINT nFlags, CPoint point);
-	void OnMouseMove(UINT, CPoint point);
+	void OnLButtonDown(unsigned int nFlags, CPoint point);
+	void OnLButtonUp(unsigned int nFlags, CPoint point);
+	void OnMouseMove(unsigned int, CPoint point);
 
 public:
 	~CScrollBar() override { }
-	CVIRTUAL BOOL Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID);
+	CVIRTUAL BOOL Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, unsigned int nID);
 
 	int GetScrollPos() const override;
 	int SetScrollPos(int nPos, BOOL bRedraw = true) override;
@@ -1776,7 +1776,7 @@ public:
 	void OnInitialUpdate();
 	virtual void OnUpdate(CView *pSender, LPARAM /*lHint*/, CObject * /*pHint*/);
 	virtual void OnActivateView(BOOL, CView *, CView *) {}
-	virtual void OnActivateFrame(UINT nState, CFrameWnd *pFrameWnd) {}
+	virtual void OnActivateFrame(unsigned int nState, CFrameWnd *pFrameWnd) {}
 
 	CFrameWnd *GetParentFrame() const {
 		return dynamic_cast<CFrameWnd *>(m_pParentWnd);
@@ -1813,7 +1813,7 @@ public:
 class CDocTemplate : public CCmdTarget {
 	DECLARE_DYNAMIC(CDocTemplate)
 private:
-	UINT m_nIDResource = 0;
+	unsigned int m_nIDResource = 0;
 	const CRuntimeClass *m_pDocClass = nullptr;
 	const CRuntimeClass *m_pFrameClass = nullptr;
 	const CRuntimeClass *m_pViewClass = nullptr;
@@ -1821,7 +1821,7 @@ private:
 protected:
 	DECLARE_MESSAGE_MAP()
 
-	CDocTemplate(UINT nIDResource, const CRuntimeClass *pDocClass,
+	CDocTemplate(unsigned int nIDResource, const CRuntimeClass *pDocClass,
 	    const CRuntimeClass *pFrameClass, const CRuntimeClass *pViewClass);
 
 public:
@@ -1865,7 +1865,7 @@ public:
 
 public:
 	CSingleDocTemplate(
-	    UINT nIDResource,
+	    unsigned int nIDResource,
 	    const CRuntimeClass *pDocClass,
 	    const CRuntimeClass *pFrameClass,
 	    const CRuntimeClass *pViewClass
@@ -1968,7 +1968,7 @@ public:
 	void SetDialogBkColor();
 	HCURSOR LoadStandardCursor(const char *lpszCursorName);
 	HCURSOR LoadCursor(const char *lpszResourceName);
-	HCURSOR LoadCursor(UINT nIDResource);
+	HCURSOR LoadCursor(unsigned int nIDResource);
 	HCURSOR SetCursor(HCURSOR hCursor);
 	void BeginWaitCursor();
 	void EndWaitCursor();
@@ -1982,7 +1982,7 @@ public:
 	void AddDocTemplate(CDocTemplate *pTemplate);
 	void CloseAllDocuments(BOOL bEndSession);
 
-	UINT GetProfileInt(const char *lpszSection,
+	unsigned int GetProfileInt(const char *lpszSection,
 	    const char *lpszEntry, int nDefault);
 	void WriteProfileInt(const char *lpszSection,
 	    const char *lpszEntry, int nValue);
@@ -2065,7 +2065,7 @@ public:
 		return (HPALETTE)_systemPalette.m_hObject;
 	}
 
-	const char *AfxRegisterWndClass(UINT nClassStyle,
+	const char *AfxRegisterWndClass(unsigned int nClassStyle,
 		HCURSOR hCursor, HBRUSH hbrBackground, HICON hIcon);
 	BOOL GetClassInfo(HINSTANCE hInstance,
 		const char *  lpClassName, LPWNDCLASS lpWndClass);
diff --git a/engines/bagel/mfc/atltime.h b/engines/bagel/mfc/atltime.h
index a1ce2a98be4..a05781c3bb5 100644
--- a/engines/bagel/mfc/atltime.h
+++ b/engines/bagel/mfc/atltime.h
@@ -40,12 +40,12 @@ public:
 	    int nMins,
 	    int nSecs);
 
-	LONGLONG GetDays() const;
-	LONGLONG GetTotalHours() const;
+	int64 GetDays() const;
+	int64 GetTotalHours() const;
 	long GetHours() const;
-	LONGLONG GetTotalMinutes() const;
+	int64 GetTotalMinutes() const;
 	long GetMinutes() const;
-	LONGLONG GetTotalSeconds() const;
+	int64 GetTotalSeconds() const;
 	long GetSeconds() const;
 
 	int64 GetTimeSpan() const;
@@ -63,7 +63,7 @@ public:
 
 public:
 	CString Format(const char *pszFormat) const;
-	CString Format(UINT nID) const;
+	CString Format(unsigned int nID) const;
 
 private:
 	int64 m_timeSpan;
@@ -124,8 +124,8 @@ public:
 	// formatting using "C" strftime
 	CString Format(const char *pszFormat) const;
 	CString FormatGmt(const char *pszFormat) const;
-	CString Format(UINT nFormatID) const;
-	CString FormatGmt(UINT nFormatID) const;
+	CString Format(unsigned int nFormatID) const;
+	CString FormatGmt(unsigned int nFormatID) const;
 
 private:
 	int64 m_time;
@@ -135,7 +135,7 @@ class CFileTimeSpan {
 public:
 	CFileTimeSpan();
 	CFileTimeSpan(const CFileTimeSpan &span);
-	CFileTimeSpan(LONGLONG nSpan);
+	CFileTimeSpan(int64 nSpan);
 
 	CFileTimeSpan &operator=(const CFileTimeSpan &span);
 
@@ -152,18 +152,18 @@ public:
 	bool operator<=(CFileTimeSpan span) const;
 	bool operator>=(CFileTimeSpan span) const;
 
-	LONGLONG GetTimeSpan() const;
-	void SetTimeSpan(LONGLONG nSpan);
+	int64 GetTimeSpan() const;
+	void SetTimeSpan(int64 nSpan);
 
 protected:
-	LONGLONG m_nSpan;
+	int64 m_nSpan;
 };
 
 class CFileTime : public FILETIME {
 public:
 	CFileTime();
 	CFileTime(const FILETIME &ft);
-	CFileTime(ULONGLONG nTime);
+	CFileTime(uint64 nTime);
 
 	static CFileTime WINAPI GetCurrentTime();
 
@@ -183,18 +183,18 @@ public:
 	bool operator<=(CFileTime ft) const;
 	bool operator>=(CFileTime ft) const;
 
-	ULONGLONG GetTime() const;
-	void SetTime(ULONGLONG nTime);
+	uint64 GetTime() const;
+	void SetTime(uint64 nTime);
 
 	CFileTime UTCToLocal() const;
 	CFileTime LocalToUTC() const;
 
-	static const ULONGLONG Millisecond = 10000;
-	static const ULONGLONG Second = Millisecond * static_cast<ULONGLONG>(1000);
-	static const ULONGLONG Minute = Second * static_cast<ULONGLONG>(60);
-	static const ULONGLONG Hour = Minute * static_cast<ULONGLONG>(60);
-	static const ULONGLONG Day = Hour * static_cast<ULONGLONG>(24);
-	static const ULONGLONG Week = Day * static_cast<ULONGLONG>(7);
+	static const uint64 Millisecond = 10000;
+	static const uint64 Second = Millisecond * static_cast<uint64>(1000);
+	static const uint64 Minute = Second * static_cast<uint64>(60);
+	static const uint64 Hour = Minute * static_cast<uint64>(60);
+	static const uint64 Day = Hour * static_cast<uint64>(24);
+	static const uint64 Week = Day * static_cast<uint64>(7);
 };
 
 } // namespace MFC
diff --git a/engines/bagel/mfc/bitmap.cpp b/engines/bagel/mfc/bitmap.cpp
index 8f8ba95ee4b..c32b6a5a3c7 100644
--- a/engines/bagel/mfc/bitmap.cpp
+++ b/engines/bagel/mfc/bitmap.cpp
@@ -58,8 +58,8 @@ BOOL CBitmap::CreateCompatibleBitmap(CDC *pDC, int nWidth, int nHeight) {
 	return true;
 }
 
-BOOL CBitmap::CreateBitmap(int nWidth, int nHeight, UINT nPlanes,
-		UINT nBitcount, const void *lpBits) {
+BOOL CBitmap::CreateBitmap(int nWidth, int nHeight, unsigned int nPlanes,
+		unsigned int nBitcount, const void *lpBits) {
 	assert(nPlanes == 1);
 
 	BITMAPINFOHEADER h;
diff --git a/engines/bagel/mfc/button.cpp b/engines/bagel/mfc/button.cpp
index 0b9425eb102..cbb0f5dfa56 100644
--- a/engines/bagel/mfc/button.cpp
+++ b/engines/bagel/mfc/button.cpp
@@ -36,7 +36,7 @@ ON_MESSAGE(BM_SETCHECK, CButton::OnBnSetCheck)
 END_MESSAGE_MAP()
 
 BOOL CButton::Create(const char *lpszCaption, uint32 dwStyle,
-		const RECT &rect, CWnd *pParentWnd, UINT nID) {
+		const RECT &rect, CWnd *pParentWnd, unsigned int nID) {
 	return CWnd::Create("BUTTON", lpszCaption, dwStyle, rect,
 		pParentWnd, nID);
 }
@@ -50,12 +50,12 @@ void CButton::SetCheck(int nCheck) {
 	SendMessage(BM_SETCHECK, nCheck);
 }
 
-void CButton::SetButtonStyle(UINT nStyle, BOOL bRedraw) {
+void CButton::SetButtonStyle(unsigned int nStyle, BOOL bRedraw) {
 	m_nStyle = (m_nStyle & ~0xf) | nStyle;
 	Invalidate();
 }
 
-UINT CButton::GetButtonStyle() const {
+unsigned int CButton::GetButtonStyle() const {
 	return GetStyle() & 0xf;
 }
 
@@ -196,7 +196,7 @@ void CButton::OnOwnerDrawPaint() {
 	EndPaint(&paintStruct);
 }
 
-void CButton::OnLButtonDown(UINT nFlags, CPoint point) {
+void CButton::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	if (!(_itemState & ODS_DISABLED)) {
 		SetCapture();
 		_pressed = true;
@@ -204,7 +204,7 @@ void CButton::OnLButtonDown(UINT nFlags, CPoint point) {
 	}
 }
 
-void CButton::OnLButtonUp(UINT nFlags, CPoint point) {
+void CButton::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	if (GetCapture() == this)
 		ReleaseCapture();
 	if (!_pressed)
@@ -240,7 +240,7 @@ void CButton::OnLButtonUp(UINT nFlags, CPoint point) {
 	}
 }
 
-void CButton::OnMouseMove(UINT nFlags, CPoint point) {
+void CButton::OnMouseMove(unsigned int nFlags, CPoint point) {
 	if (GetCapture() == this) {
 		if (_pressed != PointInClientRect(point)) {
 			_pressed = !_pressed;
diff --git a/engines/bagel/mfc/cmd_target.cpp b/engines/bagel/mfc/cmd_target.cpp
index 6d8ad57e219..e9b208a4917 100644
--- a/engines/bagel/mfc/cmd_target.cpp
+++ b/engines/bagel/mfc/cmd_target.cpp
@@ -47,7 +47,7 @@ void CCmdTarget::RestoreWaitCursor() {
 	AfxGetApp()->DoWaitCursor(0);
 }
 
-const AFX_MSGMAP_ENTRY *CCmdTarget::LookupMessage(UINT message) {
+const AFX_MSGMAP_ENTRY *CCmdTarget::LookupMessage(unsigned int message) {
 	// Iterate through this class and any ancestors
 	for (const AFX_MSGMAP *map = GetMessageMap();
 	        map; map = map->pfnGetBaseMap()) {
@@ -62,12 +62,12 @@ const AFX_MSGMAP_ENTRY *CCmdTarget::LookupMessage(UINT message) {
 	return nullptr;
 }
 
-BOOL CCmdTarget::OnCmdMsg(UINT nID, int nCode, void *pExtra,
+BOOL CCmdTarget::OnCmdMsg(unsigned int nID, int nCode, void *pExtra,
 		AFX_CMDHANDLERINFO *pHandlerInfo) {
 	// Determine the message number and code (packed into nCode)
 	const AFX_MSGMAP *pMessageMap;
 	const AFX_MSGMAP_ENTRY *lpEntry;
-	UINT nMsg = 0;
+	unsigned int nMsg = 0;
 
 	if (nCode != CN_UPDATE_COMMAND_UI) {
 		nMsg = HIWORD(nCode);
@@ -94,7 +94,7 @@ BOOL CCmdTarget::OnCmdMsg(UINT nID, int nCode, void *pExtra,
 }
 
 const AFX_MSGMAP_ENTRY *CCmdTarget::AfxFindMessageEntry(const AFX_MSGMAP_ENTRY *lpEntry,
-		UINT nMsg, UINT nCode, UINT nID) {
+		unsigned int nMsg, unsigned int nCode, unsigned int nID) {
 	while (lpEntry->nSig != AfxSig_end) {
 		if (lpEntry->nMessage == nMsg && lpEntry->nCode == nCode &&
 			nID >= lpEntry->nID && nID <= lpEntry->nLastID) {
@@ -107,8 +107,8 @@ const AFX_MSGMAP_ENTRY *CCmdTarget::AfxFindMessageEntry(const AFX_MSGMAP_ENTRY *
 	return nullptr;
 }
 
-bool CCmdTarget::_AfxDispatchCmdMsg(CCmdTarget *pTarget, UINT nID, int nCode,
-		AFX_PMSG pfn, void *pExtra, UINT nSig, AFX_CMDHANDLERINFO *pHandlerInfo) {
+bool CCmdTarget::_AfxDispatchCmdMsg(CCmdTarget *pTarget, unsigned int nID, int nCode,
+		AFX_PMSG pfn, void *pExtra, unsigned int nSig, AFX_CMDHANDLERINFO *pHandlerInfo) {
 	union MessageMapFunctions mmf;
 	mmf.pfn = pfn;
 	bool bResult = true; // default is ok
@@ -188,7 +188,7 @@ bool CCmdTarget::_AfxDispatchCmdMsg(CCmdTarget *pTarget, UINT nID, int nCode,
 
 	case AfxSig_cmdui: {
 		// ON_UPDATE_COMMAND_UI or ON_UPDATE_COMMAND_UI_REFLECT case
-		assert(CN_UPDATE_COMMAND_UI == (UINT)-1);
+		assert(CN_UPDATE_COMMAND_UI == (unsigned int)-1);
 		assert(nCode == CN_UPDATE_COMMAND_UI || nCode == 0xFFFF);
 		assert(pExtra != nullptr);
 		CCmdUI *pCmdUI = (CCmdUI *)pExtra;
diff --git a/engines/bagel/mfc/dc.cpp b/engines/bagel/mfc/dc.cpp
index 8a9b2b18e7e..2f33674b90f 100644
--- a/engines/bagel/mfc/dc.cpp
+++ b/engines/bagel/mfc/dc.cpp
@@ -373,7 +373,7 @@ BOOL CDC::FloodFill(int x, int y, COLORREF crColor) {
 }
 
 BOOL CDC::FloodFill(int x, int y, COLORREF crColor,
-        UINT nFillType) {
+        unsigned int nFillType) {
 	impl()->floodFill(x, y, crColor, nFillType);
 	return true;
 }
@@ -391,7 +391,7 @@ BOOL CDC::Pie(int x1, int y1, int x2, int y2,
 	error("TODO: CDC::Pie");
 }
 
-BOOL CDC::DrawEdge(LPRECT lpRect, UINT nEdge, UINT nFlags) {
+BOOL CDC::DrawEdge(LPRECT lpRect, unsigned int nEdge, unsigned int nFlags) {
 	CRect rect = *lpRect;
 
 	// Determine edge colors
@@ -529,7 +529,7 @@ COLORREF CDC::GetNearestColor(COLORREF crColor) const {
 	return impl()->GetNearestColor(crColor);
 }
 
-UINT CDC::RealizePalette() {
+unsigned int CDC::RealizePalette() {
 	return impl()->realizePalette();
 }
 
@@ -561,12 +561,12 @@ BOOL CDC::TextOut(int x, int y, const CString &str) {
 	return impl()->textOut(x, y, str);
 }
 
-BOOL CDC::ExtTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
-        const char *lpszString, UINT nCount, int *lpDxWidths) {
+BOOL CDC::ExtTextOut(int x, int y, unsigned int nOptions, LPCRECT lpRect,
+        const char *lpszString, unsigned int nCount, int *lpDxWidths) {
 	return impl()->extTextOut(x, y, nOptions, lpRect, lpszString, nCount, lpDxWidths);
 }
 
-BOOL CDC::ExtTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
+BOOL CDC::ExtTextOut(int x, int y, unsigned int nOptions, LPCRECT lpRect,
         const CString &str, int *lpDxWidths) {
 	return impl()->extTextOut(x, y, nOptions, lpRect, str, lpDxWidths);
 }
@@ -584,11 +584,11 @@ CSize CDC::TabbedTextOut(int x, int y, const CString &str,
 }
 
 int CDC::DrawText(const char *lpszString, int nCount,
-        LPRECT lpRect, UINT nFormat) {
+        LPRECT lpRect, unsigned int nFormat) {
 	return impl()->drawText(lpszString, nCount, lpRect, nFormat);
 }
 
-int CDC::DrawText(const CString &str, LPRECT lpRect, UINT nFormat) {
+int CDC::DrawText(const CString &str, LPRECT lpRect, unsigned int nFormat) {
 	return impl()->drawText(str, lpRect, nFormat);
 }
 
@@ -639,11 +639,11 @@ BOOL CDC::GrayString(CBrush *pBrush,
 		nCount, x, y, nWidth, nHeight);
 }
 
-UINT CDC::GetTextAlign() const {
+unsigned int CDC::GetTextAlign() const {
 	return impl()->getTextAlign();
 }
 
-UINT CDC::SetTextAlign(UINT nFlags) {
+unsigned int CDC::SetTextAlign(unsigned int nFlags) {
 	return impl()->setTextAlign(nFlags);
 }
 
@@ -779,7 +779,7 @@ CPalette *CDC::Impl::selectPalette(CPalette *pal, BOOL bForceBackground) {
 }
 
 
-UINT CDC::Impl::realizePalette() {
+unsigned int CDC::Impl::realizePalette() {
 	const auto *pal = static_cast<const CPalette::Impl *>(_palette);
 	if (m_pWnd == nullptr || !pal)
 		return 0;
@@ -933,7 +933,7 @@ void CDC::Impl::floodFill(int x, int y, COLORREF crColor) {
 }
 
 void CDC::Impl::floodFill(int x, int y, COLORREF crColor,
-		UINT nFillType) {
+		unsigned int nFillType) {
 	error("TODO: CDC::floodFill");
 }
 
@@ -1126,12 +1126,12 @@ BOOL CDC::Impl::textOut(int x, int y, const CString &str,
 	return true;
 }
 
-BOOL CDC::Impl::extTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
-		const char *lpszString, UINT nCount, int *lpDxWidths) {
+BOOL CDC::Impl::extTextOut(int x, int y, unsigned int nOptions, LPCRECT lpRect,
+		const char *lpszString, unsigned int nCount, int *lpDxWidths) {
 	error("TODO: extTextOut");
 }
 
-BOOL CDC::Impl::extTextOut(int x, int y, UINT nOptions, LPCRECT lpRect,
+BOOL CDC::Impl::extTextOut(int x, int y, unsigned int nOptions, LPCRECT lpRect,
 		const CString &str, int *lpDxWidths) {
 	error("TODO: extTextOut");
 }
@@ -1155,7 +1155,7 @@ CSize CDC::Impl::tabbedTextOut(int x, int y, const CString &str,
 }
 
 int CDC::Impl::drawText(const char *lpszString, int nCount,
-		LPRECT lpRect, UINT nFormat, int nTabPositions,
+		LPRECT lpRect, unsigned int nFormat, int nTabPositions,
 		const int *lpnTabStopPositions, int nTabOrigin,
 		CSize *size) {
 	return drawText(CString(lpszString, nCount),
@@ -1163,7 +1163,7 @@ int CDC::Impl::drawText(const char *lpszString, int nCount,
 		lpnTabStopPositions, nTabOrigin, size);
 }
 
-int CDC::Impl::drawText(const CString &str, LPRECT lpRect, UINT nFormat,
+int CDC::Impl::drawText(const CString &str, LPRECT lpRect, unsigned int nFormat,
 		int nTabPositions, const int *lpnTabStopPositions,
 		int nTabOrigin, CSize *size) {
 	Graphics::Font *font = *(CFont::Impl *)_font;
@@ -1241,12 +1241,12 @@ BOOL CDC::Impl::grayString(CBrush *pBrush,
 	error("TODO");
 }
 
-UINT CDC::Impl::getTextAlign() const {
+unsigned int CDC::Impl::getTextAlign() const {
 	return _textAlign;
 }
 
-UINT CDC::Impl::setTextAlign(UINT nFlags) {
-	UINT oldAlign = _textAlign;
+unsigned int CDC::Impl::setTextAlign(unsigned int nFlags) {
+	unsigned int oldAlign = _textAlign;
 	_textAlign = nFlags;
 	return oldAlign;
 }
diff --git a/engines/bagel/mfc/dialog.cpp b/engines/bagel/mfc/dialog.cpp
index b3d4c3be6ce..ea43966f785 100644
--- a/engines/bagel/mfc/dialog.cpp
+++ b/engines/bagel/mfc/dialog.cpp
@@ -45,7 +45,7 @@ CDialog::CDialog(const char *lpszTemplateName, CWnd *pParentWnd) {
 		m_nIDHelp = LOWORD(m_lpszTemplateName);
 }
 
-CDialog::CDialog(UINT nIDTemplate, CWnd *pParentWnd) {
+CDialog::CDialog(unsigned int nIDTemplate, CWnd *pParentWnd) {
 	SetParent(pParentWnd);
 	m_lpszTemplateName = MAKEINTRESOURCE(nIDTemplate);
 	m_nIDHelp = nIDTemplate;
@@ -68,7 +68,7 @@ BOOL CDialog::Create(const char *lpszTemplateName,
 	return bResult;
 }
 
-BOOL CDialog::Create(UINT nIDTemplate, CWnd *pParentWnd) {
+BOOL CDialog::Create(unsigned int nIDTemplate, CWnd *pParentWnd) {
 	return Create(MAKEINTRESOURCE(nIDTemplate), pParentWnd);
 }
 
@@ -176,7 +176,7 @@ uint32 CDialog::GetDefID() const {
 	return _defaultId;
 }
 
-void CDialog::SetDefID(UINT nID) {
+void CDialog::SetDefID(unsigned int nID) {
 	CWnd *oldBtn;
 
 	if (_defaultId && (oldBtn = GetDlgItem(_defaultId)) != nullptr) {
@@ -283,7 +283,7 @@ void CDialog::DDX_Text(CDataExchange *pDX, int nIDC, CString &value) {
 	}
 }
 
-void CDialog::DDX_Text(CDataExchange *pDX, int nIDC, UINT &value) {
+void CDialog::DDX_Text(CDataExchange *pDX, int nIDC, unsigned int &value) {
 	error("TODO: CDialog::DDX_Text");
 }
 void CDialog::DDX_Text(CDataExchange *pDX, int nIDC, long &value) {
@@ -337,7 +337,7 @@ BOOL CDialog::CreateIndirect(HGLOBAL hDialogTemplate,
 	error("TODO: CDialog::CreateIndirect");
 }
 
-void CDialog::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CDialog::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	// Convert input character to uppercase for case-insensitive match
 	char pressedChar = toupper(nChar);
 	for (auto &child : _children) {
@@ -360,7 +360,7 @@ void CDialog::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	CWnd::OnSysChar(nChar, nRepCnt, nFlags);
 }
 
-void CDialog::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CDialog::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	if (nState != WA_INACTIVE) {
 		// Invalidate the dialog and its children
 		Invalidate(TRUE);
diff --git a/engines/bagel/mfc/doc_template.cpp b/engines/bagel/mfc/doc_template.cpp
index aeca89cbcf0..04aa6a78f4f 100644
--- a/engines/bagel/mfc/doc_template.cpp
+++ b/engines/bagel/mfc/doc_template.cpp
@@ -29,7 +29,7 @@ IMPLEMENT_DYNAMIC(CDocTemplate, CCmdTarget)
 BEGIN_MESSAGE_MAP(CDocTemplate, CCmdTarget)
 END_MESSAGE_MAP()
 
-CDocTemplate::CDocTemplate(UINT nIDResource, const CRuntimeClass *pDocClass,
+CDocTemplate::CDocTemplate(unsigned int nIDResource, const CRuntimeClass *pDocClass,
 		const CRuntimeClass *pFrameClass, const CRuntimeClass *pViewClass) {
 	assert(nIDResource != 0);
 	ASSERT(pDocClass == nullptr ||
diff --git a/engines/bagel/mfc/document.cpp b/engines/bagel/mfc/document.cpp
index 1b94b02dcca..605a1cfa29d 100644
--- a/engines/bagel/mfc/document.cpp
+++ b/engines/bagel/mfc/document.cpp
@@ -83,7 +83,7 @@ void CDocument::DeleteContents() {
 }
 
 void CDocument::ReportSaveLoadException(const char *lpszPathName,
-        CException *e, BOOL bSaving, UINT nIDPDefault) {
+        CException *e, BOOL bSaving, unsigned int nIDPDefault) {
 	error("Save/load error");
 }
 
diff --git a/engines/bagel/mfc/edit.cpp b/engines/bagel/mfc/edit.cpp
index a05c644b7f8..8e6695d1d03 100644
--- a/engines/bagel/mfc/edit.cpp
+++ b/engines/bagel/mfc/edit.cpp
@@ -37,7 +37,7 @@ ON_WM_KILLFOCUS()
 ON_WM_TIMER()
 END_MESSAGE_MAP()
 
-BOOL CEdit::Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID) {
+BOOL CEdit::Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, unsigned int nID) {
 	return CWnd::Create("EDIT", nullptr, dwStyle,
 		rect, pParentWnd, nID);
 }
@@ -101,7 +101,7 @@ void CEdit::OnPaint() {
 		dc.SelectObject(hOldFont);
 }
 
-void CEdit::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CEdit::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if (nChar == Common::KEYCODE_BACKSPACE ||
 			nChar == Common::KEYCODE_DELETE) {
 		if (!_windowText.empty()) {
@@ -112,7 +112,7 @@ void CEdit::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) {
 	Invalidate();
 }
 
-void CEdit::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) {
+void CEdit::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if (Common::isPrint(nChar)) {
 		if (_maxLength == 0 || _windowText.size() < _maxLength) {
 			_windowText += (char)nChar;
@@ -136,7 +136,7 @@ void CEdit::OnKillFocus(CWnd *pNewWnd) {
 	}
 }
 
-void CEdit::OnTimer(UINT_PTR nTimerId) {
+void CEdit::OnTimer(uintptr nTimerId) {
 	_cursorVisible = !_cursorVisible;
 	Invalidate();
 }
diff --git a/engines/bagel/mfc/file.cpp b/engines/bagel/mfc/file.cpp
index 50552091f0b..f78e766e986 100644
--- a/engines/bagel/mfc/file.cpp
+++ b/engines/bagel/mfc/file.cpp
@@ -28,12 +28,12 @@ namespace MFC {
 
 IMPLEMENT_DYNAMIC(CFile, CObject)
 
-CFile::CFile(const char *lpszFileName, UINT nOpenFlags) {
+CFile::CFile(const char *lpszFileName, unsigned int nOpenFlags) {
 	if (!Open(lpszFileName, nOpenFlags))
 		error("Could not open - %s", lpszFileName);
 }
 
-BOOL CFile::Open(const char *lpszFileName, UINT nOpenFlags, CFileException *pError) {
+BOOL CFile::Open(const char *lpszFileName, unsigned int nOpenFlags, CFileException *pError) {
 	Close();
 
 	Common::SeekableReadStream *rs = OpenFile(lpszFileName);
@@ -67,7 +67,7 @@ Common::WriteStream *CFile::writeStream() const {
 	return ws;
 }
 
-ULONGLONG CFile::SeekToEnd() {
+uint64 CFile::SeekToEnd() {
 	return readStream()->seek(0, SEEK_END);
 }
 
@@ -75,23 +75,23 @@ void CFile::SeekToBegin() {
 	readStream()->seek(0);
 }
 
-ULONGLONG CFile::Seek(LONGLONG lOff, UINT nFrom) {
+uint64 CFile::Seek(int64 lOff, unsigned int nFrom) {
 	return readStream()->seek(lOff, nFrom);
 }
 
-ULONGLONG CFile::GetLength() const {
+uint64 CFile::GetLength() const {
 	return readStream()->size();
 }
 
-ULONGLONG CFile::GetPosition() const {
+uint64 CFile::GetPosition() const {
 	return readStream()->pos();
 }
 
-UINT CFile::Read(void *lpBuf, UINT nCount) {
+unsigned int CFile::Read(void *lpBuf, unsigned int nCount) {
 	return readStream()->read(lpBuf, nCount);
 }
 
-void CFile::Write(const void *lpBuf, UINT nCount) {
+void CFile::Write(const void *lpBuf, unsigned int nCount) {
 	writeStream()->write(lpBuf, nCount);
 }
 
diff --git a/engines/bagel/mfc/frame_wnd.cpp b/engines/bagel/mfc/frame_wnd.cpp
index 6cea5ef7568..743a20a0a78 100644
--- a/engines/bagel/mfc/frame_wnd.cpp
+++ b/engines/bagel/mfc/frame_wnd.cpp
@@ -39,8 +39,8 @@ void CFrameWnd::RecalcLayout(BOOL bNotify) {
 	// No implementation in ScummVM
 }
 
-BOOL CFrameWnd::RepositionBars(UINT nIDFirst, UINT nIDLast,
-                               UINT nIDLeftOver, UINT nFlag, LPRECT lpRectParam,
+BOOL CFrameWnd::RepositionBars(unsigned int nIDFirst, unsigned int nIDLast,
+                               unsigned int nIDLeftOver, unsigned int nFlag, LPRECT lpRectParam,
                                LPCRECT lpRectClient, BOOL bStretch) {
 	error("TODO: CFrameWnd::RepositionBars");
 }
@@ -88,7 +88,7 @@ void CFrameWnd::InitialUpdateFrame(CDocument *pDoc, BOOL bMakeVisible) {
 	OnUpdateFrameTitle(TRUE);
 }
 
-BOOL CFrameWnd::LoadFrame(UINT nIDResource, uint32 dwDefaultStyle,
+BOOL CFrameWnd::LoadFrame(unsigned int nIDResource, uint32 dwDefaultStyle,
 	CWnd *pParentWnd, CCreateContext *pContext) {
 	assert(m_nIDHelp == 0 || m_nIDHelp == nIDResource);
 	m_nIDHelp = nIDResource;    // ID for help context (+HID_BASE_RESOURCE)
@@ -172,7 +172,7 @@ BOOL CFrameWnd::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext *pContext) {
 	return TRUE;
 }
 
-CWnd *CFrameWnd::CreateView(CCreateContext *pContext, UINT nID) {
+CWnd *CFrameWnd::CreateView(CCreateContext *pContext, unsigned int nID) {
 	assert(m_hWnd != nullptr);
 	assert(pContext != nullptr);
 	assert(pContext->m_pNewViewClass != nullptr);
@@ -240,7 +240,7 @@ void CFrameWnd::OnUpdateFrameTitle(BOOL bAddToTitle) {
 	// TODO: CFrameWnd::OnUpdateFrameTitle
 }
 
-void CFrameWnd::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CFrameWnd::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	if (nState != WA_INACTIVE) {
 		// Invalidate the dialog and its children
 		Invalidate(TRUE);
diff --git a/engines/bagel/mfc/gfx/dialog_template.h b/engines/bagel/mfc/gfx/dialog_template.h
index 0fcd36bbf3f..4e54cb2e573 100644
--- a/engines/bagel/mfc/gfx/dialog_template.h
+++ b/engines/bagel/mfc/gfx/dialog_template.h
@@ -90,7 +90,7 @@ private:
 
 private:
 	static byte *GetFontSizeField(LPCDLGTEMPLATE pTemplate);
-	static UINT GetTemplateSize(LPCDLGTEMPLATE *pTemplate);
+	static unsigned int GetTemplateSize(LPCDLGTEMPLATE *pTemplate);
 	bool setTemplate(LPCDLGTEMPLATE pTemplate);
 
 	/**
diff --git a/engines/bagel/mfc/gfx/text_render.cpp b/engines/bagel/mfc/gfx/text_render.cpp
index 95b52dabab3..ebee888f739 100644
--- a/engines/bagel/mfc/gfx/text_render.cpp
+++ b/engines/bagel/mfc/gfx/text_render.cpp
@@ -28,7 +28,7 @@ namespace Gfx {
 
 CSize TextRender::renderText(const Common::String &str,
 		Gfx::Surface *dest, Graphics::Font *font,
-		uint textCol, LPCRECT lpRect, UINT nFormat,
+		uint textCol, LPCRECT lpRect, unsigned int nFormat,
 		const Common::Array<int> &tabStops,
 		int nTabOrigin, uint bkColor, int bkMode,
 		uint textColor, uint textAlign) {
diff --git a/engines/bagel/mfc/gfx/text_render.h b/engines/bagel/mfc/gfx/text_render.h
index 64dd3cc390c..39bec9cee62 100644
--- a/engines/bagel/mfc/gfx/text_render.h
+++ b/engines/bagel/mfc/gfx/text_render.h
@@ -37,7 +37,7 @@ class TextRender {
 protected:
 	CSize renderText(const Common::String &str,
 		Gfx::Surface *dest, Graphics::Font *font,
-		uint textCol, LPCRECT lpRect, UINT nFormat,
+		uint textCol, LPCRECT lpRect, unsigned int nFormat,
 		const Common::Array<int> &tabStops,
 		int nTabOrigin, uint bkColor, int bkMode,
 		uint textColor, uint textAlign);
diff --git a/engines/bagel/mfc/global_functions.cpp b/engines/bagel/mfc/global_functions.cpp
index 7225667a365..b082aa3752a 100644
--- a/engines/bagel/mfc/global_functions.cpp
+++ b/engines/bagel/mfc/global_functions.cpp
@@ -41,7 +41,7 @@ struct MemBlock {
 	}
 };
 
-HGLOBAL GlobalAlloc(UINT uFlags, size_t dwBytes) {
+HGLOBAL GlobalAlloc(unsigned int uFlags, size_t dwBytes) {
 	return new MemBlock(dwBytes,
 		uFlags == GMEM_ZEROINIT);
 }
@@ -69,12 +69,12 @@ size_t GlobalCompact(uint32 dwMinFree) {
 }
 
 int MessageBox(HWND hWnd, const char *lpText,
-               const char *lpCaption, UINT uType) {
+               const char *lpCaption, unsigned int uType) {
 	error("%s %s", lpText, lpCaption);
 	return 0;
 }
 
-int MessageBox(const char *lpText, const char *lpCaption, UINT uType) {
+int MessageBox(const char *lpText, const char *lpCaption, unsigned int uType) {
 	error("%s %s", lpText, lpCaption);
 	return 0;
 }
@@ -84,7 +84,7 @@ int MessageBox(const char *lpText) {
 	return 0;
 }
 
-UINT GetPrivateProfileInt(const char *lpAppName,
+unsigned int GetPrivateProfileInt(const char *lpAppName,
                           const char *lpKeyName, int nDefault, const char *lpFileName) {
 	return AfxGetApp()->GetProfileInt(lpAppName, lpKeyName, nDefault);
 }
@@ -138,16 +138,16 @@ LRESULT CallNextHookEx(HHOOK hhk, int nCode,
 	error("TODO: CallNextHookEx");
 }
 
-UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
-		void (CALLBACK * lpfnTimer)(HWND, UINT, UINT_PTR, uint32)) {
+uintptr SetTimer(HWND hWnd, uintptr nIDEvent, unsigned int nElapse,
+		void (CALLBACK * lpfnTimer)(HWND, unsigned int, uintptr, uint32)) {
 	return AfxGetApp()->SetTimer(hWnd, nIDEvent, nElapse, lpfnTimer);
 }
 
-BOOL KillTimer(HWND hWnd, UINT_PTR nIDEvent) {
+BOOL KillTimer(HWND hWnd, uintptr nIDEvent) {
 	return AfxGetApp()->KillTimer(hWnd, nIDEvent);
 }
 
-void Sleep(UINT milli) {
+void Sleep(unsigned int milli) {
 	g_system->delayMillis(milli);
 }
 
@@ -192,8 +192,8 @@ long FileLength(const char *filename) {
 }
 
 BOOL PeekMessage(LPMSG lpMsg, HWND hWnd,
-                 UINT wMsgFilterMin, UINT wMsgFilterMax,
-                 UINT wRemoveMsg) {
+                 unsigned int wMsgFilterMin, unsigned int wMsgFilterMax,
+                 unsigned int wRemoveMsg) {
 	return AfxGetApp()->PeekMessage(lpMsg, hWnd,
 		wMsgFilterMin, wMsgFilterMax, wRemoveMsg);
 }
@@ -206,12 +206,12 @@ void DispatchMessage(LPMSG lpMsg) {
 	AfxGetApp()->DispatchMessage(lpMsg);
 }
 
-BOOL PostMessage(HWND hWnd, UINT Msg,
+BOOL PostMessage(HWND hWnd, unsigned int Msg,
         WPARAM wParam, LPARAM lParam) {
 	return AfxGetApp()->PostMessage(hWnd, Msg, wParam, lParam);
 }
 
-LRESULT SendMessage(HWND hWnd, UINT Msg,
+LRESULT SendMessage(HWND hWnd, unsigned int Msg,
         WPARAM wParam, LPARAM lParam) {
 	CWnd *wnd = CWnd::FromHandle(hWnd);
 	return wnd->SendMessage(Msg, wParam, lParam);
diff --git a/engines/bagel/mfc/global_functions.h b/engines/bagel/mfc/global_functions.h
index 8034787adc8..2441f29a55b 100644
--- a/engines/bagel/mfc/global_functions.h
+++ b/engines/bagel/mfc/global_functions.h
@@ -63,20 +63,20 @@ extern CWinApp *AfxGetApp();
 extern CWnd *AfxGetMainWnd();
 extern HINSTANCE AfxGetInstanceHandle();
 extern int LoadString(HINSTANCE hInstance,
-                      UINT uID, char *lpBuffer, int cchBufferMax);
+                      unsigned int uID, char *lpBuffer, int cchBufferMax);
 extern HMODULE LoadLibrary(const char *lpLibFileName);
 extern void FreeLibrary(HMODULE hModule);
 extern FARPROC GetProcAddress(HMODULE hModule,
                               const char * lpProcName);
 extern HMODULE GetModuleHandle(const char *lpModuleName);
 
-extern const char *AFXAPI AfxRegisterWndClass(UINT nClassStyle,
+extern const char *AFXAPI AfxRegisterWndClass(unsigned int nClassStyle,
         HCURSOR hCursor = 0, HBRUSH hbrBackground = 0, HICON hIcon = 0);
 extern BOOL GetClassInfo(HINSTANCE hInstance,
 	const char *lpClassName, LPWNDCLASS lpWndClass);
 extern int GetSystemMetrics(int nIndex);
 
-extern HGLOBAL GlobalAlloc(UINT uFlags, size_t dwBytes);
+extern HGLOBAL GlobalAlloc(unsigned int uFlags, size_t dwBytes);
 extern void *GlobalLock(HGLOBAL hMem);
 extern BOOL GlobalUnlock(HGLOBAL hMem);
 extern HGLOBAL GlobalFree(HGLOBAL hMem);
@@ -90,10 +90,10 @@ extern size_t GlobalCompact(uint32 dwMinFree);
 #define GetFreeSpace(w)     (0x100000L)
 
 extern int MessageBox(HWND hWnd, const char *lpText,
-                      const char *lpCaption, UINT uType);
-extern int MessageBox(const char *lpText, const char *lpCaption, UINT uType = 0);
+                      const char *lpCaption, unsigned int uType);
+extern int MessageBox(const char *lpText, const char *lpCaption, unsigned int uType = 0);
 extern int MessageBox(const char *lpText);
-extern UINT GetPrivateProfileInt(const char *lpAppName,
+extern unsigned int GetPrivateProfileInt(const char *lpAppName,
                                  const char *lpKeyName, int nDefault, const char *lpFileName);
 extern uint32 GetPrivateProfileString(const char *lpAppName,
                                      const char *lpKeyName, const char *lpDefault, char * lpReturnedString,
@@ -111,10 +111,10 @@ extern HHOOK SetWindowsHookEx(int idHook,
 extern BOOL UnhookWindowsHookEx(HHOOK hhk);
 extern LRESULT CallNextHookEx(HHOOK hhk, int nCode,
                               WPARAM wParam, LPARAM lParam);
-extern UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
-    void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32) = nullptr);
-extern BOOL KillTimer(HWND hWnd, UINT_PTR nIDEvent);
-extern void Sleep(UINT milli);
+extern uintptr SetTimer(HWND hWnd, uintptr nIDEvent, unsigned int nElapse,
+    void (CALLBACK *lpfnTimer)(HWND, unsigned int, uintptr, uint32) = nullptr);
+extern BOOL KillTimer(HWND hWnd, uintptr nIDEvent);
+extern void Sleep(unsigned int milli);
 extern uint32 GetTickCount();
 
 extern Common::SeekableReadStream *OpenFile(const char *filename);
@@ -122,13 +122,13 @@ extern bool FileExists(const char *filename);
 extern long FileLength(const char *filename);
 
 extern BOOL PeekMessage(LPMSG lpMsg, HWND hWnd,
-                        UINT wMsgFilterMin, UINT wMsgFilterMax,
-                        UINT wRemoveMsg);
+                        unsigned int wMsgFilterMin, unsigned int wMsgFilterMax,
+                        unsigned int wRemoveMsg);
 extern void TranslateMessage(LPMSG lpMsg);
 extern void DispatchMessage(LPMSG lpMsg);
-extern BOOL PostMessage(HWND hWnd, UINT Msg,
+extern BOOL PostMessage(HWND hWnd, unsigned int Msg,
                         WPARAM wParam, LPARAM lParam);
-extern LRESULT SendMessage(HWND hWnd, UINT Msg,
+extern LRESULT SendMessage(HWND hWnd, unsigned int Msg,
                            WPARAM wParam, LPARAM lParam);
 
 extern HINSTANCE AfxGetResourceHandle();
diff --git a/engines/bagel/mfc/joystickapi.cpp b/engines/bagel/mfc/joystickapi.cpp
index 8ac52fee2b7..a17c26a8d7d 100644
--- a/engines/bagel/mfc/joystickapi.cpp
+++ b/engines/bagel/mfc/joystickapi.cpp
@@ -26,20 +26,20 @@
 namespace Bagel {
 namespace MFC {
 
-MMRESULT joySetCapture(HWND hwnd, UINT uJoyID,
-		UINT uPeriod, BOOL fChanged) {
+MMRESULT joySetCapture(HWND hwnd, unsigned int uJoyID,
+		unsigned int uPeriod, BOOL fChanged) {
 	return AfxGetApp()->joySetCapture(hwnd, uJoyID, uPeriod, fChanged);
 }
 
-MMRESULT joySetThreshold(UINT uJoyID, UINT uThreshold) {
+MMRESULT joySetThreshold(unsigned int uJoyID, unsigned int uThreshold) {
 	return AfxGetApp()->joySetThreshold(uJoyID, uThreshold);
 }
 
-MMRESULT joyGetPos(UINT uJoyID, LPJOYINFO pji) {
+MMRESULT joyGetPos(unsigned int uJoyID, LPJOYINFO pji) {
 	return AfxGetApp()->joyGetPos(uJoyID, pji);
 }
 
-MMRESULT joyReleaseCapture(UINT uJoyID) {
+MMRESULT joyReleaseCapture(unsigned int uJoyID) {
 	return AfxGetApp()->joyReleaseCapture(uJoyID);
 }
 
diff --git a/engines/bagel/mfc/joystickapi.h b/engines/bagel/mfc/joystickapi.h
index 85085a385fe..009e2e8e8d8 100644
--- a/engines/bagel/mfc/joystickapi.h
+++ b/engines/bagel/mfc/joystickapi.h
@@ -52,17 +52,17 @@ typedef int MMRESULT;
 
 /* joystick information data structure */
 typedef struct joyinfo_tag {
-	UINT wXpos;                 /* x position */
-	UINT wYpos;                 /* y position */
-	UINT wZpos;                 /* z position */
-	UINT wButtons;              /* button states */
+	unsigned int wXpos;                 /* x position */
+	unsigned int wYpos;                 /* y position */
+	unsigned int wZpos;                 /* z position */
+	unsigned int wButtons;              /* button states */
 } JOYINFO, *PJOYINFO, NEAR *NPJOYINFO, FAR *LPJOYINFO;
 
 extern MMRESULT joySetCapture(HWND hwnd,
-                              UINT uJoyID, UINT uPeriod, BOOL fChanged);
-extern MMRESULT joySetThreshold(UINT uJoyID, UINT uThreshold);
-extern MMRESULT joyGetPos(UINT uJoyID, LPJOYINFO pji);
-extern MMRESULT joyReleaseCapture(UINT uJoyID);
+                              unsigned int uJoyID, unsigned int uPeriod, BOOL fChanged);
+extern MMRESULT joySetThreshold(unsigned int uJoyID, unsigned int uThreshold);
+extern MMRESULT joyGetPos(unsigned int uJoyID, LPJOYINFO pji);
+extern MMRESULT joyReleaseCapture(unsigned int uJoyID);
 
 } // namespace MFC
 } // namespace Bagel
diff --git a/engines/bagel/mfc/libs/event_loop.cpp b/engines/bagel/mfc/libs/event_loop.cpp
index 22103865c5c..f34f533f02e 100644
--- a/engines/bagel/mfc/libs/event_loop.cpp
+++ b/engines/bagel/mfc/libs/event_loop.cpp
@@ -333,14 +333,14 @@ void EventLoop::checkForFrameUpdate() {
 }
 
 BOOL EventLoop::PeekMessage(LPMSG lpMsg, HWND hWnd,
-		UINT wMsgFilterMin, UINT wMsgFilterMax,
-		UINT wRemoveMsg) {
+		unsigned int wMsgFilterMin, unsigned int wMsgFilterMax,
+		unsigned int wRemoveMsg) {
 	checkMessages();
 	return _messages.peekMessage(lpMsg, hWnd,
 		wMsgFilterMin, wMsgFilterMax, wRemoveMsg);
 }
 
-BOOL EventLoop::PostMessage(HWND hWnd, UINT Msg,
+BOOL EventLoop::PostMessage(HWND hWnd, unsigned int Msg,
 		WPARAM wParam, LPARAM lParam) {
 	if (isQuitting())
 		return false;
@@ -461,19 +461,19 @@ void EventLoop::setMousePos(const Common::Point &pt) {
 	g_system->warpMouse(pt.x, pt.y);
 }
 
-MMRESULT EventLoop::joySetCapture(HWND hwnd, UINT uJoyID,
-		UINT uPeriod, BOOL fChanged) {
+MMRESULT EventLoop::joySetCapture(HWND hwnd, unsigned int uJoyID,
+		unsigned int uPeriod, BOOL fChanged) {
 	assert(uJoyID == JOYSTICKID1);
 	_joystickWin = hwnd;
 	return JOYERR_NOERROR;
 }
 
-MMRESULT EventLoop::joySetThreshold(UINT uJoyID, UINT uThreshold) {
+MMRESULT EventLoop::joySetThreshold(unsigned int uJoyID, unsigned int uThreshold) {
 	// No implementation
 	return JOYERR_NOERROR;
 }
 
-MMRESULT EventLoop::joyGetPos(UINT uJoyID, LPJOYINFO pji) {
+MMRESULT EventLoop::joyGetPos(unsigned int uJoyID, LPJOYINFO pji) {
 	assert(uJoyID == JOYSTICKID1);
 
 	pji->wXpos = _joystickPos.x;
@@ -484,13 +484,13 @@ MMRESULT EventLoop::joyGetPos(UINT uJoyID, LPJOYINFO pji) {
 	return JOYERR_NOERROR;
 }
 
-MMRESULT EventLoop::joyReleaseCapture(UINT uJoyID) {
+MMRESULT EventLoop::joyReleaseCapture(unsigned int uJoyID) {
 	assert(uJoyID == JOYSTICKID1);
 	return JOYERR_NOERROR;
 }
 
-UINT_PTR EventLoop::SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
-		void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32)) {
+uintptr EventLoop::SetTimer(HWND hWnd, uintptr nIDEvent, unsigned int nElapse,
+		void (CALLBACK *lpfnTimer)(HWND, unsigned int, uintptr, uint32)) {
 	if (!nIDEvent)
 		nIDEvent = ++_timerIdCtr;
 
@@ -499,7 +499,7 @@ UINT_PTR EventLoop::SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
 	return nIDEvent;
 }
 
-BOOL EventLoop::KillTimer(HWND hWnd, UINT_PTR nIDEvent) {
+BOOL EventLoop::KillTimer(HWND hWnd, uintptr nIDEvent) {
 	for (auto it = _timers.begin(); it != _timers.end(); ++it) {
 		if (it->_hWnd == hWnd && it->_idEvent == nIDEvent) {
 			_timers.erase(it);
@@ -537,7 +537,7 @@ void EventLoop::triggerTimers() {
 	}
 }
 
-EventLoop::TimerEntry::TimerEntry(HWND hWnd, UINT_PTR idEvent,
+EventLoop::TimerEntry::TimerEntry(HWND hWnd, uintptr idEvent,
 		uint32 interval, TimerProc callback) :
 		_hWnd(hWnd), _idEvent(idEvent),
 		_interval(interval), _callback(callback) {
diff --git a/engines/bagel/mfc/libs/event_loop.h b/engines/bagel/mfc/libs/event_loop.h
index be85965bca4..ac50e1da210 100644
--- a/engines/bagel/mfc/libs/event_loop.h
+++ b/engines/bagel/mfc/libs/event_loop.h
@@ -35,8 +35,8 @@ namespace Libs {
 
 typedef void(*TimerProc)(
 	HWND hwnd,       // handle of window associated with the timer (can be NULL)
-	UINT uMsg,       // WM_TIMER message (always WM_TIMER)
-	UINT_PTR idEvent,// timer identifier (from SetTimer or returned value)
+	unsigned int uMsg,       // WM_TIMER message (always WM_TIMER)
+	uintptr idEvent,// timer identifier (from SetTimer or returned value)
 	uint32 dwTime     // system time when the callback was called (in milliseconds)
 );
 
@@ -70,13 +70,13 @@ public:
 class EventLoop {
 	struct TimerEntry {
 		HWND _hWnd = nullptr;
-		UINT_PTR _idEvent = 0;
+		uintptr _idEvent = 0;
 		uint32 _interval = 0;
 		uint32 _nextTriggerTime = 0;
 		TimerProc _callback = nullptr;
 
 		TimerEntry() {}
-		TimerEntry(HWND hWnd, UINT_PTR idEvent,
+		TimerEntry(HWND hWnd, uintptr idEvent,
 			uint32 interval, TimerProc callback);
 	};
 	typedef Common::List<TimerEntry> TimerList;
@@ -198,10 +198,10 @@ public:
 	 * with the specified criteria.
 	 */
 	BOOL PeekMessage(LPMSG lpMsg, HWND hWnd,
-		UINT wMsgFilterMin, UINT wMsgFilterMax,
-		UINT wRemoveMsg);
+		unsigned int wMsgFilterMin, unsigned int wMsgFilterMax,
+		unsigned int wRemoveMsg);
 
-	BOOL PostMessage(HWND hWnd, UINT Msg,
+	BOOL PostMessage(HWND hWnd, unsigned int Msg,
 		WPARAM wParam, LPARAM lParam);
 
 	void TranslateMessage(LPMSG lpMsg);
@@ -237,11 +237,11 @@ public:
 		return _focusedWin;
 	}
 
-	MMRESULT joySetCapture(HWND hwnd, UINT uJoyID,
-		UINT uPeriod, BOOL fChanged);
-	MMRESULT joySetThreshold(UINT uJoyID, UINT uThreshold);
-	MMRESULT joyGetPos(UINT uJoyID, LPJOYINFO pji);
-	MMRESULT joyReleaseCapture(UINT uJoyID);
+	MMRESULT joySetCapture(HWND hwnd, unsigned int uJoyID,
+		unsigned int uPeriod, BOOL fChanged);
+	MMRESULT joySetThreshold(unsigned int uJoyID, unsigned int uThreshold);
+	MMRESULT joyGetPos(unsigned int uJoyID, LPJOYINFO pji);
+	MMRESULT joyReleaseCapture(unsigned int uJoyID);
 
 	HHOOK HookKeyboard(HOOKPROC proc) {
 		_kbdHookProc = proc;
@@ -252,9 +252,9 @@ public:
 		_kbdHookProc = nullptr;
 	}
 
-	UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT nElapse,
-		void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32));
-	BOOL KillTimer(HWND hWnd, UINT_PTR nIDEvent);
+	uintptr SetTimer(HWND hWnd, uintptr nIDEvent, unsigned int nElapse,
+		void (CALLBACK *lpfnTimer)(HWND, unsigned int, uintptr, uint32));
+	BOOL KillTimer(HWND hWnd, uintptr nIDEvent);
 
 	void pause();
 
diff --git a/engines/bagel/mfc/libs/events.cpp b/engines/bagel/mfc/libs/events.cpp
index 8f6c98fa1d3..6f80446e3c8 100644
--- a/engines/bagel/mfc/libs/events.cpp
+++ b/engines/bagel/mfc/libs/events.cpp
@@ -161,8 +161,8 @@ MSG EventQueue::pop() {
 }
 
 bool EventQueue::peekMessage(MSG *lpMsg, HWND hWnd,
-		UINT wMsgFilterMin, UINT wMsgFilterMax,
-		UINT wRemoveMsg) {
+		unsigned int wMsgFilterMin, unsigned int wMsgFilterMax,
+		unsigned int wRemoveMsg) {
 	bool result = false;
 
 	for (uint i = 0; i < _queue.size(); ++i) {
diff --git a/engines/bagel/mfc/libs/events.h b/engines/bagel/mfc/libs/events.h
index 34d1a61f756..bbe7b0aae2d 100644
--- a/engines/bagel/mfc/libs/events.h
+++ b/engines/bagel/mfc/libs/events.h
@@ -71,8 +71,8 @@ public:
 	 * Checks the queue for a given message
 	 */
 	bool peekMessage(MSG *lpMsg, HWND hWnd,
-		UINT wMsgFilterMin, UINT wMsgFilterMax,
-		UINT wRemoveMsg);
+		unsigned int wMsgFilterMin, unsigned int wMsgFilterMax,
+		unsigned int wRemoveMsg);
 };
 
 } // namespace Libs
diff --git a/engines/bagel/mfc/menu.cpp b/engines/bagel/mfc/menu.cpp
index 69b0f6b4ff8..9169d9d2812 100644
--- a/engines/bagel/mfc/menu.cpp
+++ b/engines/bagel/mfc/menu.cpp
@@ -37,7 +37,7 @@ BOOL CMenu::CreatePopupMenu() {
 BOOL CMenu::LoadMenu(const char *lpszResourceName) {
 	error("TODO: CMenu::LoadMenu");
 }
-BOOL CMenu::LoadMenu(UINT nIDResource) {
+BOOL CMenu::LoadMenu(unsigned int nIDResource) {
 	error("TODO: CMenu::LoadMenu");
 }
 BOOL CMenu::LoadMenuIndirect(const void *lpMenuTemplate) {
@@ -51,7 +51,7 @@ CMenu *CMenu::FromHandle(HMENU hMenu) {
 	error("TODO: CMenu::FromHandle");
 }
 
-UINT CMenu::CheckMenuItem(UINT nIDCheckItem, UINT nCheck) {
+unsigned int CMenu::CheckMenuItem(unsigned int nIDCheckItem, unsigned int nCheck) {
 	error("TODO: CMenu::CheckMenuItem");
 }
 
diff --git a/engines/bagel/mfc/minwindef.h b/engines/bagel/mfc/minwindef.h
index 47f29304e27..95005e05cfe 100644
--- a/engines/bagel/mfc/minwindef.h
+++ b/engines/bagel/mfc/minwindef.h
@@ -101,16 +101,16 @@ typedef CWnd *HWND;
 
 
 /* Types use for passing & returning polymorphic values */
-typedef UINT_PTR            WPARAM;
-typedef LONG_PTR            LPARAM;
-typedef LONG_PTR            LRESULT;
+typedef uintptr            WPARAM;
+typedef intptr            LPARAM;
+typedef intptr            LRESULT;
 
 typedef LRESULT(CALLBACK *HOOKPROC)(int code, WPARAM wParam, LPARAM lParam);
-typedef LRESULT(CALLBACK *WNDPROC)(HWND, UINT, WPARAM, LPARAM);
-typedef INT_PTR(FAR WINAPI *FARPROC)();
-typedef INT_PTR(NEAR WINAPI *NEARPROC)();
-typedef INT_PTR(WINAPI *PROC)();
-typedef INT_PTR(CALLBACK *DLGPROC)(HWND, UINT, WPARAM, LPARAM);
+typedef LRESULT(CALLBACK *WNDPROC)(HWND, unsigned int, WPARAM, LPARAM);
+typedef intptr(FAR WINAPI *FARPROC)();
+typedef intptr(NEAR WINAPI *NEARPROC)();
+typedef intptr(WINAPI *PROC)();
+typedef intptr(CALLBACK *DLGPROC)(HWND, unsigned int, WPARAM, LPARAM);
 
 #ifndef max
 	#define max(a,b)            (((a) > (b)) ? (a) : (b))
@@ -120,12 +120,12 @@ typedef INT_PTR(CALLBACK *DLGPROC)(HWND, UINT, WPARAM, LPARAM);
 	#define min(a,b)            (((a) < (b)) ? (a) : (b))
 #endif
 
-#define MAKEWORD(a, b)      ((uint16)(((byte)(((DWORD_PTR)(a)) & 0xff)) | ((uint16)((byte)(((DWORD_PTR)(b)) & 0xff))) << 8))
-#define MAKELONG(a, b)      ((long)(((uint16)(((DWORD_PTR)(a)) & 0xffff)) | ((uint32)((uint16)(((DWORD_PTR)(b)) & 0xffff))) << 16))
-#define LOWORD(l)           ((uint16)(((DWORD_PTR)(l)) & 0xffff))
-#define HIWORD(l)           ((((DWORD_PTR)(l)) >> 16))
-#define LOBYTE(w)           ((byte)(((DWORD_PTR)(w)) & 0xff))
-#define HIBYTE(w)           ((byte)((((DWORD_PTR)(w)) >> 8) & 0xff))
+#define MAKEWORD(a, b)      ((uint16)(((byte)(((uintptr)(a)) & 0xff)) | ((uint16)((byte)(((uintptr)(b)) & 0xff))) << 8))
+#define MAKELONG(a, b)      ((long)(((uint16)(((uintptr)(a)) & 0xffff)) | ((uint32)((uint16)(((uintptr)(b)) & 0xffff))) << 16))
+#define LOWORD(l)           ((uint16)(((uintptr)(l)) & 0xffff))
+#define HIWORD(l)           ((((uintptr)(l)) >> 16))
+#define LOBYTE(w)           ((byte)(((uintptr)(w)) & 0xff))
+#define HIBYTE(w)           ((byte)((((uintptr)(w)) >> 8) & 0xff))
 
 #define POINTTOPOINTS(pt)      (MAKELONG((short)((pt).x), (short)((pt).y)))
 #define MAKEWPARAM(l, h)      ((WPARAM)(uint32)MAKELONG(l, h))
@@ -259,7 +259,7 @@ typedef struct tagPAINTSTRUCT {
  */
 typedef struct tagMSG {
 	HWND        hwnd = 0;
-	UINT        message = 0;
+	unsigned int        message = 0;
 	WPARAM      wParam = 0;
 	LPARAM      lParam = 0;
 	uint32       time = 0;
@@ -272,7 +272,7 @@ typedef struct tagMSG {
 	tagMSG() {
 		pt.x = pt.y = 0;
 	}
-	tagMSG(HWND hwnd_, UINT message_, WPARAM wParam_ = 0,
+	tagMSG(HWND hwnd_, unsigned int message_, WPARAM wParam_ = 0,
 	       LPARAM lParam_ = 0) :
 			hwnd(hwnd_), message(message_), wParam(wParam_),
 			lParam(lParam_) {
@@ -286,7 +286,7 @@ inline bool PtInRect(const RECT *lprc, POINT &pt) {
 }
 
 typedef struct tagWNDCLASS {
-	UINT        style;
+	unsigned int        style;
 	WNDPROC     lpfnWndProc;
 	int         cbClsExtra;
 	int         cbWndExtra;
diff --git a/engines/bagel/mfc/palette.cpp b/engines/bagel/mfc/palette.cpp
index 3f911ea90d6..7894d201a18 100644
--- a/engines/bagel/mfc/palette.cpp
+++ b/engines/bagel/mfc/palette.cpp
@@ -55,12 +55,12 @@ int CPalette::GetObject(int nCount, void *lpObject) const {
 	return 4 + (4 * i);
 }
 
-UINT CPalette::GetEntryCount() const {
+unsigned int CPalette::GetEntryCount() const {
 	const Impl *src = static_cast<const Impl *>(m_hObject);
 	return src->size();
 }
 
-UINT CPalette::GetPaletteEntries(UINT nStartIndex, UINT nNumEntries,
+unsigned int CPalette::GetPaletteEntries(unsigned int nStartIndex, unsigned int nNumEntries,
 		LPPALETTEENTRY lpPaletteColors) const {
 	const Impl *src = static_cast<const Impl *>(m_hObject);
 
@@ -74,7 +74,7 @@ UINT CPalette::GetPaletteEntries(UINT nStartIndex, UINT nNumEntries,
 	return src->size();
 }
 
-UINT CPalette::SetPaletteEntries(UINT nStartIndex, UINT nNumEntries,
+unsigned int CPalette::SetPaletteEntries(unsigned int nStartIndex, unsigned int nNumEntries,
 		LPPALETTEENTRY lpPaletteColors) {
 	Impl *pal = static_cast<Impl *>(m_hObject);
 
@@ -87,13 +87,13 @@ UINT CPalette::SetPaletteEntries(UINT nStartIndex, UINT nNumEntries,
 	return nNumEntries;
 }
 
-UINT CPalette::SetPaletteEntries(const Graphics::Palette &pal) {
+unsigned int CPalette::SetPaletteEntries(const Graphics::Palette &pal) {
 	Graphics::Palette *impl = static_cast<Impl *>(m_hObject);
 	*impl = pal;
 	return pal.size();
 }
 
-BOOL CPalette::AnimatePalette(UINT nStartIndex, UINT nNumEntries,
+BOOL CPalette::AnimatePalette(unsigned int nStartIndex, unsigned int nNumEntries,
 		const PALETTEENTRY *lpPaletteColors) {
 	// Set the new colors
 	Graphics::Palette *impl = static_cast<Impl *>(m_hObject);
@@ -110,7 +110,7 @@ BOOL CPalette::AnimatePalette(UINT nStartIndex, UINT nNumEntries,
 	return TRUE;
 }
 
-UINT CPalette::GetNearestPaletteIndex(COLORREF crColor) {
+unsigned int CPalette::GetNearestPaletteIndex(COLORREF crColor) {
 	return palette()->findBestColor(
 		GetRValue(crColor),
 		GetGValue(crColor),
diff --git a/engines/bagel/mfc/scrollbar.cpp b/engines/bagel/mfc/scrollbar.cpp
index 21d8ad4f896..2f80ce9e38b 100644
--- a/engines/bagel/mfc/scrollbar.cpp
+++ b/engines/bagel/mfc/scrollbar.cpp
@@ -34,7 +34,7 @@ ON_WM_MOUSEMOVE()
 ON_WM_MOUSELEAVE()
 END_MESSAGE_MAP()
 
-BOOL CScrollBar::Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, UINT nID) {
+BOOL CScrollBar::Create(uint32 dwStyle, const RECT &rect, CWnd *pParentWnd, unsigned int nID) {
 	return CWnd::Create("SCROLLBAR", nullptr, dwStyle,
 		rect, pParentWnd, nID);
 }
@@ -180,7 +180,7 @@ int CScrollBar::getIndexFromX(int xp) const {
 		* (_maxValue - _minValue) / slideArea;
 }
 
-void CScrollBar::OnLButtonDown(UINT nFlags, CPoint point) {
+void CScrollBar::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	CRect clientRect;
 	GetClientRect(&clientRect);
 
@@ -219,7 +219,7 @@ void CScrollBar::OnLButtonDown(UINT nFlags, CPoint point) {
 	}
 }
 
-void CScrollBar::OnLButtonUp(UINT nFlags, CPoint point) {
+void CScrollBar::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	if (GetCapture() == m_hWnd) {
 		ReleaseCapture();
 		scrollEvent(SB_THUMBPOSITION);
@@ -228,7 +228,7 @@ void CScrollBar::OnLButtonUp(UINT nFlags, CPoint point) {
 	scrollEvent(SB_ENDSCROLL);
 }
 
-void CScrollBar::OnMouseMove(UINT, CPoint point) {
+void CScrollBar::OnMouseMove(unsigned int, CPoint point) {
 	if (GetCapture() == m_hWnd) {
 		SetScrollPos(getIndexFromX(point.x));
 		scrollEvent(SB_THUMBTRACK);
diff --git a/engines/bagel/mfc/string.cpp b/engines/bagel/mfc/string.cpp
index f1dd2b68648..ad087d3802f 100644
--- a/engines/bagel/mfc/string.cpp
+++ b/engines/bagel/mfc/string.cpp
@@ -26,7 +26,7 @@
 namespace Bagel {
 namespace MFC {
 
-BOOL CString::LoadString(UINT nID) {
+BOOL CString::LoadString(unsigned int nID) {
 	char szTemp[256];
 	int nLen = MFC::LoadString(AfxGetInstanceHandle(), nID, szTemp, sizeof(szTemp));
 	if (nLen == 0)
diff --git a/engines/bagel/mfc/win_app.cpp b/engines/bagel/mfc/win_app.cpp
index a03647d7457..45f4cbb8614 100644
--- a/engines/bagel/mfc/win_app.cpp
+++ b/engines/bagel/mfc/win_app.cpp
@@ -184,7 +184,7 @@ HCURSOR CWinApp::LoadCursor(const char *lpszResourceName) {
 	return _cursors.loadCursor((intptr)lpszResourceName);
 }
 
-HCURSOR CWinApp::LoadCursor(UINT nIDResource) {
+HCURSOR CWinApp::LoadCursor(unsigned int nIDResource) {
 	return _cursors.loadCursor(nIDResource);
 }
 
@@ -258,7 +258,7 @@ void CWinApp::CloseAllDocuments(BOOL bEndSession) {
 		m_pDocManager->CloseAllDocuments(bEndSession);
 }
 
-UINT CWinApp::GetProfileInt(const char *lpszSection,
+unsigned int CWinApp::GetProfileInt(const char *lpszSection,
         const char *lpszEntry, int nDefault) {
 	return _settings[lpszSection].getInt(lpszEntry, nDefault);
 }
@@ -363,7 +363,7 @@ void CWinApp::AfxUnlockTempMaps() {
 		m_pmapHGDIOBJ->DeleteTemp();
 }
 
-const char *CWinApp::AfxRegisterWndClass(UINT nClassStyle,
+const char *CWinApp::AfxRegisterWndClass(unsigned int nClassStyle,
 		HCURSOR hCursor, HBRUSH hbrBackground, HICON hIcon) {
 	return "ScummVMWindow";
 }
@@ -394,14 +394,14 @@ HINSTANCE AfxGetInstanceHandle() {
 	return 0;
 }
 
-int LoadString(HINSTANCE hInstance, UINT uID,
+int LoadString(HINSTANCE hInstance, unsigned int uID,
 		char *lpBuffer, int cchBufferMax) {
 	if (lpBuffer == nullptr || cchBufferMax <= 0)
 		return 0;
 
 	// Calculate which string block (resource ID) contains this string
-	UINT blockID = (uID / 16) + 1;
-	UINT indexInBlock = uID % 16;
+	unsigned int blockID = (uID / 16) + 1;
+	unsigned int indexInBlock = uID % 16;
 
 	// Find the RT_STRING resource with that block ID
 	HRSRC hRes = FindResource(hInstance, MAKEINTRESOURCE(blockID), RT_STRING);
@@ -453,7 +453,7 @@ HMODULE GetModuleHandle(const char *lpModuleName) {
 	error("TODO: GetModuleHandle");
 }
 
-const char *AfxRegisterWndClass(UINT nClassStyle,
+const char *AfxRegisterWndClass(unsigned int nClassStyle,
         HCURSOR hCursor, HBRUSH hbrBackground, HICON hIcon) {
 	return AfxGetApp()->AfxRegisterWndClass(nClassStyle,
 		hCursor, hbrBackground, hIcon);
diff --git a/engines/bagel/mfc/wingdi.cpp b/engines/bagel/mfc/wingdi.cpp
index f37929f0a8c..470ebde6639 100644
--- a/engines/bagel/mfc/wingdi.cpp
+++ b/engines/bagel/mfc/wingdi.cpp
@@ -112,7 +112,7 @@ BOOL EndPaint(HWND hWnd, const PAINTSTRUCT *lpPaint) {
 	return wnd->EndPaint(lpPaint);
 }
 
-INT_PTR DialogBoxParam(HINSTANCE hInstance,
+intptr DialogBoxParam(HINSTANCE hInstance,
                        const char *lpTemplateName, HWND hWndParent,
                        DLGPROC lpDialogFunc, LPARAM dwInitParam) {
 	error("TODO: DialogBoxParam");
@@ -160,14 +160,14 @@ HPALETTE SelectPalette(HDC hdc, HPALETTE hPal, BOOL bForceBkgd) {
 	return surf->selectPalette(hPal, bForceBkgd);
 }
 
-UINT RealizePalette(HDC hdc) {
+unsigned int RealizePalette(HDC hdc) {
 	auto *surf = static_cast<CDC::Impl *>(hdc);
 	surf->realizePalette();
 	return 256;
 }
 
 HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih, uint32 flInit,
-		CONST void *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage) {
+		CONST void *pjBits, CONST BITMAPINFO *pbmi, unsigned int iUsage) {
 	CBitmap::Impl *bitmap = new CBitmap::Impl();
 
 	// Figure out the pixel format
@@ -235,8 +235,8 @@ HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih, uint32 flInit,
 	return bitmap;
 }
 
-int GetDIBits(HDC hdc, HBITMAP hbm, UINT start, UINT cLines,
-              void *lpvBits, LPBITMAPINFO lpbmi, UINT usage) {
+int GetDIBits(HDC hdc, HBITMAP hbm, unsigned int start, unsigned int cLines,
+              void *lpvBits, LPBITMAPINFO lpbmi, unsigned int usage) {
 	error("TODO: GetDIBits");
 }
 
@@ -270,7 +270,7 @@ int SetStretchBltMode(HDC hdc, int mode) {
 
 int StretchDIBits(HDC hdc, int xDest, int yDest, int DestWidth, int DestHeight,
         int xSrc, int ySrc, int SrcWidth, int SrcHeight,
-        CONST void *lpBits, CONST BITMAPINFO *lpbmi, UINT iUsage, uint32 rop) {
+        CONST void *lpBits, CONST BITMAPINFO *lpbmi, unsigned int iUsage, uint32 rop) {
 	error("TODO: StretchDIBits");
 }
 
@@ -405,12 +405,12 @@ HWND GetDlgItem(HWND hDlg, int nIDDlgItem) {
 	error("TODO: GetDlgItem");
 }
 
-BOOL EndDialog(HWND hDlg, INT_PTR nResult) {
+BOOL EndDialog(HWND hDlg, intptr nResult) {
 	error("TODO: EndDialog");
 }
 
 BOOL SetDlgItemInt(HWND hDlg, int nIDDlgItem,
-                   UINT uValue, BOOL bSigned) {
+                   unsigned int uValue, BOOL bSigned) {
 	error("TODO: SetDlgItemInt");
 }
 
diff --git a/engines/bagel/mfc/wingdi.h b/engines/bagel/mfc/wingdi.h
index b9d65a4601b..88e121c8502 100644
--- a/engines/bagel/mfc/wingdi.h
+++ b/engines/bagel/mfc/wingdi.h
@@ -264,7 +264,7 @@ enum FontWeight {
 /*
  * Standard Cursor IDs
  */
-#define MAKEINTRESOURCE(i) ((char *)((ULONG_PTR)((uint16)(i))))
+#define MAKEINTRESOURCE(i) ((char *)((uintptr)((uint16)(i))))
 #define IDC_NONE            0
 
 #define IDC_ARROW           MAKEINTRESOURCE(32512)
@@ -700,34 +700,34 @@ typedef struct tagLOGPALETTE {
  * MEASUREITEMSTRUCT for ownerdraw
  */
 typedef struct tagMEASUREITEMSTRUCT {
-	UINT       CtlType;
-	UINT       CtlID;
-	UINT       itemID;
-	UINT       itemWidth;
-	UINT       itemHeight;
-	ULONG_PTR  itemData;
+	unsigned int       CtlType;
+	unsigned int       CtlID;
+	unsigned int       itemID;
+	unsigned int       itemWidth;
+	unsigned int       itemHeight;
+	uintptr  itemData;
 } MEASUREITEMSTRUCT, NEAR *PMEASUREITEMSTRUCT, FAR *LPMEASUREITEMSTRUCT;
 
 /*
  * DRAWITEMSTRUCT for ownerdraw
  */
 typedef struct tagDRAWITEMSTRUCT {
-	UINT        CtlType;
-	UINT        CtlID;
-	UINT        itemID;
-	UINT        itemAction;
-	UINT        itemState;
+	unsigned int        CtlType;
+	unsigned int        CtlID;
+	unsigned int        itemID;
+	unsigned int        itemAction;
+	unsigned int        itemState;
 	HWND        hwndItem;
 	HDC         hDC;
 	RECT        rcItem;
-	ULONG_PTR   itemData;
+	uintptr   itemData;
 } DRAWITEMSTRUCT, NEAR *PDRAWITEMSTRUCT, FAR *LPDRAWITEMSTRUCT;
 
 /* Logical Brush (or Pattern) */
 typedef struct tagLOGBRUSH {
-	UINT        lbStyle;
+	unsigned int        lbStyle;
 	COLORREF    lbColor;
-	ULONG_PTR   lbHatch;
+	uintptr   lbHatch;
 } LOGBRUSH, *PLOGBRUSH, NEAR *NPLOGBRUSH, FAR *LPLOGBRUSH;
 
 extern int GetDeviceCaps(HDC hdc, int index);
@@ -740,7 +740,7 @@ extern int GetObject(HANDLE h, int c, void *pv);
 extern HDC BeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint);
 extern BOOL EndPaint(HWND hWnd, const PAINTSTRUCT *lpPaint);
 
-extern INT_PTR DialogBoxParam(HINSTANCE hInstance,
+extern intptr DialogBoxParam(HINSTANCE hInstance,
                               const char *lpTemplateName, HWND hWndParent,
                               DLGPROC lpDialogFunc, LPARAM dwInitParam);
 extern BOOL IsWindow(HWND hWnd);
@@ -749,14 +749,14 @@ extern int GetWindowText(HWND hWnd, char *lpszStringBuf, int nMaxCount);
 extern BOOL ScreenToClient(HWND hWnd, LPPOINT lpPoint);
 
 HBITMAP CreateDIBitmap(HDC hdc, CONST BITMAPINFOHEADER *pbmih,
-                       uint32 flInit, CONST void *pjBits, CONST BITMAPINFO *pbmi, UINT iUsage);
-extern int GetDIBits(HDC hdc, HBITMAP hbm, UINT start, UINT cLines,
-                     void *lpvBits, LPBITMAPINFO lpbmi, UINT usage);
+                       uint32 flInit, CONST void *pjBits, CONST BITMAPINFO *pbmi, unsigned int iUsage);
+extern int GetDIBits(HDC hdc, HBITMAP hbm, unsigned int start, unsigned int cLines,
+                     void *lpvBits, LPBITMAPINFO lpbmi, unsigned int usage);
 
 extern HGDIOBJ SelectObject(HDC hdc, HGDIOBJ h);
 extern HGDIOBJ GetStockObject(int i);
 extern HPALETTE SelectPalette(HDC hdc, HPALETTE hPal, BOOL bForceBkgd);
-extern UINT RealizePalette(HDC hdc);
+extern unsigned int RealizePalette(HDC hdc);
 extern BOOL BitBlt(HDC hdc, int xDest, int yDest, int width, int height,
 	HDC hdcSrc, int xSrc, int ySrc, uint32 rop);
 extern BOOL StretchBlt(HDC hdcDest, int xDest, int yDest,
@@ -764,7 +764,7 @@ extern BOOL StretchBlt(HDC hdcDest, int xDest, int yDest,
 extern int SetStretchBltMode(HDC hdc, int mode);
 extern int StretchDIBits(HDC hdc, int xDest, int yDest, int DestWidth, int DestHeight,
                          int xSrc, int ySrc, int SrcWidth, int SrcHeight,
-                         CONST void *lpBits, CONST BITMAPINFO *lpbmi, UINT iUsage, uint32 rop);
+                         CONST void *lpBits, CONST BITMAPINFO *lpbmi, unsigned int iUsage, uint32 rop);
 extern int GetTextExtent(HDC hdc, const char *text, size_t len);
 extern BOOL GetTextMetrics(HDC hdc, LPTEXTMETRIC lptm);
 extern intptr GetWindowWord(HWND hWnd, int nIndex);
@@ -795,9 +795,9 @@ extern byte GetGValue(COLORREF color);
 extern byte GetBValue(COLORREF color);
 
 extern HWND GetDlgItem(HWND hDlg, int nIDDlgItem);
-extern BOOL EndDialog(HWND hDlg, INT_PTR nResult);
+extern BOOL EndDialog(HWND hDlg, intptr nResult);
 extern BOOL SetDlgItemInt(HWND hDlg, int nIDDlgItem,
-                          UINT uValue, BOOL bSigned);
+                          unsigned int uValue, BOOL bSigned);
 extern BOOL CheckRadioButton(HWND hDlg, int nIDFirstButton,
                              int nIDLastButton, int nIDCheckButton);
 
diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index 94b57a6021f..b462d29f9f0 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -22,34 +22,15 @@
 #ifndef BAGEL_MFC_WINNT_H
 #define BAGEL_MFC_WINNT_H
 
+#include "common/scummsys.h"
+
 namespace Bagel {
 namespace MFC {
 
 typedef int BOOL;
 typedef uint16 TCHAR;
 typedef uint16 SHORT;
-typedef unsigned long ULONG;
-typedef int64 LONGLONG;
-typedef uint64 ULONGLONG;
-typedef uint16 *PWORD;
-typedef uint16 *LPWORD;
-typedef uint32 *PDWORD;
-typedef uint32 *LPDWORD;
-
-typedef const uint16 *LPCWSTR;
-typedef uint16 *LPWSTR;
-typedef uint16 *LPTSTR;
-typedef LPWSTR BSTR;
-
-typedef unsigned int UINT;
-typedef unsigned int *PUINT;
-
-typedef intptr INT_PTR, *PINT_PTR;
-typedef uintptr UINT_PTR, *PUINT_PTR;
-
-typedef intptr LONG_PTR, *PLONG_PTR;
-typedef uintptr ULONG_PTR, *PULONG_PTR;
-typedef uintptr DWORD_PTR;
+
 typedef uint32 COLORREF;
 typedef void *POSITION;
 
@@ -84,7 +65,7 @@ typedef long HRESULT;
 
 typedef char CCHAR;
 typedef uint32 LCID;
-typedef PDWORD PLCID;
+typedef uint32 *PLCID;
 typedef uint16   LANGID;
 
 typedef uint32 (*APPLICATION_RECOVERY_CALLBACK)(void *pvParameter);
@@ -629,7 +610,7 @@ typedef uint32 (*APPLICATION_RECOVERY_CALLBACK)(void *pvParameter);
  /*
   * Predefined Resource Types
   */
-#define MAKEINTRESOURCE(i) ((char *)((ULONG_PTR)((uint16)(i))))
+#define MAKEINTRESOURCE(i) ((char *)((uintptr)((uint16)(i))))
 #define RT_CURSOR           MAKEINTRESOURCE(1)
 #define RT_BITMAP           MAKEINTRESOURCE(2)
 #define RT_ICON             MAKEINTRESOURCE(3)
@@ -729,11 +710,11 @@ struct LOGFONT {
 typedef LOGFONT *LPLOGFONT;
 
 typedef struct tagSCROLLINFO {
-	UINT    cbSize;
-	UINT    fMask;
+	unsigned int    cbSize;
+	unsigned int    fMask;
 	int     nMin;
 	int     nMax;
-	UINT    nPage;
+	unsigned int    nPage;
 	int     nPos;
 	int     nTrackPos;
 }   SCROLLINFO, *LPSCROLLINFO;
diff --git a/engines/bagel/mfc/wnd.cpp b/engines/bagel/mfc/wnd.cpp
index 63b6cb136ca..0dfa1b9b78b 100644
--- a/engines/bagel/mfc/wnd.cpp
+++ b/engines/bagel/mfc/wnd.cpp
@@ -87,7 +87,7 @@ CWnd::~CWnd() {
 
 BOOL CWnd::Create(const char *lpszClassName, const char *lpszWindowName,
 	uint32 dwStyle, const RECT &rect, CWnd *pParentWnd,
-	UINT nID, CCreateContext *pContext) {
+	unsigned int nID, CCreateContext *pContext) {
 	m_pParentWnd = pParentWnd;
 	m_nStyle = dwStyle;
 	_controlId = nID;
@@ -135,7 +135,7 @@ BOOL CWnd::Create(const char *lpszClassName, const char *lpszWindowName,
 
 BOOL CWnd::CreateEx(uint32 dwExStyle, const char *lpszClassName,
 		const char *lpszWindowName, uint32 dwStyle,
-		const RECT &rect, CWnd *pParentWnd, UINT nID,
+		const RECT &rect, CWnd *pParentWnd, unsigned int nID,
 		void *lpParam /* = nullptr */) {
 	return CreateEx(dwExStyle, lpszClassName, lpszWindowName, dwStyle,
 		rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
@@ -280,7 +280,7 @@ void CWnd::UpdateWindow() {
 }
 
 BOOL CWnd::RedrawWindow(LPCRECT lpRectUpdate,
-	CRgn *prgnUpdate, UINT flags) {
+	CRgn *prgnUpdate, unsigned int flags) {
 
 	if (flags & RDW_INVALIDATE) {
 		// Invalidate the region or rectangle
@@ -336,7 +336,7 @@ CWnd *CWnd::GetFocus() const {
 	return AfxGetApp()->GetFocus();
 }
 
-void CWnd::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) {
+void CWnd::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
 	if (nState != WA_INACTIVE) {
 		// We're becoming active - ensure we repaint
 		Invalidate();
@@ -403,7 +403,7 @@ BOOL CWnd::SetWindowText(const char *lpszString) {
 	return true;
 }
 
-UINT CWnd::GetState() const {
+unsigned int CWnd::GetState() const {
 	return _itemState;
 }
 
@@ -461,11 +461,11 @@ int CWnd::ReleaseDC(CDC *pDC) {
 	return 1;
 }
 
-BOOL CWnd::PostMessage(UINT message, WPARAM wParam, LPARAM lParam) {
+BOOL CWnd::PostMessage(unsigned int message, WPARAM wParam, LPARAM lParam) {
 	return AfxGetApp()->PostMessage(m_hWnd, message, wParam, lParam);
 }
 
-LRESULT CWnd::SendMessage(UINT message, WPARAM wParam, LPARAM lParam) {
+LRESULT CWnd::SendMessage(unsigned int message, WPARAM wParam, LPARAM lParam) {
 	// Don't send messages to already destroyed windows
 	if (!m_hWnd)
 		return 0;
@@ -489,14 +489,14 @@ LRESULT CWnd::SendMessage(UINT message, WPARAM wParam, LPARAM lParam) {
 	return lResult;
 }
 
-bool CWnd::isRecursiveMessage(UINT message) {
+bool CWnd::isRecursiveMessage(unsigned int message) {
 	// TODO: Need to refactor these to use the
 	// SendMessageToDescendants instead of this
 	return message == WM_SHOWWINDOW ||
 		message == WM_ENABLE;
 }
 
-BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult) {
+BOOL CWnd::OnWndMsg(unsigned int message, WPARAM wParam, LPARAM lParam, LRESULT *pResult) {
 	LRESULT lResult = 0;
 	const AFX_MSGMAP_ENTRY *lpEntry;
 
@@ -596,7 +596,7 @@ BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult
 		break;
 
 	case AfxSig_is:
-		lResult = (this->*mmf.pfn_is)((LPTSTR)lParam);
+		lResult = (this->*mmf.pfn_is)((uint16 *)lParam);
 		break;
 
 	case AfxSig_lwl:
@@ -604,8 +604,8 @@ BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult
 		break;
 
 	case AfxSig_lwwM:
-		lResult = (this->*mmf.pfn_lwwM)((UINT)LOWORD(wParam),
-			(UINT)HIWORD(wParam), (CMenu *)CMenu::FromHandle((HMENU)lParam));
+		lResult = (this->*mmf.pfn_lwwM)((unsigned int)LOWORD(wParam),
+			(unsigned int)HIWORD(wParam), (CMenu *)CMenu::FromHandle((HMENU)lParam));
 		break;
 
 	case AfxSig_vv:
@@ -617,7 +617,7 @@ BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult
 		break;
 
 	case AfxSig_vww:
-		(this->*mmf.pfn_vww)((UINT)wParam, (UINT)lParam);
+		(this->*mmf.pfn_vww)((unsigned int)wParam, (unsigned int)lParam);
 		break;
 
 	case AfxSig_vvii:
@@ -685,7 +685,7 @@ BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult
 		break;
 
 	case AfxSig_vwWb:
-		(this->*mmf.pfn_vwWb)((UINT)(LOWORD(wParam)),
+		(this->*mmf.pfn_vwWb)((unsigned int)(LOWORD(wParam)),
 			CWnd::FromHandle((HWND)lParam), (BOOL)HIWORD(wParam));
 		break;
 
@@ -706,20 +706,20 @@ BOOL CWnd::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT *pResult
 	break;
 
 	case AfxSig_vs:
-		(this->*mmf.pfn_vs)((LPTSTR)lParam);
+		(this->*mmf.pfn_vs)((uint16 *)lParam);
 		break;
 
 	case AfxSig_vws:
-		(this->*mmf.pfn_vws)((UINT)wParam, (const char *)lParam);
+		(this->*mmf.pfn_vws)((unsigned int)wParam, (const char *)lParam);
 		break;
 
 	case AfxSig_vOWNER:
-		(this->*mmf.pfn_vOWNER)((int)wParam, (LPTSTR)lParam);
+		(this->*mmf.pfn_vOWNER)((int)wParam, (uint16 *)lParam);
 		lResult = TRUE;
 		break;
 
 	case AfxSig_iis:
-		lResult = (this->*mmf.pfn_iis)((int)wParam, (LPTSTR)lParam);
+		lResult = (this->*mmf.pfn_iis)((int)wParam, (uint16 *)lParam);
 		break;
 
 	case AfxSig_wp:
@@ -1035,7 +1035,7 @@ BOOL CWnd::GotoDlgCtrl(CWnd *pWndCtrl) {
 	return FALSE;
 }
 
-BOOL CWnd::SubclassDlgItem(UINT nID, CWnd *pParent) {
+BOOL CWnd::SubclassDlgItem(unsigned int nID, CWnd *pParent) {
 	// Validate we're replacing the same kind of control
 	assert(pParent->_children.contains(nID));
 	CWnd *oldControl = pParent->_children[nID];
@@ -1088,25 +1088,25 @@ int CWnd::GetDlgCtrlID() const {
 	return _controlId;
 }
 
-void CWnd::CheckDlgButton(int nIDButton, UINT nCheck) {
+void CWnd::CheckDlgButton(int nIDButton, unsigned int nCheck) {
 	CWnd *btn = GetDlgItem(nIDButton);
 	assert(btn);
 	btn->SendMessage(BM_SETCHECK, nCheck);
 }
 
-LRESULT CWnd::SendDlgItemMessage(int nID, UINT message,
+LRESULT CWnd::SendDlgItemMessage(int nID, unsigned int message,
 		WPARAM wParam, LPARAM lParam) const {
 	CWnd *ctl = GetDlgItem(nID);
 	assert(ctl);
 	return ctl->SendMessage(message, wParam, lParam);
 }
 
-UINT_PTR CWnd::SetTimer(UINT_PTR nIDEvent, UINT nElapse,
-	void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, uint32)) {
+uintptr CWnd::SetTimer(uintptr nIDEvent, unsigned int nElapse,
+	void (CALLBACK *lpfnTimer)(HWND, unsigned int, uintptr, uint32)) {
 	return MFC::SetTimer(m_hWnd, nIDEvent, nElapse, lpfnTimer);
 }
 
-BOOL CWnd::KillTimer(UINT_PTR nIDEvent) {
+BOOL CWnd::KillTimer(uintptr nIDEvent) {
 	return MFC::KillTimer(m_hWnd, nIDEvent);
 }
 
@@ -1137,7 +1137,7 @@ void CWnd::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct) {
 }
 
 BOOL CWnd::OnCommand(WPARAM wParam, LPARAM lParam) {
-	UINT nID = LOWORD(wParam);
+	unsigned int nID = LOWORD(wParam);
 	int nCode = HIWORD(wParam);
 
 	// TODO: Original does some stuff with reflecting
@@ -1153,12 +1153,12 @@ void CWnd::OnSetFont(HFONT hFont, BOOL bRedraw) {
 		Invalidate();
 }
 
-BOOL CWnd::OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) {
+BOOL CWnd::OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message) {
 	MFC::SetCursor(MFC::LoadCursor(nullptr, IDC_ARROW));
 	return true;
 }
 
-void CWnd::SendMessageToDescendants(UINT message,
+void CWnd::SendMessageToDescendants(unsigned int message,
 		WPARAM wParam, LPARAM lParam,
 		bool bDeep, bool) {
 	// Note: since in ScummVM the m_hWnd points
@@ -1188,7 +1188,7 @@ void CWnd::SendMessageToDescendants(UINT message,
 	}
 }
 
-void CWnd::SendMessageToDescendants(HWND hWnd, UINT message,
+void CWnd::SendMessageToDescendants(HWND hWnd, unsigned int message,
 		WPARAM wParam, LPARAM lParam, BOOL bDeep, BOOL bOnlyPerm) {
 	CWnd *wnd = CWnd::FromHandle(hWnd);
 	wnd->SendMessageToDescendants(message,
@@ -1207,7 +1207,7 @@ void CWnd::pause() {
 	AfxGetApp()->pause();
 }
 
-void CWnd::OnShowWindow(BOOL bShow, UINT nStatus) {
+void CWnd::OnShowWindow(BOOL bShow, unsigned int nStatus) {
 	if (bShow) {
 		// Invalidate this window
 		Invalidate();


Commit: 5cb381084523566c0c663343d998ce86c4ee22d6
    https://github.com/scummvm/scummvm/commit/5cb381084523566c0c663343d998ce86c4ee22d6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T02:29:27+03:00

Commit Message:
BAGEL: Remove unused typedefs

Changed paths:
    engines/bagel/mfc/winnt.h


diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index b462d29f9f0..6204a243474 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -60,10 +60,8 @@ typedef void *POSITION;
 #define S_FALSE                                ((HRESULT)1L)
 
 typedef void *HANDLE;
-typedef HANDLE *PHANDLE;
 typedef long HRESULT;
 
-typedef char CCHAR;
 typedef uint32 LCID;
 typedef uint32 *PLCID;
 typedef uint16   LANGID;


Commit: 2aa1b77cedd5c58fb112ddb0f254f2c2c3dd2bdc
    https://github.com/scummvm/scummvm/commit/2aa1b77cedd5c58fb112ddb0f254f2c2c3dd2bdc
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T02:29:32+03:00

Commit Message:
BAGEL: Use built-in boolean types

Changed paths:
    engines/bagel/boflib/misc.cpp
    engines/bagel/boflib/misc.h
    engines/bagel/boflib/sound.cpp
    engines/bagel/boflib/sound.h
    engines/bagel/hodjnpodj/archeroids/main.cpp
    engines/bagel/hodjnpodj/archeroids/main.h
    engines/bagel/hodjnpodj/archeroids/usercfg.cpp
    engines/bagel/hodjnpodj/archeroids/usercfg.h
    engines/bagel/hodjnpodj/artparts/artparts.cpp
    engines/bagel/hodjnpodj/artparts/artparts.h
    engines/bagel/hodjnpodj/artparts/optndlg.cpp
    engines/bagel/hodjnpodj/artparts/optndlg.h
    engines/bagel/hodjnpodj/barbershop/animate.cpp
    engines/bagel/hodjnpodj/barbershop/animate.h
    engines/bagel/hodjnpodj/barbershop/barb.cpp
    engines/bagel/hodjnpodj/barbershop/barb.h
    engines/bagel/hodjnpodj/barbershop/board.cpp
    engines/bagel/hodjnpodj/barbershop/board.h
    engines/bagel/hodjnpodj/barbershop/card.cpp
    engines/bagel/hodjnpodj/barbershop/card.h
    engines/bagel/hodjnpodj/barbershop/jay.cpp
    engines/bagel/hodjnpodj/barbershop/logic.cpp
    engines/bagel/hodjnpodj/barbershop/logic.h
    engines/bagel/hodjnpodj/barbershop/main.cpp
    engines/bagel/hodjnpodj/barbershop/main.h
    engines/bagel/hodjnpodj/barbershop/paint.cpp
    engines/bagel/hodjnpodj/barbershop/paint.h
    engines/bagel/hodjnpodj/barbershop/stack.h
    engines/bagel/hodjnpodj/barbershop/undo.cpp
    engines/bagel/hodjnpodj/barbershop/undo.h
    engines/bagel/hodjnpodj/barbershop/usercfg.cpp
    engines/bagel/hodjnpodj/barbershop/usercfg.h
    engines/bagel/hodjnpodj/battlefish/bfish.cpp
    engines/bagel/hodjnpodj/battlefish/bfish.h
    engines/bagel/hodjnpodj/battlefish/usercfg.cpp
    engines/bagel/hodjnpodj/battlefish/usercfg.h
    engines/bagel/hodjnpodj/beacon/beacon.cpp
    engines/bagel/hodjnpodj/beacon/beacon.h
    engines/bagel/hodjnpodj/beacon/optndlg.cpp
    engines/bagel/hodjnpodj/beacon/optndlg.h
    engines/bagel/hodjnpodj/crypt/crypt.cpp
    engines/bagel/hodjnpodj/crypt/crypt.h
    engines/bagel/hodjnpodj/crypt/main.cpp
    engines/bagel/hodjnpodj/crypt/main.h
    engines/bagel/hodjnpodj/crypt/optn.cpp
    engines/bagel/hodjnpodj/crypt/optn.h
    engines/bagel/hodjnpodj/crypt/pnt_gram.cpp
    engines/bagel/hodjnpodj/crypt/pnt_gram.h
    engines/bagel/hodjnpodj/crypt/rec.cpp
    engines/bagel/hodjnpodj/crypt/rec.h
    engines/bagel/hodjnpodj/dfa/dfa.cpp
    engines/bagel/hodjnpodj/dfa/dfa.h
    engines/bagel/hodjnpodj/dfa/dialogs.h
    engines/bagel/hodjnpodj/dfa/msgdlg.cpp
    engines/bagel/hodjnpodj/dfa/optdlg.cpp
    engines/bagel/hodjnpodj/fuge/fuge.cpp
    engines/bagel/hodjnpodj/fuge/fuge.h
    engines/bagel/hodjnpodj/fuge/usercfg.cpp
    engines/bagel/hodjnpodj/fuge/usercfg.h
    engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
    engines/bagel/hodjnpodj/garfunkle/garfunkle.h
    engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
    engines/bagel/hodjnpodj/garfunkle/optndlg.h
    engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
    engines/bagel/hodjnpodj/hnplibs/audiocfg.h
    engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
    engines/bagel/hodjnpodj/hnplibs/bitmaps.h
    engines/bagel/hodjnpodj/hnplibs/button.cpp
    engines/bagel/hodjnpodj/hnplibs/button.h
    engines/bagel/hodjnpodj/hnplibs/cbofdlg.cpp
    engines/bagel/hodjnpodj/hnplibs/cbofdlg.h
    engines/bagel/hodjnpodj/hnplibs/cmessbox.cpp
    engines/bagel/hodjnpodj/hnplibs/cmessbox.h
    engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
    engines/bagel/hodjnpodj/hnplibs/dibapi.h
    engines/bagel/hodjnpodj/hnplibs/dibdoc.cpp
    engines/bagel/hodjnpodj/hnplibs/dibdoc.h
    engines/bagel/hodjnpodj/hnplibs/gamedll.h
    engines/bagel/hodjnpodj/hnplibs/mainmenu.cpp
    engines/bagel/hodjnpodj/hnplibs/mainmenu.h
    engines/bagel/hodjnpodj/hnplibs/rules.cpp
    engines/bagel/hodjnpodj/hnplibs/rules.h
    engines/bagel/hodjnpodj/hnplibs/sprite.cpp
    engines/bagel/hodjnpodj/hnplibs/sprite.h
    engines/bagel/hodjnpodj/hnplibs/stdinc.h
    engines/bagel/hodjnpodj/hnplibs/text.cpp
    engines/bagel/hodjnpodj/hnplibs/text.h
    engines/bagel/hodjnpodj/hodjnpodj.cpp
    engines/bagel/hodjnpodj/life/game.cpp
    engines/bagel/hodjnpodj/life/game.h
    engines/bagel/hodjnpodj/life/life.cpp
    engines/bagel/hodjnpodj/life/life.h
    engines/bagel/hodjnpodj/life/usercfg.cpp
    engines/bagel/hodjnpodj/life/usercfg.h
    engines/bagel/hodjnpodj/mankala/bgen.h
    engines/bagel/hodjnpodj/mankala/bgenut.cpp
    engines/bagel/hodjnpodj/mankala/bgenut.h
    engines/bagel/hodjnpodj/mankala/btimeut.cpp
    engines/bagel/hodjnpodj/mankala/btimeut.h
    engines/bagel/hodjnpodj/mankala/init.cpp
    engines/bagel/hodjnpodj/mankala/mnk.cpp
    engines/bagel/hodjnpodj/mankala/mnk.h
    engines/bagel/hodjnpodj/mankala/mnklog.cpp
    engines/bagel/hodjnpodj/mankala/mnkopt.cpp
    engines/bagel/hodjnpodj/mankala/mnkopt.h
    engines/bagel/hodjnpodj/mankala/mnkui.cpp
    engines/bagel/hodjnpodj/mazedoom/init.cpp
    engines/bagel/hodjnpodj/mazedoom/mod.cpp
    engines/bagel/hodjnpodj/mazedoom/mod.h
    engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
    engines/bagel/hodjnpodj/mazedoom/optndlg.h
    engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
    engines/bagel/hodjnpodj/metagame/bgen/backpack.h
    engines/bagel/hodjnpodj/metagame/bgen/bbt.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bbt.h
    engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
    engines/bagel/hodjnpodj/metagame/bgen/bfc.h
    engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bgb.h
    engines/bagel/hodjnpodj/metagame/bgen/bgen.h
    engines/bagel/hodjnpodj/metagame/bgen/bgenut.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bgenut.h
    engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
    engines/bagel/hodjnpodj/metagame/bgen/btimeut.cpp
    engines/bagel/hodjnpodj/metagame/bgen/btimeut.h
    engines/bagel/hodjnpodj/metagame/bgen/c1btndlg.cpp
    engines/bagel/hodjnpodj/metagame/bgen/c1btndlg.h
    engines/bagel/hodjnpodj/metagame/bgen/c2btndlg.cpp
    engines/bagel/hodjnpodj/metagame/bgen/c2btndlg.h
    engines/bagel/hodjnpodj/metagame/bgen/invent.cpp
    engines/bagel/hodjnpodj/metagame/bgen/item.cpp
    engines/bagel/hodjnpodj/metagame/bgen/item.h
    engines/bagel/hodjnpodj/metagame/bgen/mgstat.cpp
    engines/bagel/hodjnpodj/metagame/bgen/mgstat.h
    engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
    engines/bagel/hodjnpodj/metagame/bgen/notebook.h
    engines/bagel/hodjnpodj/metagame/frame/app.cpp
    engines/bagel/hodjnpodj/metagame/frame/app.h
    engines/bagel/hodjnpodj/metagame/frame/dialogs.h
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
    engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
    engines/bagel/hodjnpodj/metagame/frame/movytmpl.cpp
    engines/bagel/hodjnpodj/metagame/frame/movytmpl.h
    engines/bagel/hodjnpodj/metagame/frame/msudlg.cpp
    engines/bagel/hodjnpodj/metagame/grand_tour/dialogs.cpp
    engines/bagel/hodjnpodj/metagame/grand_tour/dialogs.h
    engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
    engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
    engines/bagel/hodjnpodj/metagame/gtl/citemdlg.cpp
    engines/bagel/hodjnpodj/metagame/gtl/citemdlg.h
    engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.cpp
    engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.h
    engines/bagel/hodjnpodj/metagame/gtl/cturndlg.cpp
    engines/bagel/hodjnpodj/metagame/gtl/cturndlg.h
    engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
    engines/bagel/hodjnpodj/metagame/gtl/encount.h
    engines/bagel/hodjnpodj/metagame/gtl/gamedll.h
    engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtl.h
    engines/bagel/hodjnpodj/metagame/gtl/gtlcmp.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
    engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
    engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
    engines/bagel/hodjnpodj/metagame/gtl/gtllex.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlmanp.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
    engines/bagel/hodjnpodj/metagame/gtl/init.cpp
    engines/bagel/hodjnpodj/metagame/gtl/init.h
    engines/bagel/hodjnpodj/metagame/gtl/optdlg.cpp
    engines/bagel/hodjnpodj/metagame/gtl/optdlg.h
    engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
    engines/bagel/hodjnpodj/metagame/gtl/pawn.h
    engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
    engines/bagel/hodjnpodj/metagame/gtl/rules.h
    engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
    engines/bagel/hodjnpodj/metagame/gtl/spinner.h
    engines/bagel/hodjnpodj/metagame/gtl/store.cpp
    engines/bagel/hodjnpodj/metagame/gtl/store.h
    engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
    engines/bagel/hodjnpodj/metagame/saves/restdlg.h
    engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
    engines/bagel/hodjnpodj/metagame/saves/savedlg.h
    engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
    engines/bagel/hodjnpodj/metagame/saves/savegame.h
    engines/bagel/hodjnpodj/metagame/saves/savegame_info.h
    engines/bagel/hodjnpodj/metagame/zoom/init.cpp
    engines/bagel/hodjnpodj/metagame/zoom/init.h
    engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
    engines/bagel/hodjnpodj/metagame/zoom/zoommap.h
    engines/bagel/hodjnpodj/novacancy/main.cpp
    engines/bagel/hodjnpodj/novacancy/main.h
    engines/bagel/hodjnpodj/packrat/dialogs.h
    engines/bagel/hodjnpodj/packrat/init.cpp
    engines/bagel/hodjnpodj/packrat/msgdlg.cpp
    engines/bagel/hodjnpodj/packrat/optdlg.cpp
    engines/bagel/hodjnpodj/packrat/packrat.cpp
    engines/bagel/hodjnpodj/packrat/packrat.h
    engines/bagel/hodjnpodj/pdq/game.cpp
    engines/bagel/hodjnpodj/pdq/guess.cpp
    engines/bagel/hodjnpodj/pdq/guess.h
    engines/bagel/hodjnpodj/pdq/main.cpp
    engines/bagel/hodjnpodj/pdq/main.h
    engines/bagel/hodjnpodj/pdq/usercfg.cpp
    engines/bagel/hodjnpodj/pdq/usercfg.h
    engines/bagel/hodjnpodj/peggle/game.cpp
    engines/bagel/hodjnpodj/peggle/game.h
    engines/bagel/hodjnpodj/peggle/gameinit.cpp
    engines/bagel/hodjnpodj/peggle/options.cpp
    engines/bagel/hodjnpodj/peggle/options.h
    engines/bagel/hodjnpodj/peggle/optndlg.cpp
    engines/bagel/hodjnpodj/peggle/optndlg.h
    engines/bagel/hodjnpodj/peggle/optsub.cpp
    engines/bagel/hodjnpodj/poker/amtdlg.cpp
    engines/bagel/hodjnpodj/poker/c1btndlg.cpp
    engines/bagel/hodjnpodj/poker/c1btndlg.h
    engines/bagel/hodjnpodj/poker/dialogs.h
    engines/bagel/hodjnpodj/poker/init.cpp
    engines/bagel/hodjnpodj/poker/optdlg.cpp
    engines/bagel/hodjnpodj/poker/options.h
    engines/bagel/hodjnpodj/poker/poffsdlg.cpp
    engines/bagel/hodjnpodj/poker/poker.cpp
    engines/bagel/hodjnpodj/poker/poker.h
    engines/bagel/hodjnpodj/poker/uwondlg.cpp
    engines/bagel/hodjnpodj/riddles/riddles.cpp
    engines/bagel/hodjnpodj/riddles/riddles.h
    engines/bagel/hodjnpodj/riddles/usercfg.cpp
    engines/bagel/hodjnpodj/riddles/usercfg.h
    engines/bagel/hodjnpodj/wordsearch/c1btndlg.cpp
    engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
    engines/bagel/hodjnpodj/wordsearch/clongdlg.cpp
    engines/bagel/hodjnpodj/wordsearch/clongdlg.h
    engines/bagel/hodjnpodj/wordsearch/dialogs.h
    engines/bagel/hodjnpodj/wordsearch/init.cpp
    engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
    engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
    engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
    engines/bagel/hodjnpodj/wordsearch/wordsearch.h
    engines/bagel/mfc/afx.h
    engines/bagel/mfc/afxmsg.h
    engines/bagel/mfc/afxstr.h
    engines/bagel/mfc/afxwin.h
    engines/bagel/mfc/atltime.h
    engines/bagel/mfc/atltypes.h
    engines/bagel/mfc/bitmap.cpp
    engines/bagel/mfc/brush.cpp
    engines/bagel/mfc/button.cpp
    engines/bagel/mfc/cmd_target.cpp
    engines/bagel/mfc/dc.cpp
    engines/bagel/mfc/dialog.cpp
    engines/bagel/mfc/doc_manager.cpp
    engines/bagel/mfc/doc_template.cpp
    engines/bagel/mfc/document.cpp
    engines/bagel/mfc/edit.cpp
    engines/bagel/mfc/file.cpp
    engines/bagel/mfc/font.cpp
    engines/bagel/mfc/frame_wnd.cpp
    engines/bagel/mfc/gdi_object.cpp
    engines/bagel/mfc/gfx/dialog_template.cpp
    engines/bagel/mfc/gfx/dialog_template.h
    engines/bagel/mfc/global_functions.cpp
    engines/bagel/mfc/global_functions.h
    engines/bagel/mfc/joystickapi.cpp
    engines/bagel/mfc/joystickapi.h
    engines/bagel/mfc/libs/event_loop.cpp
    engines/bagel/mfc/libs/event_loop.h
    engines/bagel/mfc/menu.cpp
    engines/bagel/mfc/minwindef.h
    engines/bagel/mfc/palette.cpp
    engines/bagel/mfc/pen.cpp
    engines/bagel/mfc/rgn.cpp
    engines/bagel/mfc/scrollbar.cpp
    engines/bagel/mfc/single_doc_template.cpp
    engines/bagel/mfc/string.cpp
    engines/bagel/mfc/view.cpp
    engines/bagel/mfc/win_app.cpp
    engines/bagel/mfc/wingdi.cpp
    engines/bagel/mfc/wingdi.h
    engines/bagel/mfc/winnt.h
    engines/bagel/mfc/wnd.cpp
    engines/bagel/spacebar/baglib/master_win.cpp
    engines/bagel/spacebar/baglib/var.cpp


diff --git a/engines/bagel/boflib/misc.cpp b/engines/bagel/boflib/misc.cpp
index 8350e0ba3e0..50507ff4429 100644
--- a/engines/bagel/boflib/misc.cpp
+++ b/engines/bagel/boflib/misc.cpp
@@ -221,11 +221,11 @@ int StrFreqMatch(const char *mask, const char *test) {
 }
 
 
-BOOL StrCompare(const char *pszStr1, const char *pszStr2, unsigned int nSize) {
+bool StrCompare(const char *pszStr1, const char *pszStr2, unsigned int nSize) {
 	char *s1, *p, string1[256];   /* replace this stack hog with malloc */
 	char *s2, *sp, string2[256];       /* replace this stack hog with malloc */
 	int i, n, inc;
-	BOOL bMatch;
+	bool bMatch;
 
 	/* can't access null pointers */
 	assert(pszStr1 != nullptr);
@@ -298,7 +298,7 @@ BOOL StrCompare(const char *pszStr1, const char *pszStr2, unsigned int nSize) {
 	*/
 
 	/* assume they match */
-	bMatch = TRUE;
+	bMatch = true;
 
 	i = 0;
 	n = strlen(s1);
@@ -327,7 +327,7 @@ BOOL StrCompare(const char *pszStr1, const char *pszStr2, unsigned int nSize) {
 		}
 
 		if ((toupper(*s1) != toupper(*s2)) && (toupper(*p) != toupper(*s2))) {
-			bMatch = FALSE;
+			bMatch = false;
 			break;
 		}
 		s1++;
@@ -508,10 +508,10 @@ char *StrReplaceChar(char *str, char cOld, char cNew) {
 *  synopsis  - return a true / false based on the probability given
 *            int nProbability          the probability of returning a true
 *
-*  purpose   to return a TRUE <nProbability> of the tine
+*  purpose   to return a true <nProbability> of the tine
 *
 *
-*  returns   BOOL
+*  returns   bool
 *
 **/
 bool ProbableTrue(int nProbability) {
diff --git a/engines/bagel/boflib/misc.h b/engines/bagel/boflib/misc.h
index b265316d000..8e501c1eae1 100644
--- a/engines/bagel/boflib/misc.h
+++ b/engines/bagel/boflib/misc.h
@@ -111,7 +111,7 @@ extern bool ProbableTrue(int nProbability);
 extern void ErrorLog(const char *logFile, const char *format, ...);
 
 extern int          StrFreqMatch(const char *, const char *);
-extern BOOL         StrCompare(const char *, const char *, unsigned int);
+extern bool         StrCompare(const char *, const char *, unsigned int);
 extern int          StrCharCount(const char *, char);
 extern char *StriStr(char *, const char *);
 extern void         StrUprStr(char *, const char *);
diff --git a/engines/bagel/boflib/sound.cpp b/engines/bagel/boflib/sound.cpp
index 64f7a387e39..01f8873bdcf 100644
--- a/engines/bagel/boflib/sound.cpp
+++ b/engines/bagel/boflib/sound.cpp
@@ -948,7 +948,7 @@ void CBofSound::setQVol(int nSlot, int nVol) {
 	}
 }
 
-BOOL MessageBeep(int uType) {
+bool MessageBeep(int uType) {
 	warning("TODO: beep");
 	return true;
 }
diff --git a/engines/bagel/boflib/sound.h b/engines/bagel/boflib/sound.h
index 6e3f61945f0..fe403390487 100644
--- a/engines/bagel/boflib/sound.h
+++ b/engines/bagel/boflib/sound.h
@@ -238,7 +238,7 @@ private:
 
 extern bool BofPlaySound(const char *pszSoundFile, uint32 nFlags, int iQSlot = 0);
 extern bool BofPlaySoundEx(const char *pszSoundFile, uint32 nFlags, int iQSlot = 0, bool bWait = false);
-extern BOOL MessageBeep(int uType);
+extern bool MessageBeep(int uType);
 
 #define sndPlaySound BofPlaySound
 
diff --git a/engines/bagel/hodjnpodj/archeroids/main.cpp b/engines/bagel/hodjnpodj/archeroids/main.cpp
index 5735620cd17..c8c2e75ac7d 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/main.cpp
@@ -275,7 +275,7 @@ CMainWindow::CMainWindow() {
 	CBitmap    *pSplashScreen;
 	CDC        *pDC;
 	ERROR_CODE  errCode;
-	BOOL        bSuccess;
+	bool        bSuccess;
 
 	// assume no error
 	errCode = ERR_NONE;
@@ -288,11 +288,11 @@ CMainWindow::CMainWindow() {
 	m_pGamePalette = nullptr;
 	m_pFXList = nullptr;
 	m_pHodj = nullptr;
-	m_bTimerActive = FALSE;
-	m_bGameActive = FALSE;
-	m_bJoyActive = FALSE;
-	m_bMoveMode = FALSE;
-	m_bInMenu = FALSE;
+	m_bTimerActive = false;
+	m_bGameActive = false;
+	m_bJoyActive = false;
+	m_bMoveMode = false;
+	m_bInMenu = false;
 	m_pMasterBadArrow = nullptr;
 	m_pMasterGoodArrow = nullptr;
 	m_pMasterBurn = nullptr;
@@ -397,8 +397,8 @@ CMainWindow::CMainWindow() {
 			} else {
 				errCode = ERR_MEMORY;
 			}
-			m_pScrollSprite->SetMasked(TRUE);
-			m_pScrollSprite->SetMobile(TRUE);
+			m_pScrollSprite->SetMasked(true);
+			m_pScrollSprite->SetMobile(true);
 		} else {
 			errCode = ERR_MEMORY;
 		}
@@ -446,14 +446,14 @@ CMainWindow::CMainWindow() {
 void CMainWindow::InitializeJoystick(void) {
 	JOYINFO     joyInfo;
 
-	if (joySetCapture(m_hWnd, JOYSTICKID1, 10000, TRUE) == JOYERR_NOERROR) {
+	if (joySetCapture(m_hWnd, JOYSTICKID1, 10000, true) == JOYERR_NOERROR) {
 		//
 		// Calibrate the joystick
 		//
 		joySetThreshold(JOYSTICKID1, 5000);
 		joyGetPos(JOYSTICKID1, &joyInfo);
 		m_nJoyLast = joyInfo.wYpos;
-		m_bJoyActive = TRUE;
+		m_bJoyActive = true;
 
 	} else {
 		//CMessageBox dlgNoJoystick((CWnd *)this, m_pGamePalette, "Warning!  No Joystick", "Driver Installed");
@@ -471,14 +471,14 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 
 		if ((m_pMasterGoodDie = new CSprite) != nullptr) {
 
-			if (m_pMasterGoodDie->SharePalette(m_pGamePalette) != FALSE) {
+			if (m_pMasterGoodDie->SharePalette(m_pGamePalette) != false) {
 
 				if (m_pMasterGoodDie->LoadResourceCels(pDC, IDB_HODJDIE, N_HODJDIE_CELLS)) {
 
 					m_pMasterGoodDie->SetTypeCode(200);
-					m_pMasterGoodDie->SetMasked(TRUE);
-					m_pMasterGoodDie->SetMobile(TRUE);
-					m_pMasterGoodDie->SetAnimated(TRUE);
+					m_pMasterGoodDie->SetMasked(true);
+					m_pMasterGoodDie->SetMobile(true);
+					m_pMasterGoodDie->SetAnimated(true);
 
 				} else {
 					errCode = ERR_UNKNOWN;
@@ -496,14 +496,14 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 
 			if ((m_pMasterGoodShoot = new CSprite) != nullptr) {
 
-				if (m_pMasterGoodShoot->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pMasterGoodShoot->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pMasterGoodShoot->LoadResourceCels(pDC, IDB_HODJSHOOT, N_HODJSHOOT_CELLS) != FALSE) {
+					if (m_pMasterGoodShoot->LoadResourceCels(pDC, IDB_HODJSHOOT, N_HODJSHOOT_CELLS) != false) {
 
 						m_pMasterGoodShoot->SetTypeCode(200);
-						m_pMasterGoodShoot->SetMasked(TRUE);
-						m_pMasterGoodShoot->SetMobile(TRUE);
-						m_pMasterGoodShoot->SetAnimated(TRUE);
+						m_pMasterGoodShoot->SetMasked(true);
+						m_pMasterGoodShoot->SetMobile(true);
+						m_pMasterGoodShoot->SetAnimated(true);
 
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -521,14 +521,14 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 		if (errCode == ERR_NONE) {
 			if ((m_pMasterGoodWalk = new CSprite) != nullptr) {
 
-				if (m_pMasterGoodWalk->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pMasterGoodWalk->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pMasterGoodWalk->LoadResourceCels(pDC, IDB_HODJWALK, N_HODJWALK_CELLS) != FALSE) {
+					if (m_pMasterGoodWalk->LoadResourceCels(pDC, IDB_HODJWALK, N_HODJWALK_CELLS) != false) {
 
 						m_pMasterGoodWalk->SetTypeCode(200);
-						m_pMasterGoodWalk->SetMasked(TRUE);
-						m_pMasterGoodWalk->SetMobile(TRUE);
-						m_pMasterGoodWalk->SetAnimated(TRUE);
+						m_pMasterGoodWalk->SetMasked(true);
+						m_pMasterGoodWalk->SetMobile(true);
+						m_pMasterGoodWalk->SetAnimated(true);
 
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -548,14 +548,14 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 
 			if ((m_pMasterBadDie = new CSprite) != nullptr) {
 
-				if (m_pMasterBadDie->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pMasterBadDie->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pMasterBadDie->LoadResourceCels(pDC, IDB_BADDIE, N_BADDIE_CELLS) != FALSE) {
+					if (m_pMasterBadDie->LoadResourceCels(pDC, IDB_BADDIE, N_BADDIE_CELLS) != false) {
 
-						m_pMasterBadDie->SetTypeCode(FALSE);
-						m_pMasterBadDie->SetMasked(TRUE);
-						m_pMasterBadDie->SetMobile(TRUE);
-						m_pMasterBadDie->SetAnimated(TRUE);
+						m_pMasterBadDie->SetTypeCode(false);
+						m_pMasterBadDie->SetMasked(true);
+						m_pMasterBadDie->SetMobile(true);
+						m_pMasterBadDie->SetAnimated(true);
 
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -574,14 +574,14 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 
 			if ((m_pMasterBadShoot = new CSprite) != nullptr) {
 
-				if (m_pMasterBadShoot->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pMasterBadShoot->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pMasterBadShoot->LoadResourceCels(pDC, IDB_BADSHOOT, N_BADSHOOT_CELLS) != FALSE) {
+					if (m_pMasterBadShoot->LoadResourceCels(pDC, IDB_BADSHOOT, N_BADSHOOT_CELLS) != false) {
 
-						m_pMasterBadShoot->SetTypeCode(FALSE);
-						m_pMasterBadShoot->SetMasked(TRUE);
-						m_pMasterBadShoot->SetMobile(TRUE);
-						m_pMasterBadShoot->SetAnimated(TRUE);
+						m_pMasterBadShoot->SetTypeCode(false);
+						m_pMasterBadShoot->SetMasked(true);
+						m_pMasterBadShoot->SetMobile(true);
+						m_pMasterBadShoot->SetAnimated(true);
 
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -598,14 +598,14 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 		#endif
 		if ((m_pMasterBadWalk = new CSprite) != nullptr) {
 
-			if (m_pMasterBadWalk->SharePalette(m_pGamePalette) != FALSE) {
+			if (m_pMasterBadWalk->SharePalette(m_pGamePalette) != false) {
 
-				if (m_pMasterBadWalk->LoadResourceCels(pDC, IDB_BADWALK, N_BADWALK_CELLS) != FALSE) {
+				if (m_pMasterBadWalk->LoadResourceCels(pDC, IDB_BADWALK, N_BADWALK_CELLS) != false) {
 
-					m_pMasterBadWalk->SetTypeCode(FALSE);
-					m_pMasterBadWalk->SetMasked(TRUE);
-					m_pMasterBadWalk->SetMobile(TRUE);
-					m_pMasterBadWalk->SetAnimated(TRUE);
+					m_pMasterBadWalk->SetTypeCode(false);
+					m_pMasterBadWalk->SetMasked(true);
+					m_pMasterBadWalk->SetMobile(true);
+					m_pMasterBadWalk->SetAnimated(true);
 
 				} else {
 					errCode = ERR_UNKNOWN;
@@ -626,14 +626,14 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 
 			// attach arrow to the Game Palette
 			//
-			if (m_pMasterBurn->SharePalette(m_pGamePalette) != FALSE) {
+			if (m_pMasterBurn->SharePalette(m_pGamePalette) != false) {
 
-				if (m_pMasterBurn->LoadResourceCels(pDC, IDB_HAYBURNING, N_HAYBURNING_CELLS) != FALSE) {
+				if (m_pMasterBurn->LoadResourceCels(pDC, IDB_HAYBURNING, N_HAYBURNING_CELLS) != false) {
 
 					m_pMasterBurn->SetTypeCode(300);
-					m_pMasterBurn->SetMasked(TRUE);
-					m_pMasterBurn->SetMobile(TRUE);
-					m_pMasterBurn->SetAnimated(TRUE);
+					m_pMasterBurn->SetMasked(true);
+					m_pMasterBurn->SetMobile(true);
+					m_pMasterBurn->SetAnimated(true);
 
 				} else {
 					errCode = ERR_UNKNOWN;
@@ -654,17 +654,17 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 
 				// attach arrow to the Game Palette
 				//
-				if (m_pMasterBadArrow->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pMasterBadArrow->SharePalette(m_pGamePalette) != false) {
 
 					//
 					// load this arrow's bitmap into the sprite
 					//
-					if (m_pMasterBadArrow->LoadResourceCels(pDC, IDB_BAD_ARROWS, N_BAD_ARROWS_CELLS) != FALSE) {
+					if (m_pMasterBadArrow->LoadResourceCels(pDC, IDB_BAD_ARROWS, N_BAD_ARROWS_CELLS) != false) {
 
 						m_pMasterBadArrow->SetTypeCode(218);
-						m_pMasterBadArrow->SetMasked(TRUE);
-						m_pMasterBadArrow->SetMobile(TRUE);
-						m_pMasterBadArrow->SetAnimated(TRUE);
+						m_pMasterBadArrow->SetMasked(true);
+						m_pMasterBadArrow->SetMobile(true);
+						m_pMasterBadArrow->SetAnimated(true);
 
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -686,17 +686,17 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 
 				// attach arrow to the Game Palette
 				//
-				if (m_pMasterGoodArrow->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pMasterGoodArrow->SharePalette(m_pGamePalette) != false) {
 
 					//
 					// load this arrow's bitmap into the sprite
 					//
-					if (m_pMasterGoodArrow->LoadResourceCels(pDC, IDB_GOOD_ARROWS, N_GOOD_ARROWS_CELLS) != FALSE) {
+					if (m_pMasterGoodArrow->LoadResourceCels(pDC, IDB_GOOD_ARROWS, N_GOOD_ARROWS_CELLS) != false) {
 
 						m_pMasterGoodArrow->SetTypeCode(217);
-						m_pMasterGoodArrow->SetMasked(TRUE);
-						m_pMasterGoodArrow->SetMobile(TRUE);
-						m_pMasterGoodArrow->SetAnimated(TRUE);
+						m_pMasterGoodArrow->SetMasked(true);
+						m_pMasterGoodArrow->SetMobile(true);
+						m_pMasterGoodArrow->SetAnimated(true);
 
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -717,15 +717,15 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 				//
 				// load picture of heart
 				//
-				if (m_pMasterHeart->LoadResourceSprite(pDC, IDB_HEART) != FALSE) {
+				if (m_pMasterHeart->LoadResourceSprite(pDC, IDB_HEART) != false) {
 
 					// attach heart to the Game Palette
 					//
-					if (m_pMasterHeart->SharePalette(m_pGamePalette) != FALSE) {
+					if (m_pMasterHeart->SharePalette(m_pGamePalette) != false) {
 
 						m_pMasterHeart->SetTypeCode(301);
-						m_pMasterHeart->SetMasked(TRUE);
-						m_pMasterHeart->SetMobile(TRUE);
+						m_pMasterHeart->SetMasked(true);
+						m_pMasterHeart->SetMobile(true);
 
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -936,7 +936,7 @@ void CMainWindow::ReleaseMasterSounds(void) {
 void CMainWindow::OnPaint() {
 	PAINTSTRUCT lpPaint;
 
-	Invalidate(FALSE);
+	Invalidate(false);
 	BeginPaint(&lpPaint);
 	PaintScreen();
 	EndPaint(&lpPaint);
@@ -1014,10 +1014,10 @@ ERROR_CODE CMainWindow::RepaintSpriteList(CDC *pDC) {
 }
 
 
-BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	CMainMenu COptionsWind((CWnd *)this, m_pGamePalette, (pGameParams->bPlayingMetagame ? (NO_NEWGAME | NO_OPTIONS) : (m_bGameActive ? 0 : NO_RETURN)), GetGameParams, "arch.txt", (pGameParams->bSoundEffectsEnabled ? WAV_NARRATION : nullptr), pGameParams);
 	CDC *pDC;
-	BOOL bSuccess;
+	bool bSuccess;
 
 	if (HIWORD(lParam) == BN_CLICKED) {
 		switch (wParam) {
@@ -1029,7 +1029,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 			// pause timer
 			GamePause();
-			m_bInMenu = TRUE;
+			m_bInMenu = true;
 
 			pDC = GetDC();
 			if (m_pScrollSprite != nullptr) {
@@ -1059,7 +1059,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			}
 			ReleaseDC(pDC);
 
-			m_bInMenu = FALSE;
+			m_bInMenu = false;
 
 			if (!pGameParams->bMusicEnabled && (m_pSoundTrack != nullptr)) {
 
@@ -1075,11 +1075,11 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			// resume timer
 			//GameResume();
 
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 CSprite *CMainWindow::NewLife(int iLifeIndex) {
@@ -1160,7 +1160,7 @@ ERROR_CODE CMainWindow::CreateGoodGuy() {
 		if ((m_pHodj = m_pMasterGoodWalk->DuplicateSprite(pDC)) != nullptr) {
 
 			m_pHodj->SetZOrder(SPRITE_FOREGROUND);
-			m_pHodj->SetAnimated(TRUE);
+			m_pHodj->SetAnimated(true);
 
 			// add good guy to sprite list
 			m_pHodj->LinkSprite();
@@ -1223,21 +1223,21 @@ ERROR_CODE CMainWindow::CreateHay() {
 				//
 				// load the hay picture
 				//
-				if (pSprite->LoadResourceSprite(pDC, IDB_HAY) == FALSE) {
+				if (pSprite->LoadResourceSprite(pDC, IDB_HAY) == false) {
 					errCode = ERR_UNKNOWN;
 					break;
 
 				} else {
 
-					if (pSprite->SharePalette(m_pGamePalette) == FALSE) {
+					if (pSprite->SharePalette(m_pGamePalette) == false) {
 						errCode = ERR_UNKNOWN;
 						break;
 
 					} else {
 
 						pSprite->SetTypeCode(i);
-						pSprite->SetMasked(TRUE);
-						pSprite->SetMobile(TRUE);
+						pSprite->SetMasked(true);
+						pSprite->SetMobile(true);
 						pSprite->LinkSprite();                          // add hay to sprite list
 
 						pSprite->PaintSprite(pDC, 100, (i * 100) + 60); // set intial hay positions
@@ -1278,7 +1278,7 @@ ERROR_CODE CMainWindow::CreateBurningHay(CPoint point) {
 		if ((pSprite = m_pMasterBurn->DuplicateSprite(pDC)) != nullptr) {
 
 			pSprite->SetZOrder(SPRITE_BACKGROUND);
-			pSprite->SetAnimated(TRUE);
+			pSprite->SetAnimated(true);
 
 			pSprite->LinkSprite();                  // add burning hay to sprite list
 
@@ -1333,7 +1333,7 @@ ERROR_CODE CMainWindow::CreateBadArrow(CSprite *pBadGuy) {
 	CSprite *pSprite;
 	CDC *pDC;
 	ERROR_CODE errCode;
-	BOOL bHit;
+	bool bHit;
 
 	// assume no error
 	errCode = ERR_NONE;
@@ -1353,7 +1353,7 @@ ERROR_CODE CMainWindow::CreateBadArrow(CSprite *pBadGuy) {
 		//
 		// Make sure this arrow does not touch hay
 		//
-		bHit = FALSE;
+		bHit = false;
 		pList = m_pHayList;
 		while (pList != nullptr) {
 			oldRect = ((CSprite *)pList->getData())->GetRect();
@@ -1361,7 +1361,7 @@ ERROR_CODE CMainWindow::CreateBadArrow(CSprite *pBadGuy) {
 			// Check for intercection
 			//
 			if (overlappedRect.IntersectRect(oldRect, newRect)) {
-				bHit = TRUE;
+				bHit = true;
 				break;
 			}
 			pList = pList->getNext();
@@ -1397,7 +1397,7 @@ ERROR_CODE CMainWindow::CreateBadArrow(CSprite *pBadGuy) {
 				if ((pSprite = m_pMasterBadArrow->DuplicateSprite(pDC)) != nullptr) {
 
 					pSprite->SetZOrder(SPRITE_TOPMOST);
-					pSprite->SetAnimated(TRUE);
+					pSprite->SetAnimated(true);
 
 					m_nBadArrows++;
 
@@ -1486,7 +1486,7 @@ ERROR_CODE CMainWindow::CreateGoodArrow() {
 	ERROR_CODE errCode;
 	CSprite *pSprite;
 	POINT point;
-	BOOL bHit;
+	bool bHit;
 
 	// assume no error
 	errCode = ERR_NONE;
@@ -1510,7 +1510,7 @@ ERROR_CODE CMainWindow::CreateGoodArrow() {
 		//
 		// Make sure this arrow does not touch another arrow
 		//
-		bHit = FALSE;
+		bHit = false;
 		pList = m_pGoodArrowList;
 		while (pList != nullptr) {
 			oldRect = ((CSprite *)pList->getData())->GetRect();
@@ -1518,7 +1518,7 @@ ERROR_CODE CMainWindow::CreateGoodArrow() {
 			// Check for intercection
 			//
 			if (overlappedRect.IntersectRect(oldRect, newRect)) {
-				bHit = TRUE;
+				bHit = true;
 				break;
 			}
 			pList = pList->getNext();
@@ -1557,7 +1557,7 @@ ERROR_CODE CMainWindow::CreateGoodArrow() {
 
 					// set arrows to topmost
 					pSprite->SetZOrder(SPRITE_TOPMOST);
-					pSprite->SetAnimated(TRUE);
+					pSprite->SetAnimated(true);
 
 					m_nGoodArrows++;
 
@@ -1628,7 +1628,7 @@ ERROR_CODE CMainWindow::CreateBadGuys() {
 			if ((pSprite = m_pMasterBadWalk->DuplicateSprite(pDC)) != nullptr) {
 
 				pSprite->SetZOrder(SPRITE_FOREGROUND);
-				pSprite->SetAnimated(TRUE);
+				pSprite->SetAnimated(true);
 
 				// add badguy to sprite list
 				pSprite->LinkSprite();
@@ -1691,11 +1691,11 @@ void CMainWindow::PlayGame(void) {
 
 	if (!m_bTimerActive) {
 
-		m_bTimerActive = TRUE;
+		m_bTimerActive = true;
 		CWnd::SetTimer(TIMER_ID, 50, nullptr);
 	}
 
-	m_bNewGame = TRUE;                                  // a new game has been started
+	m_bNewGame = true;                                  // a new game has been started
 
 	LoadIniSettings();                                  // load game defaults
 
@@ -1710,12 +1710,12 @@ void CMainWindow::PlayGame(void) {
 
 				if ((errCode = CreateBadGuys()) == ERR_NONE) {
 
-					m_bGameActive = TRUE;
+					m_bGameActive = true;
 
 					FlushInputEvents();
 
 					// game starts paused
-					m_bPause = TRUE;
+					m_bPause = true;
 				}
 			}
 		}
@@ -1801,7 +1801,7 @@ void CMainWindow::WaveReset(void) {
 
 	m_nState = 0;                                   // set initial bad guy state
 
-	m_bPause = TRUE;                                // game starts paused
+	m_bPause = true;                                // game starts paused
 }
 
 /*****************************************************************************
@@ -1820,9 +1820,9 @@ void CMainWindow::WaveReset(void) {
 void CMainWindow::GameReset() {
 	CDC *pDC;
 
-	m_bGameActive = FALSE;                          // no current active game
+	m_bGameActive = false;                          // no current active game
 
-	m_bPause = FALSE;                               // game starts paused
+	m_bPause = false;                               // game starts paused
 
 	m_nGoodArrows = m_nBadArrows = 0;               // reset # of arrows
 
@@ -1955,7 +1955,7 @@ void CMainWindow::LoadIniSettings() {
 		// Get overide for Animations On/Off
 		//
 		nVal = GetPrivateProfileInt(INI_SECTION, "AnimationsOn", m_bAnimationsOn, INI_FILENAME);
-		m_bAnimationsOn = (nVal == 0 ? FALSE : TRUE);
+		m_bAnimationsOn = (nVal == 0 ? false : true);
 	}
 	m_nLives = m_nInitNumLives;
 	m_nGameSpeed = abs(SPEED_MAX - m_nInitGameSpeed);
@@ -1977,7 +1977,7 @@ void CMainWindow::OnTimer(uintptr nEventID) {
 }
 
 
-BOOL CMainWindow::MainLoop() {
+bool CMainWindow::MainLoop() {
 	CLList *pList, *pNext;
 	CSprite *pSprite;
 	CDC *pDC;
@@ -1987,7 +1987,7 @@ BOOL CMainWindow::MainLoop() {
 
 	// new game state is over.  We are now playing the game
 	//
-	m_bNewGame = FALSE;
+	m_bNewGame = false;
 
 	if (m_bGameActive && !m_bPause) {
 
@@ -2033,7 +2033,7 @@ BOOL CMainWindow::MainLoop() {
 			// Handle badguy movement.
 			//
 			if (MoveBadGuys(pDC))
-				return TRUE;
+				return true;
 
 			if (!m_bNewGame) {
 				while (m_nMoveArrows < ARROW_MOVES_PER_CYCLE)
@@ -2048,23 +2048,23 @@ BOOL CMainWindow::MainLoop() {
 			if (m_nBadGuySpeed > 0) {
 				while (GetTickCount() < t1 + (20 + m_nBadGuys * 20)) {
 					if (CheckMessages())
-						return TRUE;
+						return true;
 				}
 			}
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 
-BOOL CMainWindow::MoveArrows(CDC *pDC) {
+bool CMainWindow::MoveArrows(CDC *pDC) {
 	char buf1[40], buf2[40];
 	CLList *pList, *pNext, *pSearchList;
 	CSprite *pSprite, *pTmpSprite;
 	POINT point;
 	CRect tmpRect, newRect;
 	CSize size;
-	BOOL bHit;
+	bool bHit;
 
 	assert(pDC != nullptr);
 
@@ -2090,7 +2090,7 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
 
 				if (pSprite->InterceptOccurred()) {
 
-					bHit = FALSE;
+					bHit = false;
 
 					pSearchList = m_pHayList;
 					while (pSearchList != nullptr) {
@@ -2103,8 +2103,8 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
 							if (pSprite->TestInterception(pDC, pTmpSprite)) {
 
 								DestroyBadArrow(pList);
-								DestroyHay(pSearchList, tmpRect, pDC, TRUE);
-								bHit = TRUE;
+								DestroyHay(pSearchList, tmpRect, pDC, true);
+								bHit = true;
 								break;
 							}
 						}
@@ -2116,8 +2116,8 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
 
 						if (pSprite->TestInterception(pDC, m_pHodj)) {
 							DestroyBadArrow(pList);
-							LoseLife(pDC, TRUE);
-							return TRUE;
+							LoseLife(pDC, true);
+							return true;
 						}
 					}
 				}
@@ -2156,7 +2156,7 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
 			//
 			if (pSprite->InterceptOccurred()) {
 
-				bHit = FALSE;
+				bHit = false;
 
 				if (point.x < HAY_AXIS) {
 
@@ -2171,8 +2171,8 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
 							if (pSprite->TestInterception(pDC, pTmpSprite)) {
 
 								DestroyGoodArrow(pList);
-								DestroyHay(pSearchList, tmpRect, pDC, TRUE);
-								bHit = TRUE;
+								DestroyHay(pSearchList, tmpRect, pDC, true);
+								bHit = true;
 								break;
 							}
 						}
@@ -2191,7 +2191,7 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
 						// if badguy is not already dead
 						//
 						pTmpSprite = (CSprite *)pSearchList->getData();
-						if (pTmpSprite->GetTypeCode() == FALSE) {
+						if (pTmpSprite->GetTypeCode() == false) {
 
 							if (pSprite->TestInterception(pDC, pTmpSprite)) {
 
@@ -2228,7 +2228,7 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
 									} else {
 										PlayNextWave();
 									}
-									return TRUE;
+									return true;
 								}
 								break;
 							}
@@ -2245,13 +2245,13 @@ BOOL CMainWindow::MoveArrows(CDC *pDC) {
 		// go to next in list
 		pList = pNext;
 	}
-	return FALSE;
+	return false;
 }
 
-BOOL CMainWindow::CheckMessages(void) {
+bool CMainWindow::CheckMessages(void) {
 	JOYINFO joyInfo;
 	MSG msg;
-	BOOL bEndTask = FALSE;
+	bool bEndTask = false;
 
 	assert(m_bTimerActive);
 
@@ -2270,8 +2270,8 @@ BOOL CMainWindow::CheckMessages(void) {
 	if (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) {
 
 		if (msg.message == WM_CLOSE || msg.message == WM_QUIT) {
-			m_bTimerActive = FALSE;
-			bEndTask = TRUE;
+			m_bTimerActive = false;
+			bEndTask = true;
 		} else {
 
 			TranslateMessage(&msg);
@@ -2282,7 +2282,7 @@ BOOL CMainWindow::CheckMessages(void) {
 	return bEndTask;
 }
 
-BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
+bool CMainWindow::MoveBadGuys(CDC *pDC) {
 	CRect tmpRect;
 	POINT point;
 	CLList *pList, *pSearchList, *pSearchNext;
@@ -2324,7 +2324,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 
 				// as long as this badguy is not dead then move him
 				//
-				if (pSprite->GetTypeCode() == FALSE) {
+				if (pSprite->GetTypeCode() == false) {
 
 					point = pSprite->GetPosition();
 					point.y -= BADGUYMOVE_Y - m_nGameSpeed;
@@ -2354,7 +2354,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 
 									point.x = tmpRect.left;
 									point.y = tmpRect.top;
-									DestroyHay(pSearchList, tmpRect, pDC, FALSE);
+									DestroyHay(pSearchList, tmpRect, pDC, false);
 									break;
 								}
 								pSearchList = pSearchNext;
@@ -2367,10 +2367,10 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 					}
 
 					if (CheckMessages())
-						return TRUE;
+						return true;
 
 					if (m_bNewGame)
-						return FALSE;
+						return false;
 
 					if (n > 0) {
 						if ((i % n) == n - 1) {
@@ -2403,7 +2403,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 
 				// as long as this badguy is not dead then move him
 				//
-				if (pSprite->GetTypeCode() == FALSE) {
+				if (pSprite->GetTypeCode() == false) {
 
 					point = pSprite->GetPosition();
 					point.y += BADGUYMOVE_Y - m_nGameSpeed;
@@ -2433,7 +2433,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 
 									point.x = tmpRect.left;
 									point.y = tmpRect.top;
-									DestroyHay(pSearchList, tmpRect, pDC, FALSE);
+									DestroyHay(pSearchList, tmpRect, pDC, false);
 									break;
 								}
 								pSearchList = pSearchNext;
@@ -2448,10 +2448,10 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 					}
 
 					if (CheckMessages())
-						return TRUE;
+						return true;
 
 					if (m_bNewGame)
-						return FALSE;
+						return false;
 
 					if (n > 0) {
 						if ((i % n) == n - 1) {
@@ -2488,7 +2488,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 
 				// as long as this badguy is not dead then move him
 				//
-				if (pSprite->GetTypeCode() == FALSE) {
+				if (pSprite->GetTypeCode() == false) {
 
 					point = pSprite->GetPosition();
 					point.x -= BADGUYMOVE_X;
@@ -2499,7 +2499,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 					//
 					if (point.x < END_GAME_AXIS) {
 
-						LoseLife(pDC, FALSE);
+						LoseLife(pDC, false);
 						break;
 
 					} else if (point.x < HAY_AXIS) {
@@ -2517,7 +2517,7 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 
 									point.x = tmpRect.left;
 									point.y = tmpRect.top;
-									DestroyHay(pSearchList, tmpRect, pDC, FALSE);
+									DestroyHay(pSearchList, tmpRect, pDC, false);
 									break;
 								}
 								pSearchList = pSearchNext;
@@ -2532,10 +2532,10 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 					}
 
 					if (CheckMessages())
-						return TRUE;
+						return true;
 
 					if (m_bNewGame)
-						return FALSE;
+						return false;
 
 					if (n > 0) {
 						if ((i % n) == n - 1) {
@@ -2561,11 +2561,11 @@ BOOL CMainWindow::MoveBadGuys(CDC *pDC) {
 		}
 		PruneDeadBadGuys();
 	}
-	return FALSE;
+	return false;
 }
 
 
-void CMainWindow::LoseLife(CDC *pDC, BOOL bAnimate) {
+void CMainWindow::LoseLife(CDC *pDC, bool bAnimate) {
 	char szTmpBuf[40];
 	CSprite *pSprite;
 	//CSound *pSound;
@@ -2596,7 +2596,7 @@ void CMainWindow::LoseLife(CDC *pDC, BOOL bAnimate) {
 
 		if ((pSprite = m_pMasterGoodDie->DuplicateSprite(pDC)) != nullptr) {
 
-			pSprite->SetAnimated(TRUE);
+			pSprite->SetAnimated(true);
 			pSprite->LinkSprite();
 			pSprite->PaintSprite(pDC, m_pHodj->GetPosition());
 
@@ -2692,7 +2692,7 @@ void CMainWindow::PruneDeadBadGuys() {
 		pSprite = (CSprite *)(pList->getData());
 		assert(pSprite != nullptr);
 
-		if (pSprite->GetTypeCode() == TRUE) {
+		if (pSprite->GetTypeCode() == 1) {
 			delete pSprite;
 
 			// if this is the 1st bad guy in the list, then move the head
@@ -2757,14 +2757,14 @@ void CMainWindow::DestroyBadGuy(CLList *pList, CDC *pDC) {
 	}
 
 	// indicate that this badguy is dead
-	pSprite->SetTypeCode(TRUE);
+	pSprite->SetTypeCode(true);
 
 	//
 	// perform some animation to kill a bad guy
 	//
 	if ((pNewSprite = m_pMasterBadDie->DuplicateSprite(pDC)) != nullptr) {
 		pNewSprite->SetZOrder(SPRITE_BACKGROUND);
-		pNewSprite->SetAnimated(TRUE);
+		pNewSprite->SetAnimated(true);
 		pNewSprite->LinkSprite();
 		pNewSprite->PaintSprite(pDC, point);
 	}
@@ -2803,7 +2803,7 @@ void CMainWindow::DestroyBadGuy(CLList *pList, CDC *pDC) {
 	}
 }
 
-void CMainWindow::DestroyHay(CLList *pList, CRect rect, CDC *pDC, BOOL bAnimate) {
+void CMainWindow::DestroyHay(CLList *pList, CRect rect, CDC *pDC, bool bAnimate) {
 	CSprite *pSprite;
 	CRect tmpRect, overlappedRect;
 	POINT ptTmp, point;
@@ -3196,22 +3196,22 @@ long CMainWindow::OnJoyStick(unsigned int wParam, long lParam) {
 }
 
 void CMainWindow::GamePause(void) {
-	m_bPause = TRUE;
+	m_bPause = true;
 	if (m_bMoveMode) {
-		m_bMoveMode = FALSE;
+		m_bMoveMode = false;
 		MFC::SetCursor(LoadCursor(nullptr, IDC_ARROW));
 	}
 };
 
 
 void CMainWindow::GameResume(void) {
-	m_bPause = FALSE;
+	m_bPause = false;
 
 	if (m_bMoveMode)
 		SetCursor(nullptr);
 };
 
-void CMainWindow::OnActivate(unsigned int nState, CWnd *, BOOL) {
+void CMainWindow::OnActivate(unsigned int nState, CWnd *, bool) {
 	if (nState == WA_ACTIVE || nState == WA_CLICKACTIVE)
 		SetFocus();
 }
@@ -3222,7 +3222,7 @@ void CMainWindow::OnRButtonUp(unsigned int, CPoint) {
 	// Toggle Good Guy Move Mode
 	//
 	if (m_bGameActive) {
-		m_bMoveMode = (m_bMoveMode ? FALSE : TRUE);
+		m_bMoveMode = (m_bMoveMode ? false : true);
 
 		if (m_bMoveMode) {
 			GameResume();
@@ -3298,14 +3298,14 @@ void CMainWindow::FlushInputEvents(void) {
 
 	// find and remove all keyboard events
 	//
-	while (TRUE) {
+	while (true) {
 		if (!PeekMessage(&msg, nullptr, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE))
 			break;
 	}
 
 	// find and remove all mouse events
 	//
-	while (TRUE) {
+	while (true) {
 		if (!PeekMessage(&msg, nullptr, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE))
 			break;
 	}
diff --git a/engines/bagel/hodjnpodj/archeroids/main.h b/engines/bagel/hodjnpodj/archeroids/main.h
index 2226968a268..b35025c951f 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.h
+++ b/engines/bagel/hodjnpodj/archeroids/main.h
@@ -43,11 +43,11 @@ public:
 	void        PaintScreen(void);
 	ERROR_CODE  RepaintSpriteList(CDC *);
 	void        LoadIniSettings(void);
-	BOOL        MainLoop(void);
+	bool        MainLoop(void);
 
 protected:
 	void        FlushInputEvents(void);
-	BOOL        CheckMessages(void);
+	bool        CheckMessages(void);
 	ERROR_CODE  LoadMasterSprites(void);
 	void        ReleaseMasterSprites(void);
 	ERROR_CODE  LoadMasterSounds(void);
@@ -70,18 +70,18 @@ protected:
 	void        DestroyBadArrow(CLList *);
 	void        DestroyBadGuy(CLList *, CDC *);
 	void        PruneDeadBadGuys(void);
-	void        DestroyHay(CLList *, CRect, CDC *, BOOL);
+	void        DestroyHay(CLList *, CRect, CDC *, bool);
 	void        DeleteSprite(CSprite *);
-	BOOL        MoveArrows(CDC *);
-	BOOL        MoveBadGuys(CDC *);
+	bool        MoveArrows(CDC *);
+	bool        MoveBadGuys(CDC *);
 	void        MoveHodj(int);
-	void        LoseLife(CDC *, BOOL);
+	void        LoseLife(CDC *, bool);
 	void        HandleError(ERROR_CODE);
 	void        KillAnimation(void);
 	void        OnSoundNotify(CSound *pSound);
 	POINT       GetLeftMostBadGuy(void);
 
-	virtual BOOL OnCommand(WPARAM, LPARAM) override;
+	virtual bool OnCommand(WPARAM, LPARAM) override;
 	void OnPaint(void);
 	void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	void OnKeyDown(unsigned int, unsigned int, unsigned int);
@@ -89,7 +89,7 @@ protected:
 	void OnTimer(uintptr);
 	void OnClose(void);
 	long OnJoyStick(unsigned int, long);
-	void OnActivate(unsigned int, CWnd *, BOOL) override;
+	void OnActivate(unsigned int, CWnd *, bool) override;
 	void OnLButtonDown(unsigned int, CPoint);
 	void OnRButtonUp(unsigned int, CPoint);
 	void OnMouseMove(unsigned int, CPoint);
@@ -148,14 +148,14 @@ protected:
 	int          m_nLevel;
 	int          m_nWave;
 	unsigned int         m_nJoyLast;
-	BOOL         m_bPause;
-	BOOL         m_bGameActive;
-	BOOL         m_bJoyActive;
-	BOOL         m_bMoveMode;
-	BOOL         m_bInMenu;
-	BOOL         m_bNewGame;
-	BOOL         m_bAnimationsOn;
-	BOOL         m_bTimerActive;
+	bool         m_bPause;
+	bool         m_bGameActive;
+	bool         m_bJoyActive;
+	bool         m_bMoveMode;
+	bool         m_bInMenu;
+	bool         m_bNewGame;
+	bool         m_bAnimationsOn;
+	bool         m_bTimerActive;
 
 
 	// User Setup variables
@@ -172,7 +172,7 @@ protected:
 //
 class CTheApp : public CWinApp {
 public:
-	BOOL InitInstance();
+	bool InitInstance();
 	virtual int ExitInstance();
 };
 
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
index 196bcd30382..de26b5319b6 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
@@ -86,13 +86,13 @@ void CUserCfgDlg::PutDlgData() {
 
 	ReleaseDC(pDC);
 
-	MFC::SetScrollPos(GetDlgItem(IDS_GAMESPEED)->m_hWnd, SB_CTL, m_nInitGameSpeed, TRUE);
-	MFC::SetScrollPos(GetDlgItem(IDS_LIVES)->m_hWnd, SB_CTL, m_nInitNumLives, TRUE);
-	MFC::SetScrollPos(GetDlgItem(IDS_ARCHER_LEVEL)->m_hWnd, SB_CTL, m_nInitArcherLevel, TRUE);
+	MFC::SetScrollPos(GetDlgItem(IDS_GAMESPEED)->m_hWnd, SB_CTL, m_nInitGameSpeed, true);
+	MFC::SetScrollPos(GetDlgItem(IDS_LIVES)->m_hWnd, SB_CTL, m_nInitNumLives, true);
+	MFC::SetScrollPos(GetDlgItem(IDS_ARCHER_LEVEL)->m_hWnd, SB_CTL, m_nInitArcherLevel, true);
 }
 
 
-BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	/*
 	* respond to user
 	*/
@@ -101,15 +101,15 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 		switch (wParam) {
 
 		case ID_OK:
-			m_bShouldSave = TRUE;
+			m_bShouldSave = true;
 			ClearDialogImage();
 			EndDialog(IDOK);
-			return FALSE;
+			return false;
 
 		case ID_CANCEL:
 			ClearDialogImage();
 			EndDialog(IDCANCEL);
-			return FALSE;
+			return false;
 
 		/*
 		* reset params to default
@@ -280,14 +280,14 @@ void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 }
 
 
-BOOL CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog(void) {
 	CRect tmpRect;
 	CDC *pDC;
 	int nVal;
 
 	CBmpDialog::OnInitDialog();
 
-	m_bShouldSave = FALSE;
+	m_bShouldSave = false;
 
 	// Get the game speed (1..10)
 	//
@@ -317,9 +317,9 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 	if (nVal < BADGUYS_MIN || nVal > BADGUYS_MAX)
 		m_nInitNumBadGuys = DEFAULT_BADGUYS;
 
-	MFC::SetScrollRange(GetDlgItem(IDS_GAMESPEED)->m_hWnd, SB_CTL, SPEED_MIN, SPEED_MAX, TRUE);
-	MFC::SetScrollRange(GetDlgItem(IDS_LIVES)->m_hWnd, SB_CTL, LIVES_MIN, LIVES_MAX, TRUE);
-	MFC::SetScrollRange(GetDlgItem(IDS_ARCHER_LEVEL)->m_hWnd, SB_CTL, LEVEL_MIN, LEVEL_MAX, TRUE);
+	MFC::SetScrollRange(GetDlgItem(IDS_GAMESPEED)->m_hWnd, SB_CTL, SPEED_MIN, SPEED_MAX, true);
+	MFC::SetScrollRange(GetDlgItem(IDS_LIVES)->m_hWnd, SB_CTL, LIVES_MIN, LIVES_MAX, true);
+	MFC::SetScrollRange(GetDlgItem(IDS_ARCHER_LEVEL)->m_hWnd, SB_CTL, LEVEL_MIN, LEVEL_MAX, true);
 
 	pDC = GetDC();
 	tmpRect.SetRect(18, 113, 65, 132);
@@ -356,7 +356,7 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 	}
 
 
-	return TRUE;
+	return true;
 }
 
 void CUserCfgDlg::OnPaint(void) {
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.h b/engines/bagel/hodjnpodj/archeroids/usercfg.h
index 6b719a66174..f802896a822 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.h
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.h
@@ -55,8 +55,8 @@ public:
 
 protected:
 
-	virtual BOOL OnCommand(WPARAM, LPARAM) override;
-	virtual BOOL OnInitDialog(void) override;
+	virtual bool OnCommand(WPARAM, LPARAM) override;
+	virtual bool OnInitDialog(void) override;
 	void PutDlgData(void);
 	void ClearDialogImage(void);
 
@@ -76,7 +76,7 @@ protected:
 	int          m_nInitArcherLevel;
 	int          m_nInitNumLives;
 	int          m_nInitNumBadGuys;
-	BOOL         m_bShouldSave;           // True if we should save theses settings
+	bool         m_bShouldSave;           // True if we should save theses settings
 };
 
 } // namespace Archeroids
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.cpp b/engines/bagel/hodjnpodj/artparts/artparts.cpp
index 997c2611ac7..75b3ee23683 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.cpp
+++ b/engines/bagel/hodjnpodj/artparts/artparts.cpp
@@ -36,7 +36,7 @@ namespace Bagel {
 namespace HodjNPodj {
 namespace ArtParts {
 
-BOOL    InArtRegion(CPoint point);
+bool    InArtRegion(CPoint point);
 CPoint  WinToArt(CPoint point);
 
 extern  HWND ghParentWnd;
@@ -52,11 +52,11 @@ int CMainWindow::m_nColumns;
 int CMainWindow::m_nWidth;
 int CMainWindow::m_nHeight;
 float CMainWindow::m_nScore;
-BOOL CMainWindow::bFramed;
+bool CMainWindow::bFramed;
 int CMainWindow::tempTime;
 int CMainWindow::tempRows;
 int CMainWindow::tempColumns;
-BOOL CMainWindow::tempFramed;
+bool CMainWindow::tempFramed;
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
@@ -109,9 +109,9 @@ CMainWindow::CMainWindow() {
 	//srand((unsigned) time(nullptr));         // seed the random number generator
 
 	InitValues();       // Set the default values of global variables
-	m_bPlaying = FALSE;
+	m_bPlaying = false;
 
-	if (LoadArtWork() == FALSE) {            // Load first artwork & display
+	if (LoadArtWork() == false) {            // Load first artwork & display
 		PostMessage(WM_CLOSE, 0, 0);
 		return;
 	}
@@ -126,7 +126,7 @@ CMainWindow::CMainWindow() {
 	ASSERT(bSuccess);
 	bSuccess = (*m_pScrollButton).LoadBitmaps(SCROLLUP, SCROLLDOWN, SCROLLUP, SCROLLUP);
 	ASSERT(bSuccess);
-	m_bIgnoreScrollClick = FALSE;
+	m_bIgnoreScrollClick = false;
 
 	// Put up something in the meantime
 	//
@@ -152,7 +152,7 @@ CMainWindow::CMainWindow() {
 	EndWaitCursor();
 
 	if (pGameInfo->bPlayingMetagame) {
-		m_bPlaying = TRUE;
+		m_bPlaying = true;
 		if (pGameInfo->bMusicEnabled) {
 			pGameSound = new CSound(this, GAME_THEME, SOUND_MIDI | SOUND_LOOP | SOUND_DONT_LOOP_TO_END);
 			if (pGameSound != nullptr) {
@@ -169,7 +169,7 @@ CMainWindow::CMainWindow() {
 		PostMessage(WM_COMMAND, IDC_SCROLL, BN_CLICKED);         // Activate the Options dialog
 	}
 
-	bStartOkay = TRUE;
+	bStartOkay = true;
 
 } //End of CMainWindow
 
@@ -185,11 +185,11 @@ void CMainWindow::initStatics() {
 	m_nHeight = ART_HEIGHT / MIN_ROWS;
 	m_nScore = 0.0;
 
-	bFramed = FALSE;
+	bFramed = false;
 	tempTime = MIN_TIME;
 	tempRows = MIN_ROWS;
 	tempColumns = MIN_COLUMNS;
-	tempFramed = TRUE;
+	tempFramed = true;
 }
 
 // OnPaint:
@@ -205,10 +205,10 @@ void CMainWindow::OnPaint() {
 	char        msg[64];
 
 	pDC = GetDC();                                                                  // Get screen DC
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);                            // Select Game Palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);                            // Select Game Palette
 	(*pDC).RealizePalette();                                                        // Use it
 
-	InvalidateRect(nullptr, FALSE);            // invalidate the entire window
+	InvalidateRect(nullptr, false);            // invalidate the entire window
 	BeginPaint(&lpPaint);
 	SplashScreen();
 
@@ -226,14 +226,14 @@ void CMainWindow::OnPaint() {
 	}
 
 	EndPaint(&lpPaint);
-	(*pDC).SelectPalette(pPalOld, FALSE);                                            // Select back old palette
+	(*pDC).SelectPalette(pPalOld, false);                                            // Select back old palette
 	ReleaseDC(pDC);                                                                 // Release the DC
 
-	if (bStartOkay && (bGameStarted == FALSE)) {
+	if (bStartOkay && (bGameStarted == false)) {
 		MSG lpmsg;
 		while (PeekMessage(&lpmsg, nullptr, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE | PM_NOYIELD)) ;
-		bGameStarted = TRUE;
-		bStartOkay = FALSE;
+		bGameStarted = true;
+		bStartOkay = false;
 	}
 }
 
@@ -267,7 +267,7 @@ void CMainWindow::SplashScratch() {
 	CPalette    *pPalOld = nullptr;                                                    // Old palette holder
 
 	pDC = GetDC();                                                                  // Get screen DC
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);                            // Select Game Palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);                            // Select Game Palette
 	(*pDC).RealizePalette();                                                        // Use it
 
 	if (bFramed) {                                                                   // In framed mode
@@ -277,7 +277,7 @@ void CMainWindow::SplashScratch() {
 
 	}                                                                                               //...on screen
 
-	(*pDC).SelectPalette(pPalOld, FALSE);                                                // Select back old palette
+	(*pDC).SelectPalette(pPalOld, false);                                                // Select back old palette
 	ReleaseDC(pDC);                                                                     // Release the DC
 
 	pScratch1DC->BitBlt(0, 0, ART_WIDTH, ART_HEIGHT, pScratch2DC, 0, 0, SRCCOPY);        // Copy New parts locations
@@ -297,7 +297,7 @@ void CMainWindow::SplashScratchPaint() {
 	             *pOldBmp = nullptr;
 
 	pDC = GetDC();
-	pOldPalScreen = (*pDC).SelectPalette(pGamePalette, FALSE);                            // Select Game Palette
+	pOldPalScreen = (*pDC).SelectPalette(pGamePalette, false);                            // Select Game Palette
 	(*pDC).RealizePalette();                                                        // Use it
 
 	if (bFramed) {
@@ -317,7 +317,7 @@ void CMainWindow::SplashScratchPaint() {
 
 		(*pSourceDoc).OpenDocument(szCurrentArt);
 
-		pOldPalSource = pSourceDC->SelectPalette(pGamePalette, FALSE);
+		pOldPalSource = pSourceDC->SelectPalette(pGamePalette, false);
 		pSourceDC->RealizePalette();
 
 		hDIB = (*pSourceDoc).GetHDIB();
@@ -357,7 +357,7 @@ void CMainWindow::SplashScratchPaint() {
 		if (pOldBmp != nullptr)                        // Get rid of Source
 			pSourceDC->SelectObject(pOldBmp);
 		if (pOldPalSource != nullptr)
-			pSourceDC->SelectPalette(pOldPalSource, FALSE);
+			pSourceDC->SelectPalette(pOldPalSource, false);
 		if (pSourceDC->m_hDC != nullptr) {
 			pSourceDC->DeleteDC();
 			delete pSourceDC;
@@ -370,7 +370,7 @@ void CMainWindow::SplashScratchPaint() {
 
 	}                                                                                               //...on screen
 
-	(*pDC).SelectPalette(pOldPalScreen, FALSE);                                                  // Select back old palette
+	(*pDC).SelectPalette(pOldPalScreen, false);                                                  // Select back old palette
 	ReleaseDC(pDC);
 
 	pScratch1DC->BitBlt(0, 0, ART_WIDTH, ART_HEIGHT, pScratch2DC, 0, 0, SRCCOPY);        // Copy New parts locations
@@ -416,7 +416,7 @@ void CMainWindow::SplashScreen() {
 // typically in order to process control related activities.
 //
 
-BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	CPalette    *pPalOld = nullptr;
 	CBrush      *pBrushOld = nullptr,
 	             *pBrushNew = nullptr;
@@ -437,32 +437,32 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 		case IDC_RULES:
 			CSound::waitWaveSounds();
 
-			m_bIgnoreScrollClick = TRUE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
+			m_bIgnoreScrollClick = true;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
 			(void) RulesDlg.DoModal();
-			m_bIgnoreScrollClick = FALSE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
+			m_bIgnoreScrollClick = false;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
 			break;
 
 		case IDC_SCROLL:
 
 			KillTimer(DISPLAY_TIMER);                                // Stop the Displayed Time timer
 			if (m_bIgnoreScrollClick) {
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 				break;
 			}
 
-			m_bIgnoreScrollClick = TRUE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
-			SendDlgItemMessage(IDC_SCROLL, BM_SETSTATE, TRUE, 0L);
-			m_bPlaying = FALSE;                                     // Not playing the game
-			bSwitched = FALSE;                                      // Prevent ability to Undo after Command is done
+			m_bIgnoreScrollClick = true;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
+			SendDlgItemMessage(IDC_SCROLL, BM_SETSTATE, true, 0L);
+			m_bPlaying = false;                                     // Not playing the game
+			bSwitched = false;                                      // Prevent ability to Undo after Command is done
 
 			CheckForWin();                                          // Get current score
 
 			if (bGameStarted) {
-				pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);    // Select in the artwork's palette
+				pPalOld = (*pDC).SelectPalette(pGamePalette, false);    // Select in the artwork's palette
 				(*pDC).RealizePalette();                                // Use it
 
 				pBrushNew = new CBrush();                               // Construct a new brush object
@@ -477,7 +477,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 					else
 						(*pDC).Rectangle(SIDE_BORDER, TOP_BORDER, GAME_WIDTH - SIDE_BORDER, GAME_HEIGHT - BOTTOM_BORDER);
 					(*pDC).SelectObject(pBrushOld);                          // Select in the old brush
-					(*pDC).SelectPalette(pPalOld, FALSE);                        // Select in the old palette
+					(*pDC).SelectPalette(pPalOld, false);                        // Select in the old palette
 					delete pBrushNew;                                           // Delete the new brush
 				}
 			} // end if bGameStarted
@@ -487,18 +487,18 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			switch (COptionsWind.DoModal()) {
 
 			case IDC_OPTIONS_NEWGAME:                           // Selected New Game
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-				m_bIgnoreScrollClick = FALSE;
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+				m_bIgnoreScrollClick = false;
 				if (!pGameInfo->bPlayingMetagame)
 					NewGame();
 				//if m_nScore == 100, randomly put it in order, so start over
-				// m_bNewGame = FALSE; PostMessage( IDC_OPTIONS_NEWGAME ...);break;
+				// m_bNewGame = false; PostMessage( IDC_OPTIONS_NEWGAME ...);break;
 				break;
 
 			case IDC_OPTIONS_RETURN:
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-				m_bIgnoreScrollClick = FALSE;
-				m_bPlaying = TRUE;
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+				m_bIgnoreScrollClick = false;
+				m_bPlaying = true;
 				if (bGameStarted && (m_nTime != (nSeconds + (nMinutes * 60)))) {     // have started
 					SetTimer(DISPLAY_TIMER, CLICK_TIME, nullptr);                   // Set timer
 				}
@@ -507,14 +507,14 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			case IDC_OPTIONS_QUIT:                      // Quit button was clicked
 				PostMessage(WM_CLOSE, 0, 0);         // and post a program exit
 				ReleaseDC(pDC);
-				return FALSE;
+				return false;
 
 			} //end switch(ComDlg.DoModal())
 
 			//
 			// Check to see if the music state was changed and adjust to match it
 			//
-			if ((pGameInfo->bMusicEnabled == FALSE) && (pGameSound != nullptr)) {
+			if ((pGameInfo->bMusicEnabled == false) && (pGameSound != nullptr)) {
 				if (pGameSound->playing())
 					pGameSound->stop();
 			} else if (pGameInfo->bMusicEnabled) {
@@ -527,15 +527,15 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 				} // end if pGameSound
 			}
 
-			(*pDC).SelectPalette(pPalOld, FALSE);
-			InvalidateRect(nullptr, FALSE);            // force a redraw of the entire window
+			(*pDC).SelectPalette(pPalOld, false);
+			InvalidateRect(nullptr, false);            // force a redraw of the entire window
 			//...and stop any other WM_PAINT messages
 		} //end switch(wParam)
 
 		ReleaseDC(pDC);
 	} // end if
 	(*this).SetFocus();                     // Reset focus back to the main window
-	return TRUE;
+	return true;
 }
 
 
@@ -573,7 +573,7 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	                  NEWGAME_LOCATION_X + NEWGAME_WIDTH,
 	                  NEWGAME_LOCATION_Y + NEWGAME_HEIGHT);
 
-	if (rectTitle.PtInRect(point) && ((pGameInfo->bPlayingMetagame == FALSE) && !m_bShowOutOfPlace)) {
+	if (rectTitle.PtInRect(point) && ((pGameInfo->bPlayingMetagame == false) && !m_bShowOutOfPlace)) {
 		NewGame();
 	} else if (bGameStarted && (m_bNewGame && !m_bShowOutOfPlace)) {
 		CDC     *pDC;
@@ -597,8 +597,8 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 			OldRect.SetRect(First.x + SIDE_BORDER, First.y + TOP_BORDER,
 			                Second.x + SIDE_BORDER, Second.y + TOP_BORDER);
 			MyFocusRect(pDC, OldRect, R2_NOT);
-			m_bFirst = TRUE;
-			bSwitched = FALSE;
+			m_bFirst = true;
+			bSwitched = false;
 			SetCapture();                               // Hog all the mouse events
 		} // end if
 		else if (m_bFirst) {                            // Selecting Second area
@@ -610,8 +610,8 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 
 			MyFocusRect(pDC, OldRect, R2_NOT);           // erase old rect
 			SwitchAreas(SrcRect, DstRect);               // Switch the two areas
-			m_bFirst = FALSE;
-			bSwitched = TRUE;
+			m_bFirst = false;
+			bSwitched = true;
 
 			if (m_nScore == 100) {                   // If the Picture is all correct:
 				KillTimer(DISPLAY_TIMER);            // Stop the Display timer
@@ -624,9 +624,9 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 				MSG lpmsg;
 				while (PeekMessage(&lpmsg, nullptr, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE | PM_NOYIELD)) ;
 				CMessageBox GameOverDlg((CWnd *)this, pGamePalette, "Game over.", "It's complete!");
-				m_bNewGame = FALSE;                 // Game over, but can still look
-				//..at the art (Playing is TRUE
-				bGameStarted = FALSE;
+				m_bNewGame = false;                 // Game over, but can still look
+				//..at the art (Playing is true
+				bGameStarted = false;
 				if (pGameInfo->bPlayingMetagame) {
 					pGameInfo->lScore = 1;
 					PostMessage(WM_CLOSE, 0, 0);         // and post a program exit
@@ -848,7 +848,7 @@ void CMainWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
 				NewRect.BottomRight().y = NewRect.TopLeft().y + OldRect.Height();
 			}
 
-			if (NewRect.EqualRect(OldRect) == FALSE) {            // if the Rectangle has changed
+			if (NewRect.EqualRect(OldRect) == false) {            // if the Rectangle has changed
 				MyFocusRect(pDC, OldRect, R2_NOT);              // Erase the old position
 				MyFocusRect(pDC, NewRect, R2_NOT);               // Draw Focus rect in new position
 				OldRect = NewRect;                              // Store the new focus rect
@@ -909,10 +909,10 @@ void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 
 			else if (bSwitched) {                        // Switch back the two areas
 				SwitchAreas(DstRect, SrcRect);
-				bSwitched = FALSE;                          // Don't allow second Undo
+				bSwitched = false;                          // Don't allow second Undo
 			}
 
-			m_bFirst = FALSE;                               // Return to beginning state
+			m_bFirst = false;                               // Return to beginning state
 			CFrameWnd ::OnRButtonDown(nFlags, point);
 			ReleaseDC(pDC);
 		}
@@ -948,8 +948,8 @@ void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
  ****************************************************************/
 void CMainWindow::OnMButtonDown(unsigned int nFlags, CPoint point) {
 	if (bGameStarted)
-		if (!m_bShowOutOfPlace && (pGameInfo->bPlayingMetagame == FALSE)) {          // Not available in meta-game
-			m_bShowOutOfPlace = TRUE;
+		if (!m_bShowOutOfPlace && (pGameInfo->bPlayingMetagame == false)) {          // Not available in meta-game
+			m_bShowOutOfPlace = true;
 			ShowOutOfPlace();                                           // Momentarily highlight out-of-place pieces
 		}
 } // end OnMButtonDown
@@ -982,8 +982,8 @@ void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned i
 	case VK_RETURN:                                         // Return key is hit
 	case VK_SPACE:                                          // Space bar is hit
 		if (bGameStarted) {
-			if (!m_bShowOutOfPlace  && (pGameInfo->bPlayingMetagame == FALSE)) {
-				m_bShowOutOfPlace = TRUE;
+			if (!m_bShowOutOfPlace  && (pGameInfo->bPlayingMetagame == false)) {
+				m_bShowOutOfPlace = true;
 				ShowOutOfPlace();                               // Momentarily highlight out-of-place pieces
 			}
 		}
@@ -1052,11 +1052,11 @@ void CMainWindow::OnTimer(uintptr nIDEvent) {
 
 		if (nMinutes == 0 && nSeconds == 0) {
 			char buf[64];
-			bGameStarted = FALSE;
+			bGameStarted = false;
 			Common::sprintf_s(buf, "Score: %.0f%% correct", m_nScore);
 			KillTimer(nIDEvent);                         // Stop the Display timer
-			m_bNewGame = FALSE;
-			m_bFirst = FALSE;
+			m_bNewGame = false;
+			m_bFirst = false;
 			if (pGameInfo->bSoundEffectsEnabled) {
 				pEffect = new CSound((CWnd *)this, LOSE_SOUND,
 				                     SOUND_WAVE | SOUND_ASYNCH |
@@ -1079,7 +1079,7 @@ void CMainWindow::OnTimer(uintptr nIDEvent) {
 	case SHOW_TIMER:
 		if (m_bShowOutOfPlace) {
 			ShowOutOfPlace();                           // Un-highlight out-of-place pieces
-			m_bShowOutOfPlace = FALSE;
+			m_bShowOutOfPlace = false;
 		}
 		KillTimer(nIDEvent);
 		break;
@@ -1254,20 +1254,20 @@ void CMainWindow::DrawPart(CPoint Src, CPoint Dst, int nWidth, int nHeight) {
 
 } //End DrawPart();
 
-BOOL CMainWindow::CopyPaletteContents(CPalette *pSource, CPalette *pDest) {
+bool CMainWindow::CopyPaletteContents(CPalette *pSource, CPalette *pDest) {
     ASSERT(pSource && pDest);
 
 	// Get the number of entries in the source palette
 	unsigned int nEntries = pSource->GetEntryCount();
 	if (nEntries == 0)
-		return FALSE;
+		return false;
 
 	// Use C++-isms to copy palette contents from src to dest
 	Graphics::Palette *src = pSource->palette();
 	Graphics::Palette *dest = pDest->palette();
 	*dest = *src;
 
-	return TRUE;
+	return true;
 }
 
 /*****************************************************************
@@ -1295,7 +1295,7 @@ BOOL CMainWindow::CopyPaletteContents(CPalette *pSource, CPalette *pDest) {
  *      none
  *
  ****************************************************************/
-BOOL CMainWindow::LoadArtWork() {
+bool CMainWindow::LoadArtWork() {
 	CRect       rcDest;                                             // Art work - frame bitmap dims
 	CRect       rcDIB;                                              // Source area for Art Work bmp
 	HDIB        hDIB;
@@ -1314,7 +1314,7 @@ BOOL CMainWindow::LoadArtWork() {
 	ifstream inFile;
 	inFile.open(DATA_FILE);                                  // open the data store
 	if (inFile.fail()) {
-		return FALSE;
+		return false;
 	}
 	inFile.getline(chNumEntries, sizeof(chNumEntries));     // read number of names in file
 	nNumEntries = atoi(chNumEntries);
@@ -1346,7 +1346,7 @@ BOOL CMainWindow::LoadArtWork() {
 	pSourceDoc = new CDibDoc();
 	ASSERT(pSourceDoc != nullptr);
 	if (pSourceDoc == nullptr) {
-		return FALSE;
+		return false;
 	}
 
 	Common::sprintf_s(bufName, ".\\art\\%s", ArtName);
@@ -1366,13 +1366,13 @@ BOOL CMainWindow::LoadArtWork() {
 	}
 	// setup new palette in scratch areas
 	if (!pOldPal1) {
-		pOldPal1 = pScratch1DC->SelectPalette(pGamePalette, FALSE);
+		pOldPal1 = pScratch1DC->SelectPalette(pGamePalette, false);
 		pScratch1DC->RealizePalette();
 
-		pOldPal2 = pScratch2DC->SelectPalette(pGamePalette, FALSE);
+		pOldPal2 = pScratch2DC->SelectPalette(pGamePalette, false);
 		pScratch2DC->RealizePalette();
 
-		pOldPal = pSourceDC->SelectPalette(pGamePalette, FALSE);
+		pOldPal = pSourceDC->SelectPalette(pGamePalette, false);
 		pSourceDC->RealizePalette();
 	}
 
@@ -1418,7 +1418,7 @@ BOOL CMainWindow::LoadArtWork() {
 	if (pOldBmp != nullptr)                        // Get rid of Source
 		pSourceDC->SelectObject(pOldBmp);
 	if (pOldPal != nullptr)
-		pSourceDC->SelectPalette(pOldPal, FALSE);
+		pSourceDC->SelectPalette(pOldPal, false);
 	if (pSourceDC->m_hDC != nullptr) {
 		pSourceDC->DeleteDC();
 		delete pSourceDC;
@@ -1432,20 +1432,20 @@ BOOL CMainWindow::LoadArtWork() {
 
 	POINT ScrOne, ScrTwo;
 	int r, c;
-	int x, y;
-	BOOL bCheckGrid[MAX_COLUMNS][MAX_ROWS] = {{0}};   // Initialize all to zero
-	BOOL bAssigning;                                // Flag for random assignment
+	int x = 0, y = 0;
+	bool bCheckGrid[MAX_COLUMNS][MAX_ROWS] = {{0}};   // Initialize all to zero
+	bool bAssigning;                                // Flag for random assignment
 	for (c = 0; c < m_nColumns; c++) {               // Each step in X
 		for (r = 0; r < m_nRows; r++) {              // Each step in Y
 			ScrTwo.x = c * m_nWidth;
 			ScrTwo.y = r * m_nHeight;
-			bAssigning = TRUE;
+			bAssigning = true;
 			while (bAssigning) {
 				x = brand() % m_nColumns;           // 0 thru m_nColumns - 1
 				y = brand() % m_nRows;              // 0 thru m_nRows - 1
 				bAssigning = bCheckGrid[x][y];
 			}
-			bCheckGrid[x][y] = TRUE;
+			bCheckGrid[x][y] = true;
 			Grid[c][r].x = x;                   // The r & c home of the art in
 			// this spot.
 			Grid[c][r].y = y;
@@ -1455,7 +1455,7 @@ BOOL CMainWindow::LoadArtWork() {
 		} //end for r
 	} //end for r
 
-	return TRUE;
+	return true;
 
 } // end LoadArtWork()
 
@@ -1485,11 +1485,11 @@ BOOL CMainWindow::LoadArtWork() {
  *
  ****************************************************************/
 void CMainWindow::InitValues() {
-	m_bPlaying = TRUE;              // Start out playing
-	m_bNewGame = TRUE;              //...a new puzzle with
-	m_bFirst = FALSE;               //...minimum everything:
-	bSwitched = FALSE;
-	bFramed = TRUE;
+	m_bPlaying = true;              // Start out playing
+	m_bNewGame = true;              //...a new puzzle with
+	m_bFirst = false;               //...minimum everything:
+	bSwitched = false;
+	bFramed = true;
 
 	if (pGameInfo->bPlayingMetagame) {
 		pGameInfo->lScore = 0L;
@@ -1542,7 +1542,7 @@ void CMainWindow::NewGame() {
 	m_nRows = tempRows;             //...new rows, and cols
 	m_nColumns = tempColumns;
 	bFramed = tempFramed;
-	bSwitched = FALSE;                      // Don't allow second Undo
+	bSwitched = false;                      // Don't allow second Undo
 
 	m_nWidth = ART_WIDTH / m_nColumns;
 	m_nHeight = ART_HEIGHT / m_nRows;
@@ -1551,7 +1551,7 @@ void CMainWindow::NewGame() {
 
 	pDC = GetDC();
 
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);            // Select in the artwork's palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);            // Select in the artwork's palette
 	(*pDC).RealizePalette();                                        // Use it
 
 	PaintBitmap(pDC, pGamePalette, pLocaleBitmap, TIME_LOCATION_X, TIME_LOCATION_Y);
@@ -1568,13 +1568,13 @@ void CMainWindow::NewGame() {
 		else
 			(*pDC).Rectangle(SIDE_BORDER, TOP_BORDER, GAME_WIDTH - SIDE_BORDER, GAME_HEIGHT - BOTTOM_BORDER);
 		(*pDC).SelectObject(pBrushOld);                          // Select in the old brush
-		(*pDC).SelectPalette(pPalOld, FALSE);                        // Select in the old palette
+		(*pDC).SelectPalette(pPalOld, false);                        // Select in the old palette
 		delete pBrushNew;                                           // Delete the new brush
 	}
-	m_bNewGame = TRUE;
-	m_bPlaying = TRUE;
+	m_bNewGame = true;
+	m_bPlaying = true;
 
-	if (LoadArtWork() == FALSE) {                                    // Load artwork to Scratch1
+	if (LoadArtWork() == false) {                                    // Load artwork to Scratch1
 		PostMessage(WM_CLOSE, 0, 0);
 		return;
 	}
@@ -1591,15 +1591,15 @@ void CMainWindow::NewGame() {
 
 	EndWaitCursor();
 
-	(*pDC).SelectPalette(pPalOld, FALSE);
+	(*pDC).SelectPalette(pPalOld, false);
 	ReleaseDC(pDC);
 
-	InvalidateRect(nullptr, FALSE);                                     // force a redraw of the entire window
+	InvalidateRect(nullptr, false);                                     // force a redraw of the entire window
 
 	MSG lpmsg;
 	while (PeekMessage(&lpmsg, nullptr, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE | PM_NOYIELD)) ;
 
-	bStartOkay = TRUE;
+	bStartOkay = true;
 }
 
 /*****************************************************************
@@ -1624,15 +1624,15 @@ void CMainWindow::NewGame() {
  *
  *  RETURN VALUE:
  *
- *      BOOL:   TRUE if point is within the Art Region,
- *              FALSE if point is outside the Art Region
+ *      bool:   true if point is within the Art Region,
+ *              false if point is outside the Art Region
  *
  ****************************************************************/
-BOOL InArtRegion(CPoint point) {
+bool InArtRegion(CPoint point) {
 	if ((point.x > SIDE_BORDER && point.x < GAME_WIDTH - SIDE_BORDER) &&          // See if point lies within
 	        (point.y > TOP_BORDER && point.y < GAME_HEIGHT - BOTTOM_BORDER))        //...ArtWork area
-		return TRUE;                                                            // Return true if it's inside
-	else return FALSE;                                                          //...and false if not
+		return true;                                                            // Return true if it's inside
+	else return false;                                                          //...and false if not
 }
 
 /******************************************************************************
@@ -1735,7 +1735,7 @@ void CMainWindow::MyFocusRect(CDC *pDC, CRect rect, int nDrawMode) {
 	pMyBrush->CreateBrushIndirect(&lb);              // Create a new brush
 	pMyPen->CreatePen(PS_INSIDEFRAME, HILITE_BORDER, RGB(255, 255, 255));    // Create a new pen
 
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);     // Select in game palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);     // Select in game palette
 	(*pDC).RealizePalette();                                // Use it
 	pOldPen = pDC->SelectObject(pMyPen);         // Select the new pen & save old
 	pOldBrush = pDC->SelectObject(pMyBrush);     // Select the new brush & save old
@@ -1744,7 +1744,7 @@ void CMainWindow::MyFocusRect(CDC *pDC, CRect rect, int nDrawMode) {
 	pDC->SelectObject(pOldPen);                  // Select the old pen
 	pDC->SelectObject(pOldBrush);                // Select the old brush
 	pDC->SetROP2(OldDrawMode);                   // Set pen mode back to old state
-	(*pDC).SelectPalette(pPalOld, FALSE);           // Select back the old palette
+	(*pDC).SelectPalette(pPalOld, false);           // Select back the old palette
 
 	if (pMyBrush != nullptr) {                         // If the brush was constructed, delete it
 		pMyBrush->DeleteObject();
@@ -1844,7 +1844,7 @@ void CMainWindow::OnClose() {
 	if (pOldBmp1 != nullptr)                   // Get rid of Scratch1
 		pScratch1DC->SelectObject(pOldBmp1);
 	if (pOldPal1 != nullptr)
-		pScratch1DC->SelectPalette(pOldPal1, FALSE);
+		pScratch1DC->SelectPalette(pOldPal1, false);
 	if (pScratch1DC->m_hDC != nullptr) {
 		pScratch1DC->DeleteDC();
 		delete pScratch1DC;
@@ -1856,7 +1856,7 @@ void CMainWindow::OnClose() {
 	if (pOldBmp2 != nullptr)                   // Get rid of Scratch2
 		pScratch2DC->SelectObject(pOldBmp2);
 	if (pOldPal2 != nullptr)
-		pScratch2DC->SelectPalette(pOldPal2, FALSE);
+		pScratch2DC->SelectPalette(pOldPal2, false);
 	if (pScratch2DC->m_hDC != nullptr) {
 		pScratch2DC->DeleteDC();
 		delete pScratch2DC;
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.h b/engines/bagel/hodjnpodj/artparts/artparts.h
index 494e34c1976..2f0b22b3ce4 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.h
+++ b/engines/bagel/hodjnpodj/artparts/artparts.h
@@ -104,7 +104,7 @@ namespace ArtParts {
 class CMainWindow : public CFrameWnd {
 public:
 	CMainWindow();
-	BOOL LoadArtWork();
+	bool LoadArtWork();
 	void DrawPart(CPoint Src, CPoint Dst, int nWidth, int nHeight);
 	void SwitchAreas(CRect Src, CRect Dst);
 	void InitValues();
@@ -113,9 +113,9 @@ public:
 	void ShowOutOfPlace();
 
 //added data members:
-	BOOL m_bPlaying;            // Flag True if playing, False if setting options
-	BOOL m_bNewGame;            // Flag to check if a new game is being played
-	BOOL m_bFirst;              // Flag to check if the first area is being selected
+	bool m_bPlaying;            // Flag True if playing, False if setting options
+	bool m_bNewGame;            // Flag to check if a new game is being played
+	bool m_bFirst;              // Flag to check if the first area is being selected
 	CPoint First;
 	CPoint Second;
 	CPoint Center;
@@ -146,12 +146,12 @@ private:
 	CBitmap *pLocaleBitmap = nullptr,          // Locale of game bitmap for title bar
 		*pBlankBitmap = nullptr;           // Blank area of locale for time display
 
-	BOOL bStartOkay = TRUE;
-	BOOL bGameStarted = FALSE;		// becomes TRUE at start time, FALSE at game end
-	BOOL bSwitched = FALSE;			// flag for undo -- only true after a part switch
-	BOOL bSuccess;
-	BOOL m_bIgnoreScrollClick;
-	BOOL m_bShowOutOfPlace = FALSE;
+	bool bStartOkay = true;
+	bool bGameStarted = false;		// becomes true at start time, false at game end
+	bool bSwitched = false;			// flag for undo -- only true after a part switch
+	bool bSuccess;
+	bool m_bIgnoreScrollClick;
+	bool m_bShowOutOfPlace = false;
 	char szCurrentArt[64];
 
 	static CPalette *pGamePalette;	// Palette of current artwork
@@ -164,24 +164,24 @@ private:
 	static int m_nWidth;			// The Width of each Part
 	static int m_nHeight;			// The Height of each Part
 	static float m_nScore;			// The current percentage of correctly placed parts
-	static BOOL bFramed;			// Framed (hint) mode is turned off by default
+	static bool bFramed;			// Framed (hint) mode is turned off by default
 
 	static int tempTime;			// temporary holding places
 	static int tempRows;			//...for options changes,
 	static int tempColumns;			//...which only get used
-	static BOOL tempFramed;			//...when NewGame is called.
+	static bool tempFramed;			//...when NewGame is called.
 
 	CSound *pGameSound = nullptr;	// Game theme song
 
 private:
 	void initStatics();
 	void OnSoundNotify(CSound *pSound);
-	static BOOL CopyPaletteContents(CPalette *pSource, CPalette *pDest);
+	static bool CopyPaletteContents(CPalette *pSource, CPalette *pDest);
 	void MyFocusRect(CDC *pDC, CRect rect, int nDrawMode);
 	static void GetSubOptions(CWnd *pParentWind);
 
 protected:
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
diff --git a/engines/bagel/hodjnpodj/artparts/optndlg.cpp b/engines/bagel/hodjnpodj/artparts/optndlg.cpp
index dcecbfaa344..c51539fa76b 100644
--- a/engines/bagel/hodjnpodj/artparts/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/artparts/optndlg.cpp
@@ -59,7 +59,7 @@ COptnDlg::COptnDlg(CWnd* pParent, CPalette* pPalette)
 	m_nNumParts = m_nColumns * m_nRows;
 	nCFacs = 14;
 	nRFacs = 11;
-	m_bFramed = FALSE;
+	m_bFramed = false;
 	pSubOptionsPalette = pPalette;
 	//}}AFX_DATA_INIT
 }
@@ -110,7 +110,7 @@ int COptnDlg::OnCreate(LPCREATESTRUCT lpCreateStruct) {
 	return 0;
 }
 
-BOOL COptnDlg::OnInitDialog() {
+bool COptnDlg::OnInitDialog() {
 	CBmpDialog::OnInitDialog();
 	int i;
 
@@ -132,7 +132,7 @@ BOOL COptnDlg::OnInitDialog() {
 	m_ScrollColumns.SetScrollRange(0, nCFacs - 1, 0);   // Array starts at zero, so
 	for (i = 0; i < nCFacs; i++) {
 		if (m_nColumnFactors[i] == m_nColumns)
-			m_ScrollColumns.SetScrollPos(i, TRUE);
+			m_ScrollColumns.SetScrollPos(i, true);
 	}
 
 	statRect.SetRect(LEFT_SIDE, 99, LEFT_SIDE + 100, 114);
@@ -143,7 +143,7 @@ BOOL COptnDlg::OnInitDialog() {
 	m_ScrollRows.SetScrollRange(0, nRFacs - 1, 0);       //...last element is Max - 1
 	for (i = 0; i < nRFacs; i++) {
 		if (m_nRowFactors[i] == m_nRows)
-			m_ScrollRows.SetScrollPos(i, TRUE);
+			m_ScrollRows.SetScrollPos(i, true);
 	}
 
 	m_nNumParts = m_nColumns * m_nRows;
@@ -157,7 +157,7 @@ BOOL COptnDlg::OnInitDialog() {
 	if (m_nTime == 0) m_nTime = m_nTimeScale[TIMER_MAX - 1];
 	for (i = 0; i < TIMER_MAX; i++) {
 		if (m_nTimeScale[i] == m_nTime)
-			m_ScrollTime.SetScrollPos(i, TRUE);
+			m_ScrollTime.SetScrollPos(i, true);
 	}
 
 	ReleaseDC(pDC);
@@ -180,12 +180,12 @@ BOOL COptnDlg::OnInitDialog() {
 	}
 	((CWnd *)this)->CheckDlgButton(IDC_FRAMED, m_bFramed);           // Set the frame option box
 
-	return TRUE;  // return TRUE  unless you set the focus to a control
+	return true;  // return true  unless you set the focus to a control
 }
 
 
-BOOL COptnDlg::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;
+bool COptnDlg::OnEraseBkgnd(CDC *pDC) {
+	return true;
 }
 
 void COptnDlg::OnDestroy(void) {
@@ -226,7 +226,7 @@ void COptnDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pS
 	if (NewPos > pMax) NewPos = pMax;
 
 	if (NewPos != OldPos) {                              //To prevent "flicker"
-		(*pScrollBar).SetScrollPos(NewPos, TRUE);        //...only update when
+		(*pScrollBar).SetScrollPos(NewPos, true);        //...only update when
 	}                                                   //...changed
 
 	UpdateScrollbars();
diff --git a/engines/bagel/hodjnpodj/artparts/optndlg.h b/engines/bagel/hodjnpodj/artparts/optndlg.h
index 92306b67488..5a6e570eb1c 100644
--- a/engines/bagel/hodjnpodj/artparts/optndlg.h
+++ b/engines/bagel/hodjnpodj/artparts/optndlg.h
@@ -49,7 +49,7 @@ public:
 	int m_nMins;
 	int m_nSecs;
 	float   m_nScore;
-	BOOL    m_bFramed;
+	bool    m_bFramed;
 	int m_nNumParts;
 
 	int nCFacs;
@@ -69,10 +69,10 @@ protected:
 
 	// Generated message map functions
 	//{{AFX_MSG(COptnDlg)
-	virtual BOOL OnInitDialog() override;
+	virtual bool OnInitDialog() override;
 	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
+	afx_msg bool OnEraseBkgnd(CDC *pDC);
 	virtual void OnOK() override;
 	virtual void OnCancel() override;
 	afx_msg void OnPaint();
diff --git a/engines/bagel/hodjnpodj/barbershop/animate.cpp b/engines/bagel/hodjnpodj/barbershop/animate.cpp
index 1223f7b458d..f30a940e478 100644
--- a/engines/bagel/hodjnpodj/barbershop/animate.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/animate.cpp
@@ -51,21 +51,21 @@ CAnimate::CAnimate(CSound *pSound) {
 CAnimate::~CAnimate() {
 } // ~CAnimate
 
-BOOL CAnimate::Clown(CDC *pDC, CPoint point) {
-	BOOL    bSuccess;
+bool CAnimate::Clown(CDC *pDC, CPoint point) {
+	bool    bSuccess;
 	int     i;
 
-	if (m_cClownRect.PtInRect(point) == FALSE)
-		return FALSE;
+	if (m_cClownRect.PtInRect(point) == false)
+		return false;
 
 	m_pSprite = new CSprite;
 	(*m_pSprite).SharePalette(pGamePalette);
 	bSuccess = (*m_pSprite).LoadCels(pDC, CLOWN_BMP, CLOWN_FRAMES);
 	ASSERT(bSuccess);
-	(*m_pSprite).SetMasked(FALSE);
-	(*m_pSprite).SetMobile(FALSE);
+	(*m_pSprite).SetMasked(false);
+	(*m_pSprite).SetMobile(false);
 
-	if (pGameParams->bSoundEffectsEnabled != FALSE) {
+	if (pGameParams->bSoundEffectsEnabled != false) {
 		m_pSound->initialize(
 		    CLOWN_WAV,
 		    SOUND_WAVE | SOUND_ASYNCH | SOUND_QUEUE
@@ -73,7 +73,7 @@ BOOL CAnimate::Clown(CDC *pDC, CPoint point) {
 		m_pSound->play();
 	} // end if
 
-	if (bSuccess == TRUE) {
+	if (bSuccess == true) {
 		(*m_pSprite).SetCel(CLOWN_FRAMES);
 		for (i = 0; i < CLOWN_FRAMES - 1; i++) {
 			(*m_pSprite).PaintSprite(
@@ -90,24 +90,24 @@ BOOL CAnimate::Clown(CDC *pDC, CPoint point) {
 		m_pSprite = nullptr;
 	} // end if
 
-	return TRUE;
+	return true;
 } // clown
 
-BOOL CAnimate::UFO(CDC *pDC, CPoint point) {
-	BOOL    bSuccess;
+bool CAnimate::UFO(CDC *pDC, CPoint point) {
+	bool    bSuccess;
 	int     i;
 
-	if (m_cCarRect.PtInRect(point) == FALSE)
-		return FALSE;
+	if (m_cCarRect.PtInRect(point) == false)
+		return false;
 
 	m_pSprite = new CSprite;
 	(*m_pSprite).SharePalette(pGamePalette);
 	bSuccess = (*m_pSprite).LoadCels(pDC, UFOA_BMP, UFOA_FRAMES);
 	ASSERT(bSuccess);
-	(*m_pSprite).SetMasked(FALSE);
-	(*m_pSprite).SetMobile(FALSE);
+	(*m_pSprite).SetMasked(false);
+	(*m_pSprite).SetMobile(false);
 
-	if (pGameParams->bSoundEffectsEnabled != FALSE) {
+	if (pGameParams->bSoundEffectsEnabled != false) {
 		m_pSound->initialize(
 		    SPACESHIP_WAV,
 		    SOUND_WAVE | SOUND_ASYNCH | SOUND_QUEUE
@@ -115,7 +115,7 @@ BOOL CAnimate::UFO(CDC *pDC, CPoint point) {
 		m_pSound->play();
 	} // end if
 
-	if (bSuccess == TRUE) {
+	if (bSuccess == true) {
 		int j;
 		(*m_pSprite).SetCel(UFOA_FRAMES);
 
@@ -127,7 +127,7 @@ BOOL CAnimate::UFO(CDC *pDC, CPoint point) {
 			Sleep(UFOA_TIME_SLICE);
 		} // end for
 
-		if (pGameParams->bSoundEffectsEnabled != FALSE) {
+		if (pGameParams->bSoundEffectsEnabled != false) {
 			m_pSound->initialize(
 			    SPACERAY_WAV,
 			    SOUND_WAVE
@@ -154,10 +154,10 @@ BOOL CAnimate::UFO(CDC *pDC, CPoint point) {
 
 	bSuccess = (*m_pSprite).LoadCels(pDC, UFOB_BMP, UFOB_FRAMES);
 	ASSERT(bSuccess);
-	(*m_pSprite).SetMasked(FALSE);
-	(*m_pSprite).SetMobile(FALSE);
+	(*m_pSprite).SetMasked(false);
+	(*m_pSprite).SetMobile(false);
 
-	if (pGameParams->bSoundEffectsEnabled != FALSE) {
+	if (pGameParams->bSoundEffectsEnabled != false) {
 		m_pSound->initialize(
 		    SPACESHIP_WAV,
 		    SOUND_WAVE | SOUND_ASYNCH | SOUND_QUEUE
@@ -165,7 +165,7 @@ BOOL CAnimate::UFO(CDC *pDC, CPoint point) {
 		m_pSound->play();
 	} // end if
 
-	if (bSuccess == TRUE) {
+	if (bSuccess == true) {
 		int j;
 		(*m_pSprite).SetCel(UFOB_FRAMES);
 
@@ -177,7 +177,7 @@ BOOL CAnimate::UFO(CDC *pDC, CPoint point) {
 			Sleep(UFOB_TIME_SLICE);
 		} // end for
 
-		if (pGameParams->bSoundEffectsEnabled != FALSE) {
+		if (pGameParams->bSoundEffectsEnabled != false) {
 			m_pSound->initialize(  // play synchronous beam up sound
 			    SPACERAY_WAV,
 			    SOUND_WAVE
@@ -206,14 +206,14 @@ BOOL CAnimate::UFO(CDC *pDC, CPoint point) {
 		m_pSprite = nullptr;
 	} // end if
 
-	return TRUE;
+	return true;
 } // UFO
 
-BOOL CAnimate::Brat(CPoint point) {
-	if (m_cBratRect.PtInRect(point) == FALSE)
-		return FALSE;
+bool CAnimate::Brat(CPoint point) {
+	if (m_cBratRect.PtInRect(point) == false)
+		return false;
 
-	if (pGameParams->bSoundEffectsEnabled != FALSE) {
+	if (pGameParams->bSoundEffectsEnabled != false) {
 		m_pSound->initialize(
 		    BRAT_WAV,
 		    SOUND_WAVE | SOUND_ASYNCH | SOUND_QUEUE
@@ -221,15 +221,15 @@ BOOL CAnimate::Brat(CPoint point) {
 		m_pSound->play();
 	}  // end if
 
-	return TRUE;
+	return true;
 } // Brat
 
-BOOL CAnimate::Lollipop(CPoint point) {
-	if (m_cLolliRect.PtInRect(point) == FALSE)
-		return FALSE;
+bool CAnimate::Lollipop(CPoint point) {
+	if (m_cLolliRect.PtInRect(point) == false)
+		return false;
 
-	if (pGameParams->bSoundEffectsEnabled == FALSE)
-		return TRUE;
+	if (pGameParams->bSoundEffectsEnabled == false)
+		return true;
 
 	if ((brand() % 2) == 0) {        // randomly chose sound wave to play
 		m_pSound->initialize(
@@ -244,15 +244,15 @@ BOOL CAnimate::Lollipop(CPoint point) {
 	} // end if
 
 	m_pSound->play();
-	return TRUE;
+	return true;
 } // Lollipop
 
-BOOL CAnimate::Haircut(CPoint point) {
-	if (m_cCutRect.PtInRect(point) == FALSE)
-		return FALSE;
+bool CAnimate::Haircut(CPoint point) {
+	if (m_cCutRect.PtInRect(point) == false)
+		return false;
 
-	if (pGameParams->bSoundEffectsEnabled == FALSE)
-		return TRUE;
+	if (pGameParams->bSoundEffectsEnabled == false)
+		return true;
 
 	m_pSound->initialize(
 	    CUT_WAV,
@@ -260,7 +260,7 @@ BOOL CAnimate::Haircut(CPoint point) {
 	);
 
 	m_pSound->play();
-	return TRUE;
+	return true;
 } // Haircut
 
 } // namespace Barbershop
diff --git a/engines/bagel/hodjnpodj/barbershop/animate.h b/engines/bagel/hodjnpodj/barbershop/animate.h
index 70590f75aa2..5898a03589f 100644
--- a/engines/bagel/hodjnpodj/barbershop/animate.h
+++ b/engines/bagel/hodjnpodj/barbershop/animate.h
@@ -121,11 +121,11 @@ public:     // functions
 	CAnimate(CSound*);
 	~CAnimate();
 
-	BOOL    Clown(CDC*, CPoint);
-	BOOL    UFO(CDC*, CPoint);
-	BOOL    Brat(CPoint);
-	BOOL    Lollipop(CPoint);
-	BOOL    Haircut(CPoint);
+	bool    Clown(CDC*, CPoint);
+	bool    UFO(CDC*, CPoint);
+	bool    Brat(CPoint);
+	bool    Lollipop(CPoint);
+	bool    Haircut(CPoint);
 };
 
 } // namespace Barbershop
diff --git a/engines/bagel/hodjnpodj/barbershop/barb.cpp b/engines/bagel/hodjnpodj/barbershop/barb.cpp
index ddc27726b41..dc8f527a988 100644
--- a/engines/bagel/hodjnpodj/barbershop/barb.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/barb.cpp
@@ -63,8 +63,8 @@ CBarber::CBarber(CDC *pDC, CSound *pSound) {
 	* Switchs used to prevent further user updates          *
 	* after timer has run out, no moves left, or is solved. *
 	********************************************************/
-	m_bIsGameOver   = FALSE;        // Initialize solved switch
-	m_bIsWin        = FALSE;        // Initialize win/lose switch
+	m_bIsGameOver   = false;        // Initialize solved switch
+	m_bIsWin        = false;        // Initialize win/lose switch
 }
 
 /*****************************************************************
@@ -140,7 +140,7 @@ void CBarber::NewGame(CDC *pDC) {
 	m_cDck->Deal(m_cBrd);
 	m_cPnt->Board(pDC, m_cBrd);     // paint the cards visually on the board
 	m_pUndo->Reset();               // clear all undo info
-	m_bIsGameOver = FALSE;          // turn off game over switch
+	m_bIsGameOver = false;          // turn off game over switch
 }
 
 /*****************************************************************
@@ -195,31 +195,31 @@ void CBarber::OnLButtonDown(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 	int     i;                  // index
 
 	if (              // user want to undo a change?
-	    m_pUndo->m_cUndoRect.PtInRect(point) == TRUE &&
+	    m_pUndo->m_cUndoRect.PtInRect(point) == true &&
 	    m_pCrd == nullptr
 	) {
 		pDC = pWnd->GetDC();
 
-		if (pGameParams->bSoundEffectsEnabled != FALSE)
+		if (pGameParams->bSoundEffectsEnabled != false)
 			m_pSound->initialize(
 			    UNDO,
 			    SOUND_WAVE | SOUND_ASYNCH
 			);
 
-		if (m_pUndo->Undo(pDC, m_cBrd, m_cPnt) == TRUE) {    // undo successful?
-			if (pGameParams->bSoundEffectsEnabled != FALSE)
+		if (m_pUndo->Undo(pDC, m_cBrd, m_cPnt) == true) {    // undo successful?
+			if (pGameParams->bSoundEffectsEnabled != false)
 				m_pSound->play();
 
 			// undoing does not always guarantee there is a move left,
 			// but it is okay to reset game over switch anyway.
 			//
-			m_bIsGameOver = FALSE;                          // yes - undo successful.
+			m_bIsGameOver = false;                          // yes - undo successful.
 		} // end if
 		pWnd->ReleaseDC(pDC);
 		return;
 	} // end if
 
-	if (m_bIsGameOver == TRUE)
+	if (m_bIsGameOver == true)
 		return;
 
 	if ((m_pCrd = m_cPnt->IsOnCard(point)) == nullptr) {    // get card corr to point
@@ -229,27 +229,27 @@ void CBarber::OnLButtonDown(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 		* are cards on the used stack.                          *
 		********************************************************/
 		if (
-		    m_cBrd->GetStack((loc) stock)->m_cRect.PtInRect(point) == TRUE &&
-		    m_cBrd->GetStack((loc) stock)->IsEmpty() == TRUE
+		    m_cBrd->GetStack((loc) stock)->m_cRect.PtInRect(point) == true &&
+		    m_cBrd->GetStack((loc) stock)->IsEmpty() == true
 		) {
 			int nFlipSnd = 0;                                       // keeps track of when to play fwap sound
 			pDC = pWnd->GetDC();
 
 			// user wants to recycle used stack
 			//
-			if (pGameParams->bSoundEffectsEnabled != FALSE)          // init sound if it is enabled
+			if (pGameParams->bSoundEffectsEnabled != false)          // init sound if it is enabled
 				m_pSound->initialize(
 				    STOCKCARDS,
 				    SOUND_WAVE | SOUND_ASYNCH | SOUND_QUEUE
 				);
 
-			while (m_cBrd->GetStack((loc) used)->IsEmpty() != TRUE) {
+			while (m_cBrd->GetStack((loc) used)->IsEmpty() != true) {
 				pCard = m_cBrd->GetStack((loc) used)->Pop();        // take top card off used stack
 				m_cBrd->GetStack((loc) stock)->Push(pCard);         // put it on stock stack
 
 				// sound (if enabled)
 				if (
-				    pGameParams->bSoundEffectsEnabled != FALSE &&
+				    pGameParams->bSoundEffectsEnabled != false &&
 				    nFlipSnd % RECYCLE_SOUND_FREQ == 0
 				)
 					m_pSound->play();                                   // make flap sound...
@@ -296,7 +296,7 @@ void CBarber::OnLButtonDown(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 		pUsed   = m_cBrd->GetStack(used);       // get used stack too.
 
 		// sound (if enabled)
-		if (pGameParams->bSoundEffectsEnabled != FALSE) {
+		if (pGameParams->bSoundEffectsEnabled != false) {
 			m_pSound->initialize(
 			    STOCKCARDS,
 			    SOUND_WAVE | SOUND_ASYNCH | SOUND_QUEUE
@@ -320,7 +320,7 @@ void CBarber::OnLButtonDown(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 
 		pWnd->ReleaseDC(pDC);
 
-		if (pStock->IsEmpty() == TRUE)               // game over?
+		if (pStock->IsEmpty() == true)               // game over?
 			IsGameOver(pWnd);
 
 		m_pUndo->Record(i);                             // note stack flip for possible undoing
@@ -332,7 +332,7 @@ void CBarber::OnLButtonDown(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 		return; // have fun with these! (no special function)
 
 	default:    // tab stack
-		if (m_pCrd->m_bIsBack == TRUE) {         // want to flip over card?
+		if (m_pCrd->m_bIsBack == true) {         // want to flip over card?
 			pDC = pWnd->GetDC();                // yes
 			m_cPnt->FlipCard(pDC, m_pCrd);      // flip card
 			m_cPnt->UpdateCard(pDC, m_pCrd);    // paint it
@@ -377,27 +377,27 @@ void CBarber::OnLButtonDblClk(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 	int     i;
 
 	if (             // user want to undo a change?
-	    m_pUndo->m_cUndoRect.PtInRect(point) == TRUE &&
+	    m_pUndo->m_cUndoRect.PtInRect(point) == true &&
 	    m_pCrd == nullptr
 	) {
 		pDC = pWnd->GetDC();
-		if (pGameParams->bSoundEffectsEnabled != FALSE)
+		if (pGameParams->bSoundEffectsEnabled != false)
 			m_pSound->initialize(
 			    UNDO,
 			    SOUND_WAVE | SOUND_QUEUE
 			);
 
-		if (m_pUndo->Undo(pDC, m_cBrd, m_cPnt) == TRUE) {    // undo successful?
-			if (pGameParams->bSoundEffectsEnabled != FALSE)
+		if (m_pUndo->Undo(pDC, m_cBrd, m_cPnt) == true) {    // undo successful?
+			if (pGameParams->bSoundEffectsEnabled != false)
 				m_pSound->play();
 
-			m_bIsGameOver = FALSE;                          // yes
+			m_bIsGameOver = false;                          // yes
 		}
 		pWnd->ReleaseDC(pDC);
 		return;
 	} // end if
 
-	if (m_bIsGameOver == TRUE)
+	if (m_bIsGameOver == true)
 		return;
 
 	if ((m_pCrd = m_cPnt->IsOnCard(point)) == nullptr) {    // get card corr to point
@@ -407,27 +407,27 @@ void CBarber::OnLButtonDblClk(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 		* are cards on the used stack.                          *
 		********************************************************/
 		if (
-		    m_cBrd->GetStack((loc) stock)->m_cRect.PtInRect(point) == TRUE  &&
-		    m_cBrd->GetStack((loc) stock)->IsEmpty() == TRUE
+		    m_cBrd->GetStack((loc) stock)->m_cRect.PtInRect(point) == true  &&
+		    m_cBrd->GetStack((loc) stock)->IsEmpty() == true
 		) {
 			int nFlipSnd = 0;                                       // keeps track of when to play fwap sound
 
 			// user wants to recycle used stack
 			//
-			if (pGameParams->bSoundEffectsEnabled != FALSE)          // init sound if it is enabled
+			if (pGameParams->bSoundEffectsEnabled != false)          // init sound if it is enabled
 				m_pSound->initialize(
 				    STOCKCARDS,
 				    SOUND_WAVE | SOUND_ASYNCH | SOUND_QUEUE
 				);
 
 			pDC = pWnd->GetDC();
-			while (m_cBrd->GetStack((loc) used)->IsEmpty() != TRUE) {
+			while (m_cBrd->GetStack((loc) used)->IsEmpty() != true) {
 				pCard = m_cBrd->GetStack((loc) used)->Pop();        // get used card
 				m_cBrd->GetStack((loc) stock)->Push(pCard);         // put used card onto stock
 
 				// sound (if enabled)
 				if (            // play fwap sound...
-				    pGameParams->bSoundEffectsEnabled != FALSE &&   // every RECYCLE_'_FREQ card
+				    pGameParams->bSoundEffectsEnabled != false &&   // every RECYCLE_'_FREQ card
 				    nFlipSnd % RECYCLE_SOUND_FREQ == 0
 				)
 					m_pSound->play();                                   // make flap sound...
@@ -475,7 +475,7 @@ void CBarber::OnLButtonDblClk(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 		pUsed   = m_cBrd->GetStack(used);
 
 		// sound (if enabled)
-		if (pGameParams->bSoundEffectsEnabled != FALSE) {
+		if (pGameParams->bSoundEffectsEnabled != false) {
 			m_pSound->initialize(
 			    STOCKCARDS,
 			    SOUND_WAVE | SOUND_ASYNCH | SOUND_QUEUE
@@ -494,7 +494,7 @@ void CBarber::OnLButtonDblClk(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 			pWnd->ReleaseDC(pDC);
 		} // end for
 
-		if (pStock->IsEmpty() == TRUE)
+		if (pStock->IsEmpty() == true)
 			IsGameOver(pWnd);
 
 		m_pUndo->Record(i);     // note stack flip for possible undoing
@@ -503,7 +503,7 @@ void CBarber::OnLButtonDblClk(CWnd *pWnd, CPalette *pPalette, CPoint point) {
 	} // end case
 
 	default:    // tab stacks
-		if (m_pCrd->m_bIsBack == TRUE) {         // user want to flip a card?
+		if (m_pCrd->m_bIsBack == true) {         // user want to flip a card?
 			pDC = pWnd->GetDC();
 			m_cPnt->FlipCard(pDC, m_pCrd);
 			m_cPnt->UpdateCard(pDC, m_pCrd);
@@ -570,7 +570,7 @@ void CBarber::OnMouseMove(CDC *pDC, CPoint point) {
  ****************************************************************/
 void CBarber::OnLButtonUp(CWnd *pWnd) {
 	CDC     *pDC = nullptr;
-	BOOL    bSuccess = FALSE;
+	bool    bSuccess = false;
 	CRect   cTest;
 	CStack  *pStack;
 	int     i;
@@ -585,7 +585,7 @@ void CBarber::OnLButtonUp(CWnd *pWnd) {
 	************************************************************/
 	for (i = 0; i <= used; i++) {
 		pStack = m_cBrd->GetStack((loc) i);     // get appropriate stack
-		if (pStack->IsEmpty() == TRUE) {         // assigns rect of interest as
+		if (pStack->IsEmpty() == true) {         // assigns rect of interest as
 			cTest = pStack->m_cRect;            //  either base rect
 		} else {                                //  or card rect from top of stack
 			cTest = pStack->Top()->m_pSprite->GetRect();
@@ -610,16 +610,16 @@ void CBarber::OnLButtonUp(CWnd *pWnd) {
 		* within a stack's rect.                                *
 		********************************************************/
 //b
-		if (IsInRect(cTest, m_pCrd->m_pSprite->GetRect()) == FALSE) {  //!= TRUE ) { // is card on invalid area?
+		if (IsInRect(cTest, m_pCrd->m_pSprite->GetRect()) == false) {  //!= true ) { // is card on invalid area?
 			continue;
 		} // end if
 
-		if (m_pLogic->IsMoveOk(m_pCrd, pStack) == TRUE) {
+		if (m_pLogic->IsMoveOk(m_pCrd, pStack) == true) {
 			m_pUndo->Record(m_pCrd->m_pStack, m_pCrd);  // note move for possible undoing
 
 			m_pCrd->m_pStack->Pop();
 			pStack->Push(m_pCrd);
-			bSuccess = TRUE;
+			bSuccess = true;
 		} // end if
 		continue;
 //b     break;
@@ -629,7 +629,7 @@ void CBarber::OnLButtonUp(CWnd *pWnd) {
 	* Update visual display. *
 	*************************/
 	pDC = (*pWnd).GetDC();
-	if (bSuccess != TRUE) {                                  // card dropped over stack?
+	if (bSuccess != true) {                                  // card dropped over stack?
 		m_cPnt->UpdateCard(pDC, m_pCrd);                    // no - redraw card over original stack
 	} else {
 		m_cPnt->Stack(pDC, m_pCrd);                         // draw card apro stack
@@ -637,7 +637,7 @@ void CBarber::OnLButtonUp(CWnd *pWnd) {
 	(*pWnd).ReleaseDC(pDC);
 
 	m_pCrd = nullptr;                                          // clear current card
-	if (m_cBrd->GetStack(stock)->IsEmpty() == TRUE)
+	if (m_cBrd->GetStack(stock)->IsEmpty() == true)
 		IsGameOver(pWnd);                                       // game over?
 }
 
@@ -663,10 +663,10 @@ void CBarber::OnLButtonUp(CWnd *pWnd) {
  * RETURN VALUE:                n/a
  *
  ****************************************************************/
-BOOL CBarber::IsInRect(CRect cStk, CRect cCrd) {
+bool CBarber::IsInRect(CRect cStk, CRect cCrd) {
 //b CPoint  point;
 	CRect   inter;
-	BOOL    bTL;
+	bool    bTL;
 	/*
 	    point.x = cCrd.TopLeft().x + m_pCrd->m_pSprite->GetHotspot().x;
 	    point.y = cCrd.TopLeft().y + m_pCrd->m_pSprite->GetHotspot().y;
@@ -697,20 +697,20 @@ BOOL CBarber::IsInRect(CRect cStk, CRect cCrd) {
  * RETURN VALUE:                n/a
  *
  ****************************************************************/
-BOOL CBarber::IsGameOver(CWnd *pWnd) {
+bool CBarber::IsGameOver(CWnd *pWnd) {
 	/*****************************
 	* Determine if game is over. *
 	*****************************/
 	m_bIsGameOver = m_pLogic->IsGameOver(m_cBrd);
-	if (m_bIsGameOver == FALSE)
-		return FALSE;
+	if (m_bIsGameOver == false)
+		return false;
 
 	/**********************
 	* Determine win/loss. *
 	**********************/
 	if (m_cBrd->GetStack((loc) fnd)->Size() == DECK) {
 		// sound (if enabled)
-		if (pGameParams->bSoundEffectsEnabled != FALSE) {
+		if (pGameParams->bSoundEffectsEnabled != false) {
 			m_pSound->initialize(
 			    WIN_SOUND,
 			    SOUND_WAVE | SOUND_ASYNCH
@@ -718,10 +718,10 @@ BOOL CBarber::IsGameOver(CWnd *pWnd) {
 			m_pSound->play();
 		}
 
-		m_bIsWin = TRUE;
+		m_bIsWin = true;
 	} else {
 		// sound (if enabled)
-		if (pGameParams->bSoundEffectsEnabled != FALSE) {
+		if (pGameParams->bSoundEffectsEnabled != false) {
 			m_pSound->initialize(
 			    LOSE_SOUND,
 			    SOUND_WAVE | SOUND_ASYNCH
@@ -729,10 +729,10 @@ BOOL CBarber::IsGameOver(CWnd *pWnd) {
 			m_pSound->play();
 		}
 
-		m_bIsWin = FALSE;
+		m_bIsWin = false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 /*****************************************************************
@@ -751,7 +751,7 @@ BOOL CBarber::IsGameOver(CWnd *pWnd) {
  * RETURN VALUE:                n/a
  *
  ****************************************************************/
-BOOL CBarber::IsNewBack(int nCardBack) {
+bool CBarber::IsNewBack(int nCardBack) {
 	return m_cPnt->IsNewBack(nCardBack);
 }
 
diff --git a/engines/bagel/hodjnpodj/barbershop/barb.h b/engines/bagel/hodjnpodj/barbershop/barb.h
index 843d631c794..68a3e3279bd 100644
--- a/engines/bagel/hodjnpodj/barbershop/barb.h
+++ b/engines/bagel/hodjnpodj/barbershop/barb.h
@@ -68,16 +68,16 @@ public:
 	void    OnLButtonDblClk(CWnd*, CPalette*, CPoint);
 	void    OnMouseMove(CDC*, CPoint);
 	void    OnLButtonUp(CWnd*);
-	BOOL    IsInRect(CRect cStk, CRect cCrd);
-	BOOL    IsGameOver(CWnd*);
-	BOOL    IsNewBack(int);
+	bool    IsInRect(CRect cStk, CRect cCrd);
+	bool    IsGameOver(CWnd*);
+	bool    IsNewBack(int);
 	void    ChangeBack(CDC*, int);
 	int     Score();
 
 	CPaint  *m_cPnt;            // used to visually paint cards on screen
 	CCard   *m_pCrd;            // the card being moved
-	BOOL    m_bIsGameOver;      // tells if game has ended
-	BOOL    m_bIsWin;           // tells if game was won or lost
+	bool    m_bIsGameOver;      // tells if game has ended
+	bool    m_bIsWin;           // tells if game was won or lost
 };
 
 // Globals!
diff --git a/engines/bagel/hodjnpodj/barbershop/board.cpp b/engines/bagel/hodjnpodj/barbershop/board.cpp
index 1e7645cc2db..8f8780ba561 100644
--- a/engines/bagel/hodjnpodj/barbershop/board.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/board.cpp
@@ -87,20 +87,20 @@ CStack *CBoard::GetStack(loc nStack) {
 	return nullptr;
 }
 
-BOOL CBoard::IsTabStack(int nStack) {
+bool CBoard::IsTabStack(int nStack) {
 	switch (nStack) {
 
 	case fnd:
-		return FALSE;
+		return false;
 
 	case stock:
-		return FALSE;
+		return false;
 
 	case used:
-		return FALSE;
+		return false;
 
 	default:
-		return TRUE;
+		return true;
 	}
 }
 
diff --git a/engines/bagel/hodjnpodj/barbershop/board.h b/engines/bagel/hodjnpodj/barbershop/board.h
index cd519af3a86..c1f2bedfedb 100644
--- a/engines/bagel/hodjnpodj/barbershop/board.h
+++ b/engines/bagel/hodjnpodj/barbershop/board.h
@@ -35,7 +35,7 @@ public:     // functions
 	~CBoard();
 
 	CStack *GetStack(loc);
-	BOOL    IsTabStack(int);
+	bool    IsTabStack(int);
 
 public:     // vars
 	CStack  *m_pFound;
diff --git a/engines/bagel/hodjnpodj/barbershop/card.cpp b/engines/bagel/hodjnpodj/barbershop/card.cpp
index 77913a9b44b..f2f74b825ce 100644
--- a/engines/bagel/hodjnpodj/barbershop/card.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/card.cpp
@@ -37,7 +37,7 @@ CCard::CCard() {
 	m_pNextCard = nullptr;
 	m_pSprite   = nullptr;
 	m_pStack    = nullptr;
-	m_bIsBack   = FALSE;
+	m_bIsBack   = false;
 	m_cOrigin   = CPoint(0, 0);
 }
 
@@ -54,7 +54,7 @@ CCard::CCard(int nValue) {
 	m_pNextCard = nullptr;
 	m_pSprite   = nullptr;
 	m_pStack    = nullptr;
-	m_bIsBack   = FALSE;
+	m_bIsBack   = false;
 	m_cOrigin   = CPoint(0, 0);
 }
 
@@ -65,7 +65,7 @@ CCard::CCard(suit enSuit, int nPip) {
 	m_pNextCard = nullptr;
 	m_pSprite   = nullptr;
 	m_pStack    = nullptr;
-	m_bIsBack   = FALSE;
+	m_bIsBack   = false;
 	m_cOrigin   = CPoint(0, 0);
 }
 
diff --git a/engines/bagel/hodjnpodj/barbershop/card.h b/engines/bagel/hodjnpodj/barbershop/card.h
index c2951b83bd5..e16a47dde20 100644
--- a/engines/bagel/hodjnpodj/barbershop/card.h
+++ b/engines/bagel/hodjnpodj/barbershop/card.h
@@ -81,19 +81,19 @@ public:     // functions
 	int GetPip() const {
 		return m_nPip;
 	}
-	BOOL IsFace() const {
+	bool IsFace() const {
 		return m_nPip >= CUST_CARD;
 	}
-	BOOL IsCustomer() const {
+	bool IsCustomer() const {
 		return m_nPip == CUST_CARD;
 	}
-	BOOL IsBarber() const {
+	bool IsBarber() const {
 		return m_nPip == BARB_CARD;
 	}
-	BOOL IsManicurist() {
+	bool IsManicurist() {
 		return m_nPip == MANI_CARD;
 	}
-	BOOL operator==(int nValue) const {
+	bool operator==(int nValue) const {
 		return nValue == GetValue();
 	}
 	CCard &operator=(const CCard &);
@@ -103,7 +103,7 @@ public:     // vars
 	CCard   *m_pNextCard;
 	OSpr    *m_pSprite;
 	CStack  *m_pStack;
-	BOOL    m_bIsBack;
+	bool    m_bIsBack;
 	CPoint  m_cOrigin;
 };
 
diff --git a/engines/bagel/hodjnpodj/barbershop/jay.cpp b/engines/bagel/hodjnpodj/barbershop/jay.cpp
index 2b944695959..e038db3eedb 100644
--- a/engines/bagel/hodjnpodj/barbershop/jay.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/jay.cpp
@@ -43,7 +43,7 @@ void MyFocusRect(CDC *pDC, CRect rect, int nDrawMode) {
 	pMyBrush->CreateBrushIndirect(&lb);              // Create a new brush
 	pMyPen->CreatePen(PS_INSIDEFRAME, HILITE_BORDER, RGBCOLOR_DARKRED);      // Create a new pen
 
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);     // Select in game palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);     // Select in game palette
 	(*pDC).RealizePalette();                                // Use it
 	pOldPen = pDC->SelectObject(pMyPen);         // Select the new pen & save old
 	pOldBrush = pDC->SelectObject(pMyBrush);     // Select the new brush & save old
@@ -52,7 +52,7 @@ void MyFocusRect(CDC *pDC, CRect rect, int nDrawMode) {
 	pDC->SelectObject(pOldPen);                  // Select the old pen
 	pDC->SelectObject(pOldBrush);                // Select the old brush
 	pDC->SetROP2(OldDrawMode);                   // Set pen mode back to old state
-	(*pDC).SelectPalette(pPalOld, FALSE);           // Select back the old palette
+	(*pDC).SelectPalette(pPalOld, false);           // Select back the old palette
 
 	if (pMyBrush != nullptr) {                         // If the brush was constructed, delete it
 		pMyBrush->DeleteObject();
diff --git a/engines/bagel/hodjnpodj/barbershop/logic.cpp b/engines/bagel/hodjnpodj/barbershop/logic.cpp
index ad6ea670fdc..fcb842132f0 100644
--- a/engines/bagel/hodjnpodj/barbershop/logic.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/logic.cpp
@@ -107,46 +107,46 @@ CLogic::~CLogic() {
  *  n/a
  *
  ****************************************************************/
-BOOL CLogic::IsMoveOk(CCard *pCard, CStack *pStack) {
+bool CLogic::IsMoveOk(CCard *pCard, CStack *pStack) {
 	CCard *pTopCard;
 
 	switch (pStack->GetID()) {
 
 	case fnd:       // foundation rules
-		if (pCard->IsFace() == TRUE)
-			return TRUE;
-		if (pStack->IsEmpty() == TRUE)
-			return FALSE;
+		if (pCard->IsFace() == true)
+			return true;
+		if (pStack->IsEmpty() == true)
+			return false;
 
 		pTopCard = pStack->Top();
-		if (pTopCard->IsManicurist() == TRUE)
-			return TRUE;
+		if (pTopCard->IsManicurist() == true)
+			return true;
 
 		if (
-		    pTopCard->IsCustomer() == TRUE &&
+		    pTopCard->IsCustomer() == true &&
 		    pCard->GetPip() == ONE_CARD
 		)
-			return TRUE;
+			return true;
 
 		if (
-		    pTopCard->IsBarber() == TRUE &&
+		    pTopCard->IsBarber() == true &&
 		    pCard->GetPip() == TEN_CARD
 		)
-			return TRUE;
+			return true;
 
 		if (pTopCard->GetPip() == ONE_CARD) {
 			if (pCard->GetPip() == TWO_CARD) {
-				return TRUE;
+				return true;
 			} else {
-				return FALSE;
+				return false;
 			}
 		}
 
 		if (pTopCard->GetPip() == TEN_CARD) {
 			if (pCard->GetPip() == NINE_CARD) {
-				return TRUE;
+				return true;
 			} else {
-				return FALSE;
+				return false;
 			}
 		}
 
@@ -155,77 +155,77 @@ BOOL CLogic::IsMoveOk(CCard *pCard, CStack *pStack) {
 		        pTopCard->GetPip() == (pCard->GetPip() + 1) ||
 		        pTopCard->GetPip() == (pCard->GetPip() - 1)
 		    ) &&
-		    pTopCard->IsFace() == FALSE
+		    pTopCard->IsFace() == false
 		)
-			return TRUE;
+			return true;
 
-		return FALSE;
+		return false;
 
 	case stock:
-		return FALSE;
+		return false;
 	case used:
-		return FALSE;
+		return false;
 	default:        // tab
-		if (pStack->IsEmpty() == TRUE) {     // empty space on tab?
+		if (pStack->IsEmpty() == true) {     // empty space on tab?
 			if (        // yes - source card from stack with other face cards?
 			    pCard->m_pStack->GetID() >= tab &&
 			    pCard->m_pStack->GetID() < stock &&
 			    pCard->m_pPrevCard != nullptr &&
-			    pCard->m_pPrevCard->m_bIsBack == TRUE
+			    pCard->m_pPrevCard->m_bIsBack == true
 			)
-				return TRUE;                // this is a valid move
+				return true;                // this is a valid move
 			if (        // yes - source card from stock?
 			    pCard->m_pStack->GetID() == used
 			)
-				return TRUE;                // this is a valid move
-			return FALSE;
+				return true;                // this is a valid move
+			return false;
 		}
 
 		if (
-		    pStack->IsEmpty() == TRUE &&
+		    pStack->IsEmpty() == true &&
 		    pCard->m_pStack->GetID() >= tab &&
 		    pCard->m_pStack->GetID() < stock &&
 		    pCard->m_pPrevCard != nullptr &&
-		    pCard->m_pPrevCard->m_bIsBack == TRUE
+		    pCard->m_pPrevCard->m_bIsBack == true
 		)                   // when there's an empty space on the tab
-			return TRUE;
+			return true;
 
 
 		pTopCard = pStack->Top();
 		if (pCard == pTopCard)   // card back on it's own stack?
-			return FALSE;           // yes, illegal
+			return false;           // yes, illegal
 
-		if (pTopCard->m_bIsBack == TRUE)
-			return FALSE;
+		if (pTopCard->m_bIsBack == true)
+			return false;
 
 		if (
-		    pTopCard->IsManicurist() == TRUE &&
-		    pCard->IsManicurist() == TRUE
+		    pTopCard->IsManicurist() == true &&
+		    pCard->IsManicurist() == true
 		)
-			return TRUE;
+			return true;
 
 		if (pTopCard->GetPip() == pCard->GetPip()) {
 			if (pCard->m_pStack->GetID() == used)            // Card from used stack?
-				return TRUE;                                // yes - acceptable move
+				return true;                                // yes - acceptable move
 			if (pCard->m_pPrevCard == nullptr)              // anything under cur card?
-				return TRUE;                                // no
-			if (pCard->m_pPrevCard->m_bIsBack == TRUE)   // card under cur card a card back?
-				return TRUE;                                // yes
-			return FALSE;
+				return true;                                // no
+			if (pCard->m_pPrevCard->m_bIsBack == true)   // card under cur card a card back?
+				return true;                                // yes
+			return false;
 		}
 
-		return FALSE;
+		return false;
 	}
 }
 
-BOOL CLogic::IsGameOver(CBoard *pBoard) {
+bool CLogic::IsGameOver(CBoard *pBoard) {
 	CStack  *pFnd;
 	CCard   *pCard;
 	int     i, j;
 
 	pFnd = pBoard->GetStack((loc) fnd);
 	if (pFnd->Size() == DECK)        // All cards on foundation?
-		return TRUE;                // Yes
+		return true;                // Yes
 
 	/******************************************************
 	* Check all combinations of tableau to tableau moves. *
@@ -234,18 +234,18 @@ BOOL CLogic::IsGameOver(CBoard *pBoard) {
 		if ((pCard = pBoard->GetStack((loc) i)->Top()) == nullptr)
 			continue;
 
-		if (pCard->m_bIsBack == TRUE)
-			return FALSE;
+		if (pCard->m_bIsBack == true)
+			return false;
 
 		for (j = tab; j < stock; j++) {
 			if (pCard->m_pStack == pBoard->GetStack((loc) j))
 				continue;
-			if (IsMoveOk(pCard, pBoard->GetStack((loc) j)) == TRUE)
-				return FALSE;
+			if (IsMoveOk(pCard, pBoard->GetStack((loc) j)) == true)
+				return false;
 		} // end for
 	} // end for
 
-	//return FALSE; // used for debugging purposes
+	//return false; // used for debugging purposes
 
 	/*********************************************************
 	* Check all combinations of tableau to foundation moves. *
@@ -254,8 +254,8 @@ BOOL CLogic::IsGameOver(CBoard *pBoard) {
 		if ((pCard = pBoard->GetStack((loc) i)->Top()) == nullptr)
 			continue;
 
-		if (IsMoveOk(pCard, pFnd) == TRUE)
-			return FALSE;
+		if (IsMoveOk(pCard, pFnd) == true)
+			return false;
 	} // end for
 
 	/************************************
@@ -278,8 +278,8 @@ BOOL CLogic::IsGameOver(CBoard *pBoard) {
 		} // end for
 
 		for (j = fnd; j < stock; j++) {
-			if (IsMoveOk(pCard, pBoard->GetStack((loc) j)) == TRUE)
-				return FALSE;
+			if (IsMoveOk(pCard, pBoard->GetStack((loc) j)) == true)
+				return false;
 		} // end for
 
 		if (pCard->m_pStack->Bottom() == pCard)          // Out of cards on the Stock stack?
@@ -299,15 +299,15 @@ BOOL CLogic::IsGameOver(CBoard *pBoard) {
 		} // end for
 
 		for (j = fnd; j < stock; j++) {
-			if (IsMoveOk(pCard, pBoard->GetStack((loc) j)) == TRUE)
-				return FALSE;
+			if (IsMoveOk(pCard, pBoard->GetStack((loc) j)) == true)
+				return false;
 		} // end for
 
 		if (pCard->m_pStack->Top() == pCard)             // Out of cards on the Stock stack?
 			break;
 	} // end while
 
-	return TRUE;    // Game over, no other possible moves
+	return true;    // Game over, no other possible moves
 }
 
 } // namespace Barbershop
diff --git a/engines/bagel/hodjnpodj/barbershop/logic.h b/engines/bagel/hodjnpodj/barbershop/logic.h
index ebe12f8b967..edabdd87382 100644
--- a/engines/bagel/hodjnpodj/barbershop/logic.h
+++ b/engines/bagel/hodjnpodj/barbershop/logic.h
@@ -35,8 +35,8 @@ public:
 	CLogic();
 	~CLogic();
 
-	BOOL    IsMoveOk(CCard*, CStack*);
-	BOOL    IsGameOver(CBoard *pBoard);
+	bool    IsMoveOk(CCard*, CStack*);
+	bool    IsGameOver(CBoard *pBoard);
 };
 
 } // namespace Barbershop
diff --git a/engines/bagel/hodjnpodj/barbershop/main.cpp b/engines/bagel/hodjnpodj/barbershop/main.cpp
index 3c3617f0d56..a21404a46f1 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/main.cpp
@@ -93,10 +93,10 @@ CMainWindow::CMainWindow(void) {
 	//
 	m_pScrollSprite = nullptr;
 	m_pGamePalette = nullptr;
-	m_bPause = FALSE;
-	m_bGameActive = FALSE;
-	m_bInMenu = FALSE;
-	m_bMIDIPlaying = FALSE;
+	m_bPause = false;
+	m_bGameActive = false;
+	m_bInMenu = false;
+	m_bMIDIPlaying = false;
 	m_pBarb = nullptr;
 	m_pMIDISound = nullptr;
 
@@ -122,7 +122,7 @@ CMainWindow::CMainWindow(void) {
 		// Acquire the shared palette for our game from the splash screen art
 		//
 		if ((pDibDoc = new CDibDoc()) != nullptr) {
-			if (pDibDoc->OpenDocument(MINI_GAME_MAP) != FALSE)
+			if (pDibDoc->OpenDocument(MINI_GAME_MAP) != false)
 				pGamePalette = m_pGamePalette = pDibDoc->DetachPalette();
 			else
 				errCode = ERR_UNKNOWN;
@@ -172,8 +172,8 @@ CMainWindow::CMainWindow(void) {
 				bSuccess = m_pScrollSprite->LoadSprite(pDC, ".\\ART\\SCROLBTN.BMP");
 				assert(bSuccess);
 				if (bSuccess) {
-					m_pScrollSprite->SetMasked(TRUE);
-					m_pScrollSprite->SetMobile(TRUE);
+					m_pScrollSprite->SetMasked(true);
+					m_pScrollSprite->SetMobile(true);
 				} else {
 					errCode = ERR_UNKNOWN;
 				}
@@ -235,13 +235,13 @@ CMainWindow::CMainWindow(void) {
 		// Start the game theme song
 		//
 		if (pGameParams->bMusicEnabled) {
-			m_bMIDIPlaying = TRUE;
+			m_bMIDIPlaying = true;
 			m_pMIDISound->midiLoopPlaySegment(2000L, 33560L, 00L, FMT_MILLISEC);
 		}
 
 		// Automatically bring up the main menu if in stand alone mode
 		//
-		if (pGameParams->bPlayingMetagame != FALSE) {
+		if (pGameParams->bPlayingMetagame != false) {
 			PostMessage(WM_COMMAND, IDC_OPTIONS_NEWGAME, BN_CLICKED);
 		} else {
 			PostMessage(WM_COMMAND, IDC_MENU, BN_CLICKED);
@@ -275,7 +275,7 @@ void CMainWindow::HandleError(ERROR_CODE errCode) {
 void CMainWindow::OnPaint() {
 	PAINTSTRUCT lpPaint;
 
-	Invalidate(FALSE);
+	Invalidate(false);
 	BeginPaint(&lpPaint);
 	PaintScreen();
 	EndPaint(&lpPaint);
@@ -328,7 +328,7 @@ void CMainWindow::PaintScreen() {
 }
 
 
-BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	CDC *pDC;
 	bool bSuccess;
 
@@ -343,7 +343,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			GamePause();
 
 			// don't display the command scroll when in the menu
-			m_bInMenu = TRUE;
+			m_bInMenu = true;
 
 			// hide the command scroll
 			//
@@ -374,7 +374,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			// User has chosen to play a new game
 			//
 			case IDC_OPTIONS_NEWGAME:
-				if (m_pBarb->IsNewBack(g_nCardBack) == TRUE) {      // need to card back?
+				if (m_pBarb->IsNewBack(g_nCardBack) == true) {      // need to card back?
 					m_pBarb->ChangeBack(pDC, g_nCardBack);          // yes - change it
 				} // end if
 
@@ -389,9 +389,9 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 				break;
 
 			default:
-				if (m_pBarb->IsNewBack(g_nCardBack) == TRUE) {      // need to card back?
+				if (m_pBarb->IsNewBack(g_nCardBack) == true) {      // need to card back?
 					m_pBarb->ChangeBack(pDC, g_nCardBack);          // yes - change it
-					Invalidate(TRUE);                               // set up for a redraw window
+					Invalidate(true);                               // set up for a redraw window
 				} // end if
 				break;
 
@@ -400,12 +400,12 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			if (!pGameParams->bMusicEnabled && m_bMIDIPlaying) {
 
 				m_pMIDISound->stop();
-				m_bMIDIPlaying = FALSE;
+				m_bMIDIPlaying = false;
 
 			} else if (pGameParams->bMusicEnabled && !m_bMIDIPlaying) {
 
 				m_pMIDISound->midiLoopPlaySegment(2470, 32160, 0, FMT_MILLISEC);
-				m_bMIDIPlaying = TRUE;
+				m_bMIDIPlaying = true;
 			}
 
 			// show the command scroll
@@ -416,9 +416,9 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 			// ok to display the command scroll now
 			//
-			m_bInMenu = FALSE;
+			m_bInMenu = false;
 			GameResume();
-			return TRUE;
+			return true;
 		} // end case
 
 		case IDC_OPTIONS_NEWGAME:
@@ -428,16 +428,16 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 		} // end switch
 	} // end if
 
-	return FALSE;
+	return false;
 }
 
 
 void CMainWindow::GamePause(void) {
-	m_bPause = TRUE;
+	m_bPause = true;
 }
 
 void CMainWindow::GameResume(void) {
-	m_bPause = FALSE;
+	m_bPause = false;
 }
 
 void CMainWindow::PlayGame() {
@@ -462,15 +462,15 @@ void CMainWindow::PlayGame() {
 			//
 			//CSprite::FlushSprites();
 			CSprite::FlushSpriteChain();        // Delete cards from memory
-			Invalidate(TRUE);
+			Invalidate(true);
 			UpdateWindow();
 			/*
-			            if ( pGameParams->bMusicEnabled != FALSE ) {
+			            if ( pGameParams->bMusicEnabled != false ) {
 			                m_pMIDISound->midiLoopPlaySegment(2000L, 33560L, 00L, FMT_MILLISEC);
 			            }
 			*/
 			m_pBarb->NewGame(pDC);
-			m_bGameActive = TRUE;
+			m_bGameActive = true;
 			ReleaseDC(pDC);
 		} else {
 			errCode = ERR_MEMORY;
@@ -523,7 +523,7 @@ void CMainWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	if (m_pBarb->m_pCrd != nullptr)        // r we currently moving a card?
 		return;                         // Yes - just quit.
 
-	if (m_pBarb->m_bIsGameOver == FALSE) {
+	if (m_pBarb->m_bIsGameOver == false) {
 		m_pBarb->OnLButtonDown(
 		    (CWnd*) this,
 		    m_pGamePalette,
@@ -556,40 +556,40 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	} else if (m_rNewGameButton.PtInRect(point)) {
 
 		// start a new game
-		if (pGameParams->bPlayingMetagame == FALSE)
+		if (pGameParams->bPlayingMetagame == false)
 			PlayGame();
 
-	} else if (m_pAnim->Clown(pDC, point) == TRUE) {
+	} else if (m_pAnim->Clown(pDC, point) == true) {
 		/************************************
 		* user clicked animation.           *
 		* animation handled in it's call.   *
 		************************************/
 		FlushInputEvents();
-	} else if (m_pAnim->UFO(pDC, point) == TRUE) {
+	} else if (m_pAnim->UFO(pDC, point) == true) {
 		/************************************
 		* user clicked animation.           *
 		* animation handled in it's call.   *
 		************************************/
 		FlushInputEvents();
-	} else if (m_pAnim->Brat(point) == TRUE) {
+	} else if (m_pAnim->Brat(point) == true) {
 		/************************************
 		* user clicked animation.           *
 		* animation handled in it's call.   *
 		************************************/
 		FlushInputEvents();
-	} else if (m_pAnim->Lollipop(point) == TRUE) {
+	} else if (m_pAnim->Lollipop(point) == true) {
 		/************************************
 		* user clicked animation.           *
 		* animation handled in it's call.   *
 		************************************/
 		FlushInputEvents();
-	} else if (m_pAnim->Haircut(point) == TRUE) {
+	} else if (m_pAnim->Haircut(point) == true) {
 		/************************************
 		* user clicked animation.           *
 		* animation handled in it's call.   *
 		************************************/
 		FlushInputEvents();
-	} else if (m_pBarb->m_bIsGameOver == FALSE) {
+	} else if (m_pBarb->m_bIsGameOver == false) {
 		m_pBarb->OnLButtonDown(
 		    (CWnd*) this,
 		    m_pGamePalette,
@@ -599,7 +599,7 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 		// is this needed ?
 		CFrameWnd::OnLButtonDown(nFlags, point);
 
-		if (m_pBarb->m_bIsGameOver == TRUE) {
+		if (m_pBarb->m_bIsGameOver == true) {
 			if (pGameParams->bPlayingMetagame) {
 				Common::sprintf_s(buf, "Score: %d", m_pBarb->Score());
 				CMessageBox cGameOver(
@@ -655,17 +655,17 @@ void CMainWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 	} else if (m_rNewGameButton.PtInRect(point)) {
 
 		// start a new game
-		if (pGameParams->bPlayingMetagame == FALSE)
+		if (pGameParams->bPlayingMetagame == false)
 			PlayGame();
 
-	} else if (m_pBarb->m_bIsGameOver == FALSE) {
+	} else if (m_pBarb->m_bIsGameOver == false) {
 		m_pBarb->OnLButtonDblClk(
 		    (CWnd*) this,
 		    m_pGamePalette,
 		    point
 		);
 
-		if (m_pBarb->m_bIsGameOver == TRUE) {
+		if (m_pBarb->m_bIsGameOver == true) {
 			if (pGameParams->bPlayingMetagame) {
 				Common::sprintf_s(buf, "Score: %d", m_pBarb->Score());
 				CMessageBox cGameOver(
@@ -703,11 +703,11 @@ void CMainWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	char    buf[32];
 
-	if (m_pBarb->m_bIsGameOver == FALSE) {
+	if (m_pBarb->m_bIsGameOver == false) {
 
 		m_pBarb->OnLButtonUp((CWnd*) this);
 
-		if (m_pBarb->m_bIsGameOver == TRUE) {
+		if (m_pBarb->m_bIsGameOver == true) {
 			if (pGameParams->bPlayingMetagame) {
 				Common::sprintf_s(buf, "Score: %d", m_pBarb->Score());
 				CMessageBox cGameOver(
@@ -830,27 +830,27 @@ void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned i
 void CMainWindow::FlushInputEvents(void) {
 	MSG msg;
 
-	while (TRUE) {                                      // find and remove all keyboard events
+	while (true) {                                      // find and remove all keyboard events
 		if (!PeekMessage(&msg, nullptr, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE))
 			break;
 	} // end while
 
-	while (TRUE) {                                      // find and remove all mouse events
+	while (true) {                                      // find and remove all mouse events
 		if (!PeekMessage(&msg, nullptr, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE))
 			break;
 	} // end while
 }
 
-void CMainWindow::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
+void CMainWindow::OnActivate(unsigned int nState, CWnd *pWndOther, bool bMinimized) {
 	if (pWndOther)      // bullshit to rid warnings
-		TRUE;
+		true;
 
 	if (!bMinimized) {
 
 		switch (nState) {
 		case WA_ACTIVE:
 		case WA_CLICKACTIVE:
-			InvalidateRect(nullptr, FALSE);
+			InvalidateRect(nullptr, false);
 			break;
 
 		default:
diff --git a/engines/bagel/hodjnpodj/barbershop/main.h b/engines/bagel/hodjnpodj/barbershop/main.h
index 79a0ee86842..08edbf5dcc2 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.h
+++ b/engines/bagel/hodjnpodj/barbershop/main.h
@@ -41,7 +41,7 @@ private:
 	CSound      *m_pMIDISound;
 	CSound      *m_pWavSound;
 	CAnimate    *m_pAnim;
-	BOOL         m_bMIDIPlaying;
+	bool         m_bMIDIPlaying;
 
 public:
 	CMainWindow(void);
@@ -57,7 +57,7 @@ protected:
 	void        GameReset(void);
 	void        GamePause(void);
 	void        GameResume(void);
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	void        HandleError(ERROR_CODE);
 	void        DeleteSprite(CSprite *);
 
@@ -70,7 +70,7 @@ protected:
 	void        OnSysChar(unsigned int, unsigned int, unsigned int);
 	void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	void        OnKeyDown(unsigned int, unsigned int, unsigned int);
-	void        OnActivate(unsigned int, CWnd *, BOOL) override;
+	void        OnActivate(unsigned int, CWnd *, bool) override;
 	void        OnClose(void);
 	void        OnLButtonUp(unsigned int, CPoint);
 
diff --git a/engines/bagel/hodjnpodj/barbershop/paint.cpp b/engines/bagel/hodjnpodj/barbershop/paint.cpp
index bcc3ff6f7b6..c9dac08586a 100644
--- a/engines/bagel/hodjnpodj/barbershop/paint.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/paint.cpp
@@ -56,7 +56,7 @@ namespace Barbershop {
 CPaint::CPaint(CDC *pDC) {
 	CBitmap *pBmpCardSet = nullptr;
 	CBitmap *pCard = nullptr;
-	BOOL    bSuccess;
+	bool    bSuccess;
 	int     i, j;
 
 	for (i = 0; i < CARDS_PER_COL; i++) {    // Initialize master alphabet list
@@ -81,8 +81,8 @@ CPaint::CPaint(CDC *pDC) {
 			ASSERT(bSuccess);
 
 			(*m_cCardSet[(i * CARDS_PER_ROW) + j]).SetHotspot(CARD_HOT_X, CARD_HOT_Y);
-			(*m_cCardSet[(i * CARDS_PER_ROW) + j]).SetMobile(TRUE);
-			(*m_cCardSet[(i * CARDS_PER_ROW) + j]).SetMasked(TRUE);
+			(*m_cCardSet[(i * CARDS_PER_ROW) + j]).SetMobile(true);
+			(*m_cCardSet[(i * CARDS_PER_ROW) + j]).SetMasked(true);
 		}  // end for
 
 		if (pBmpCardSet != nullptr) {
@@ -202,13 +202,13 @@ void CPaint::Board(CDC *pDC, CBoard *pBoard) {
 			m_pSprite->m_cCard = pCard[j];
 			(*m_pSprite).LinkSprite();
 
-			pCard[j]->m_bIsBack = FALSE;
+			pCard[j]->m_bIsBack = false;
 		} else {
 			m_cCardSet[m_nCardBack]->DuplicateSprite(pDC, (CSprite*) m_pSprite);
 			m_pSprite->m_cCard = pCard[j];
 			(*m_pSprite).LinkSprite();
 
-			pCard[j]->m_bIsBack = TRUE;
+			pCard[j]->m_bIsBack = true;
 		} // end if
 
 		pCard[j]->m_pSprite = m_pSprite;
@@ -228,7 +228,7 @@ void CPaint::Board(CDC *pDC, CBoard *pBoard) {
 
 		m_pSprite->m_cCard  = pCard[0];     // update internal card struct
 		pCard[0]->m_pSprite = m_pSprite;
-		pCard[0]->m_bIsBack = TRUE;
+		pCard[0]->m_bIsBack = true;
 
 		Stack(pDC, pCard[0], i);                    // paint it on screen
 		pCard[0] = pCard[0]->m_pNextCard;           // Advance to next card
@@ -328,12 +328,12 @@ void CPaint::FlipCard(CDC *pDC, CCard *pCard) {
 	* Reverse card. If it is a back, flip it forward, and vise versa. *
 	******************************************************************/
 	pCard->m_pSprite = new OSpr();
-	if (pCard->m_bIsBack == TRUE) {
+	if (pCard->m_bIsBack == true) {
 		(*m_cCardSet[pCard->GetValue()]).DuplicateSprite(pDC, (CSprite*) pCard->m_pSprite);
-		pCard->m_bIsBack = FALSE;
+		pCard->m_bIsBack = false;
 	} else {
 		(*m_cCardSet[m_nCardBack]).DuplicateSprite(pDC, (CSprite*) pCard->m_pSprite);
-		pCard->m_bIsBack = TRUE;
+		pCard->m_bIsBack = true;
 	}
 
 	pCard->m_pSprite->LinkSprite();
@@ -405,7 +405,7 @@ void CPaint::Stack(CDC *pDC, CCard *pCard, int nSize) {
 
 	default:
 		if (pCard->m_pPrevCard != nullptr) {    // card face req pos?
-			if (pCard->m_pPrevCard->m_bIsBack == FALSE) {
+			if (pCard->m_pPrevCard->m_bIsBack == false) {
 				pCard->m_cOrigin.x = pCard->m_pPrevCard->m_cOrigin.x + STACK_FACE_DX;
 				pCard->m_cOrigin.y = pCard->m_pPrevCard->m_cOrigin.y + STACK_FACE_DY;
 				break;
@@ -448,11 +448,11 @@ void CPaint::Stack(CDC *pDC, CCard *pCard, int nSize) {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CPaint::IsNewBack(int nBack) {
+bool CPaint::IsNewBack(int nBack) {
 	if (m_nCardBack == nBack)  {     // any change?
-		return FALSE;
+		return false;
 	} else {
-		return TRUE;
+		return true;
 	}
 }
 
@@ -496,7 +496,7 @@ void CPaint::ChangeBack(CDC *pDC, CBoard *pBoard, int nBack) {
 		pCard   = pStack->Bottom();
 
 		while (pCard != nullptr) {
-			if (pCard->m_bIsBack == FALSE) {
+			if (pCard->m_bIsBack == false) {
 				pCard = pCard->m_pNextCard;
 				continue;
 			}
diff --git a/engines/bagel/hodjnpodj/barbershop/paint.h b/engines/bagel/hodjnpodj/barbershop/paint.h
index 782b7b95734..dcdfcf82c7c 100644
--- a/engines/bagel/hodjnpodj/barbershop/paint.h
+++ b/engines/bagel/hodjnpodj/barbershop/paint.h
@@ -112,7 +112,7 @@ public:     // func
 	void    UpdateCard(CDC*, CCard*);
 	void    FlipCard(CDC*, CCard*);
 	void    Stack(CDC*, CCard*, int nSize = -1);
-	BOOL    IsNewBack(int);
+	bool    IsNewBack(int);
 	void    ChangeBack(CDC*, CBoard*, int);
 
 public:     // vars
diff --git a/engines/bagel/hodjnpodj/barbershop/stack.h b/engines/bagel/hodjnpodj/barbershop/stack.h
index 405a4ea4b1a..d9d82af3853 100644
--- a/engines/bagel/hodjnpodj/barbershop/stack.h
+++ b/engines/bagel/hodjnpodj/barbershop/stack.h
@@ -53,14 +53,14 @@ public:     // functions
 	CCard *Bottom() const {
 		return m_pBottomCard;
 	}
-	BOOL IsEmpty() const {
-		return (BOOL)(m_pTopCard == nullptr);
+	bool IsEmpty() const {
+		return (bool)(m_pTopCard == nullptr);
 	}
 	int GetID() const {
 		return m_nID;
 	}
-	BOOL    IsTab() {
-		return (BOOL)(m_nID >= tab && m_nID < stock);
+	bool    IsTab() {
+		return (bool)(m_nID >= tab && m_nID < stock);
 	}
 	int Size();
 
diff --git a/engines/bagel/hodjnpodj/barbershop/undo.cpp b/engines/bagel/hodjnpodj/barbershop/undo.cpp
index c4bd4a4566c..a5f6178d81f 100644
--- a/engines/bagel/hodjnpodj/barbershop/undo.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/undo.cpp
@@ -192,7 +192,7 @@ void CUndo::Reset() {
  * FUNCTIONAL DESCRIPTION:
  *
  *      Puts card back into original position.
- *      Returns TRUE if undo was possible, else FALSE.
+ *      Returns true if undo was possible, else false.
  *
  * FORMAL PARAMETERS:
  *
@@ -211,7 +211,7 @@ void CUndo::Reset() {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CUndo::Undo(CDC *pDC, CBoard *pBoard, CPaint *pPaint) {
+bool CUndo::Undo(CDC *pDC, CBoard *pBoard, CPaint *pPaint) {
 	CCard   *pCard;
 	CPoint  cPos;
 	int     i;
@@ -233,11 +233,11 @@ BOOL CUndo::Undo(CDC *pDC, CBoard *pBoard, CPaint *pPaint) {
 		} // end for
 
 		Reset();                    // clear undo
-		return TRUE;
+		return true;
 	} // end if
 
 	if (m_pStack == nullptr)            // basic card undo?
-		return FALSE;               // No - nothing can be undone
+		return false;               // No - nothing can be undone
 
 
 	m_pCard->m_pStack->Pop();       // undo move in internal rep
@@ -266,7 +266,7 @@ BOOL CUndo::Undo(CDC *pDC, CBoard *pBoard, CPaint *pPaint) {
 	} // end if
 
 	Reset();                        // clear undo
-	return TRUE;
+	return true;
 }
 
 } // namespace Barbershop
diff --git a/engines/bagel/hodjnpodj/barbershop/undo.h b/engines/bagel/hodjnpodj/barbershop/undo.h
index d1facc9ad52..8d8ed6c8c64 100644
--- a/engines/bagel/hodjnpodj/barbershop/undo.h
+++ b/engines/bagel/hodjnpodj/barbershop/undo.h
@@ -45,7 +45,7 @@ public:
 	void    Record(CStack*, CCard*);
 	void    Record(int);
 	void    Reset();
-	BOOL    Undo(CDC*, CBoard*, CPaint*);
+	bool    Undo(CDC*, CBoard*, CPaint*);
 
 	CRect   m_cUndoRect;
 private:
diff --git a/engines/bagel/hodjnpodj/barbershop/usercfg.cpp b/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
index 7f785ef8f24..3889c57a14a 100644
--- a/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
@@ -57,15 +57,15 @@ void CUserCfgDlg::DoDataExchange(CDataExchange *pDX) {
 	CDialog::DoDataExchange(pDX);
 }
 
-BOOL CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog(void) {
 	CDC     *pDC = GetDC();
 	CRect   tmpRect;
 
 	CBmpDialog::OnInitDialog();
-	m_bSave = FALSE;
+	m_bSave = false;
 
 	if ((m_ctextBox = new CText) != nullptr) {
-		BOOL    bAssertCheck;
+		bool    bAssertCheck;
 
 		tmpRect.SetRect(TEXT_LEFT, TEXT_TOP, TEXT_RIG, TEXT_BOT);
 		bAssertCheck = (*m_ctextBox).SetupText(pDC, pGamePalette, &tmpRect, JUSTIFY_CENTER);
@@ -78,13 +78,13 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 	} // end if
 
 	ReleaseDC(pDC);
-	return TRUE;
+	return true;
 }
 
 void CUserCfgDlg::OnPaint(void) {
 	CDC     *pDC = nullptr;
 	char    msg[64];
-	BOOL    bAssertCheck;
+	bool    bAssertCheck;
 
 	CBmpDialog::OnPaint();
 
@@ -109,7 +109,7 @@ void CUserCfgDlg::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	CDC     *pDC = GetDC();
 
 	if (
-	    m_cRectCardBack1.PtInRect(point) == TRUE &&
+	    m_cRectCardBack1.PtInRect(point) == true &&
 	    m_nCardBack != CARD_BACK1
 	) {
 		// update visual image
@@ -119,7 +119,7 @@ void CUserCfgDlg::OnLButtonUp(unsigned int nFlags, CPoint point) {
 
 		m_nCardBack = CARD_BACK1;
 	} else if (
-	    m_cRectCardBack2.PtInRect(point) == TRUE &&
+	    m_cRectCardBack2.PtInRect(point) == true &&
 	    m_nCardBack != CARD_BACK2
 	) {
 		// update visual image
@@ -206,7 +206,7 @@ void CUserCfgDlg::MyFocusRect(CDC *pDC, CRect rect, int nDrawMode, COLORREF rgbC
 	pMyBrush->CreateBrushIndirect(&lb);              // Create a new brush
 	pMyPen->CreatePen(PS_INSIDEFRAME, DELTA, rgbColor); // Create a new pen
 
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);     // Select in game palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);     // Select in game palette
 	(*pDC).RealizePalette();                                // Use it
 
 	pOldPen = pDC->SelectObject(pMyPen);         // Select the new pen & save old
@@ -218,7 +218,7 @@ void CUserCfgDlg::MyFocusRect(CDC *pDC, CRect rect, int nDrawMode, COLORREF rgbC
 	pDC->SelectObject(pOldPen);                  // Select the old pen
 	pDC->SelectObject(pOldBrush);                // Select the old brush
 	pDC->SetROP2(OldDrawMode);                   // Set pen mode back to old state
-	(*pDC).SelectPalette(pPalOld, FALSE);           // Select back the old palette
+	(*pDC).SelectPalette(pPalOld, false);           // Select back the old palette
 
 	if (pMyBrush != nullptr) {                         // If the brush was constructed, delete it
 		pMyBrush->DeleteObject();
diff --git a/engines/bagel/hodjnpodj/barbershop/usercfg.h b/engines/bagel/hodjnpodj/barbershop/usercfg.h
index abed94e9991..4ec16220766 100644
--- a/engines/bagel/hodjnpodj/barbershop/usercfg.h
+++ b/engines/bagel/hodjnpodj/barbershop/usercfg.h
@@ -67,7 +67,7 @@ public:
 protected:
 
 	virtual void DoDataExchange(CDataExchange *) override;
-	virtual BOOL OnInitDialog(void) override;
+	virtual bool OnInitDialog(void) override;
 
 	void OnClose();
 	void OnPaint();
@@ -79,7 +79,7 @@ protected:
 
 private:
 //	unsigned int            m_nTimeLimit;       //
-	BOOL            m_bSave;            // True if should save theses values
+	bool            m_bSave;            // True if should save theses values
 	CRect           m_cRectCardBack1;
 	CRect           m_cRectCardBack2;
 	unsigned int            m_nCardBack;
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.cpp b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
index c0cd8f44f7b..dc4086e2666 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
@@ -290,7 +290,7 @@ CBFishWindow::CBFishWindow(void) {
 	CDC     *pDC;
 	CDibDoc *pDibDoc;
 	ERROR_CODE errCode;
-	BOOL bSuccess;
+	bool bSuccess;
 
 	// assume no error
 	errCode = ERR_NONE;
@@ -298,11 +298,11 @@ CBFishWindow::CBFishWindow(void) {
 	// Initialize members
 	//
 	m_pGamePalette = nullptr;
-	m_bPause = FALSE;
-	m_bGameActive = FALSE;
-	m_bMovingFish = FALSE;
-	m_bUserEditMode = FALSE;
-	m_bInMenu = FALSE;
+	m_bPause = false;
+	m_bGameActive = false;
+	m_bMovingFish = false;
+	m_bUserEditMode = false;
+	m_bInMenu = false;
 	m_pMasterHit = nullptr;
 	m_pMasterMiss = nullptr;
 	m_pDragFish = nullptr;
@@ -342,7 +342,7 @@ CBFishWindow::CBFishWindow(void) {
 		// Acquire the shared palette for our game from the splash screen art
 		//
 		if ((pDibDoc = new CDibDoc()) != nullptr) {
-			if (pDibDoc->OpenDocument(MINI_GAME_MAP) != FALSE)
+			if (pDibDoc->OpenDocument(MINI_GAME_MAP) != false)
 				pGamePalette = m_pGamePalette = pDibDoc->DetachPalette();
 			else
 				errCode = ERR_UNKNOWN;
@@ -396,8 +396,8 @@ CBFishWindow::CBFishWindow(void) {
 			} else {
 				errCode = ERR_MEMORY;
 			}
-			m_pScrollSprite->SetMasked(TRUE);
-			m_pScrollSprite->SetMobile(TRUE);
+			m_pScrollSprite->SetMasked(true);
+			m_pScrollSprite->SetMobile(true);
 		} else {
 			errCode = ERR_MEMORY;
 		}
@@ -485,12 +485,12 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
 
 			// this BMP uses the same palette as entire game
 			//
-			if (m_pMasterHit->SharePalette(m_pGamePalette) != FALSE) {
+			if (m_pMasterHit->SharePalette(m_pGamePalette) != false) {
 
-				if (m_pMasterHit->LoadResourceSprite(pDC, IDB_HIT) != FALSE) {
+				if (m_pMasterHit->LoadResourceSprite(pDC, IDB_HIT) != false) {
 
-					m_pMasterHit->SetMasked(TRUE);
-					m_pMasterHit->SetMobile(TRUE);
+					m_pMasterHit->SetMasked(true);
+					m_pMasterHit->SetMobile(true);
 					m_pMasterHit->SetZOrder(SPRITE_TOPMOST);
 				} else {
 					errCode = ERR_UNKNOWN;
@@ -509,12 +509,12 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
 
 				// this BMP uses the same palette as entire game
 				//
-				if (m_pMasterMiss->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pMasterMiss->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pMasterMiss->LoadResourceSprite(pDC, IDB_MISS) != FALSE) {
+					if (m_pMasterMiss->LoadResourceSprite(pDC, IDB_MISS) != false) {
 
-						m_pMasterMiss->SetMasked(TRUE);
-						m_pMasterMiss->SetMobile(TRUE);
+						m_pMasterMiss->SetMasked(true);
+						m_pMasterMiss->SetMobile(true);
 						m_pMasterMiss->SetZOrder(SPRITE_TOPMOST);
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -534,12 +534,12 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
 
 				// this BMP uses the same palette as entire game
 				//
-				if (m_pMasterHarpoon->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pMasterHarpoon->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pMasterHarpoon->LoadResourceSprite(pDC, IDB_HARPOON) != FALSE) {
+					if (m_pMasterHarpoon->LoadResourceSprite(pDC, IDB_HARPOON) != false) {
 
-						m_pMasterHarpoon->SetMasked(TRUE);
-						m_pMasterHarpoon->SetMobile(TRUE);
+						m_pMasterHarpoon->SetMasked(true);
+						m_pMasterHarpoon->SetMobile(true);
 					} else {
 						errCode = ERR_UNKNOWN;
 					}
@@ -558,12 +558,12 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
 
 				// this BMP uses the same palette as entire game
 				//
-				if (m_pOctopus->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pOctopus->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pOctopus->LoadResourceSprite(pDC, IDB_OCTOPUS) != FALSE) {
+					if (m_pOctopus->LoadResourceSprite(pDC, IDB_OCTOPUS) != false) {
 						m_pOctopus->SetZOrder(SPRITE_BACKGROUND);
-						m_pOctopus->SetMasked(FALSE);
-						m_pOctopus->SetMobile(FALSE);
+						m_pOctopus->SetMasked(false);
+						m_pOctopus->SetMobile(false);
 						m_pOctopus->SetPosition(OCTOPUS_X, OCTOPUS_Y);
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -585,13 +585,13 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
 
 					// attach sprite to the Game Palette
 					//
-					if (m_pFish[i]->SharePalette(m_pGamePalette) != FALSE) {
+					if (m_pFish[i]->SharePalette(m_pGamePalette) != false) {
 
-						if (m_pFish[i]->LoadResourceSprite(pDC, IDB_FISH + i) != FALSE) {
+						if (m_pFish[i]->LoadResourceSprite(pDC, IDB_FISH + i) != false) {
 
-							m_pFish[i]->SetTypeCode(FALSE);
-							m_pFish[i]->SetMasked(TRUE);
-							m_pFish[i]->SetMobile(TRUE);
+							m_pFish[i]->SetTypeCode(false);
+							m_pFish[i]->SetMasked(true);
+							m_pFish[i]->SetMobile(true);
 							m_pFish[i]->SetZOrder(SPRITE_BACKGROUND);
 							//m_pFish[i]->SetPosition(ptFishBin[i]);
 							//m_pFish[i]->LinkSprite();
@@ -616,15 +616,15 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
 
 					// attach good guy to the Game Palette
 					//
-					if (m_pEnemyFish[i]->SharePalette(m_pGamePalette) != FALSE) {
+					if (m_pEnemyFish[i]->SharePalette(m_pGamePalette) != false) {
 
-						if (m_pEnemyFish[i]->LoadResourceSprite(pDC, IDB_HOOK + i) != FALSE) {
+						if (m_pEnemyFish[i]->LoadResourceSprite(pDC, IDB_HOOK + i) != false) {
 
-							// TRUE if linked into chain, FALSE otherwise
-							m_pEnemyFish[i]->SetTypeCode(FALSE);
+							// true if linked into chain, false otherwise
+							m_pEnemyFish[i]->SetTypeCode(false);
 
-							m_pEnemyFish[i]->SetMasked(TRUE);
-							m_pEnemyFish[i]->SetMobile(TRUE);
+							m_pEnemyFish[i]->SetMasked(true);
+							m_pEnemyFish[i]->SetMobile(true);
 							m_pEnemyFish[i]->SetPosition(ptFishHooks[i]);
 						} else {
 							errCode = ERR_UNKNOWN;
@@ -721,7 +721,7 @@ void CBFishWindow::ReleaseMasterSprites(void) {
 void CBFishWindow::OnPaint() {
 	PAINTSTRUCT lpPaint;
 
-	Invalidate(FALSE);
+	Invalidate(false);
 	BeginPaint(&lpPaint);
 	PaintScreen();
 	EndPaint(&lpPaint);
@@ -868,10 +868,10 @@ ERROR_CODE CBFishWindow::RepaintSpriteList(CDC *pDC) {
 *
 *  RETURN VALUE:
 *
-*       BOOL = TRUE if message was handled
+*       bool = true if message was handled
 *
 ****************************************************************/
-BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	CMainMenu COptionsWind((CWnd *)this,
 	                       m_pGamePalette,
 	                       (pGameParams->bPlayingMetagame ? (NO_NEWGAME | NO_OPTIONS) : 0) | (m_bGameActive || m_bUserEditMode ? 0 : NO_RETURN),
@@ -890,7 +890,7 @@ BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 			GamePause();
 
-			m_bInMenu = TRUE;
+			m_bInMenu = true;
 
 			if ((pDC = GetDC()) != nullptr) {
 				m_pScrollSprite->EraseSprite(pDC);
@@ -923,7 +923,7 @@ BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 				ReleaseDC(pDC);
 			}
 
-			m_bInMenu = FALSE;
+			m_bInMenu = false;
 
 			if (!pGameParams->bMusicEnabled && (m_pSoundTrack != nullptr)) {
 
@@ -941,7 +941,7 @@ BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 			GameResume();
 
-			return TRUE;
+			return true;
 
 		case COMPUTERS_TURN:
 
@@ -981,7 +981,7 @@ BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			}
 
 			m_nTurns = m_nUserFish;
-			m_bUsersTurn = TRUE;
+			m_bUsersTurn = true;
 
 			FlushInputEvents();
 
@@ -1025,7 +1025,7 @@ BOOL CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 void CBFishWindow::PlaceTurnHarpoons(void) {
@@ -1089,7 +1089,7 @@ void CBFishWindow::RemoveTurnHarpoon(void) {
 *
 ****************************************************************/
 void CBFishWindow::GamePause(void) {
-	m_bPause = TRUE;
+	m_bPause = true;
 };
 
 
@@ -1111,7 +1111,7 @@ void CBFishWindow::GamePause(void) {
 *
 ****************************************************************/
 void CBFishWindow::GameResume(void) {
-	m_bPause = FALSE;
+	m_bPause = false;
 };
 
 
@@ -1197,20 +1197,20 @@ void CBFishWindow::PlaceUserFish(void) {
 	//
 	// Initiate User-Edit-Mode (Allow user to drag and drop fish to grid)
 	//
-	m_bUserEditMode = TRUE;
+	m_bUserEditMode = true;
 }
 
 
 void CBFishWindow::PlaceEnemyFish(void) {
 	int i, j, k;
 	int row, col, rowTmp, colTmp;
-	BOOL bFound;
+	bool bFound;
 
 	// For each fish, randomly select a location in the grid (rotate if neccessary)
 	//
 	for (i = 0; i < MAX_FISH; i++) {
 
-		bFound = FALSE;
+		bFound = false;
 		do {
 
 			// select random starting square
@@ -1236,7 +1236,7 @@ void CBFishWindow::PlaceEnemyFish(void) {
 
 				// Does the fish fit at this location
 				//
-				bFound = TRUE;
+				bFound = true;
 				for (k = 0; k < MAX_FISH_SIZE; k++) {
 
 					// if there are no more squares for this fish, then done
@@ -1250,7 +1250,7 @@ void CBFishWindow::PlaceEnemyFish(void) {
 					colTmp = (m_aEnemyFishInfo[i].nLoc[k].y += col);
 
 					if ((rowTmp >= GRID_ROWS) || (colTmp >= GRID_COLS) || (m_nEnemyGrid[rowTmp][colTmp] != EMPTY)) {
-						bFound = FALSE;
+						bFound = false;
 						break;
 					}
 				}
@@ -1317,17 +1317,17 @@ void CBFishWindow::LoadIniSettings(void) {
 
 		case SKILLLEVEL_LOW:
 			m_nDifficultyLevel = 1;
-			m_bUsersTurn = TRUE;
+			m_bUsersTurn = true;
 			break;
 
 		case SKILLLEVEL_MEDIUM:
 			m_nDifficultyLevel = 1;
-			m_bUsersTurn = FALSE;
+			m_bUsersTurn = false;
 			break;
 
 		case SKILLLEVEL_HIGH:
 			m_nDifficultyLevel = 2;
-			m_bUsersTurn = FALSE;
+			m_bUsersTurn = false;
 			break;
 
 		default:
@@ -1345,9 +1345,9 @@ void CBFishWindow::LoadIniSettings(void) {
 			m_nDifficultyLevel = DIFF_DEF;
 
 		nVal = GetPrivateProfileInt(INI_SECTION, "UserGoesFirst", 0, INI_FILENAME);
-		m_bUsersTurn = FALSE;
+		m_bUsersTurn = false;
 		if (nVal != 0)
-			m_bUsersTurn = TRUE;
+			m_bUsersTurn = true;
 	}
 }
 
@@ -1399,13 +1399,13 @@ void CBFishWindow::GameReset(void) {
 	if (pGameParams->bSoundEffectsEnabled)
 		sndPlaySound(nullptr, SND_ASYNC);          // stop all sounds
 
-	m_bGameActive = FALSE;                      // there is no active game
+	m_bGameActive = false;                      // there is no active game
 
-	m_bPause = FALSE;                           // the game is not paused
+	m_bPause = false;                           // the game is not paused
 
-	m_bUserEditMode = FALSE;                    // user can't edit board
+	m_bUserEditMode = false;                    // user can't edit board
 
-	m_bMovingFish = FALSE;                      // user is not moving fish
+	m_bMovingFish = false;                      // user is not moving fish
 
 	if ((pDC = GetDC()) != nullptr) {              // erase all sprites from the screen
 		CSprite::EraseSprites(pDC);
@@ -1417,11 +1417,11 @@ void CBFishWindow::GameReset(void) {
 			assert(m_pEnemyFish[i] != nullptr);
 			if (m_pEnemyFish[i]->GetTypeCode()) {
 				m_pEnemyFish[i]->UnlinkSprite();
-				m_pEnemyFish[i]->SetTypeCode(FALSE);
+				m_pEnemyFish[i]->SetTypeCode(false);
 			}
 
 			if (m_pFish[i]->GetTypeCode()) {    // need to re-rotate this fish
-				m_pFish[i]->SetTypeCode(FALSE);
+				m_pFish[i]->SetTypeCode(false);
 				m_pFish[i]->LoadResourceSprite(pDC, IDB_FISH + i);
 			}
 		}
@@ -1460,7 +1460,7 @@ void CBFishWindow::GameReset(void) {
 
 	m_nTurns = 1;                               // User has first turn
 
-	m_bStillCheck = FALSE;                      // Computer AI starts fresh
+	m_bStillCheck = false;                      // Computer AI starts fresh
 }
 
 
@@ -1471,16 +1471,16 @@ void CBFishWindow::RotateFish(int nFishIndex) {
 	CSprite *pSprite;
 	CDC *pDC;
 	int nIDB;
-	BOOL bRotated, bPaintFish;
+	bool bRotated, bPaintFish;
 
 	// validate the index
 	assert((nFishIndex >= 0) && (nFishIndex < MAX_FISH));
 
 	// must be in User-Edit Mode to rotate a fish
-	assert(m_bUserEditMode == TRUE);
+	assert(m_bUserEditMode == true);
 
 	// game can not yet be active
-	assert(m_bGameActive == FALSE);
+	assert(m_bGameActive == false);
 
 	pSprite = m_pFish[nFishIndex];
 
@@ -1541,10 +1541,10 @@ void CBFishWindow::RotateFish(int nFishIndex) {
 			rect.SetRect(point.x, point.y, point.x + size.cy, point.y + size.cx);
 
 			// assume we can rotate
-			bPaintFish = TRUE;
+			bPaintFish = true;
 
-			if (!OkToPlaceFish(nFishIndex, m_pFish[nFishIndex]->GetPosition(), (m_pFish[nFishIndex]->GetTypeCode() ? FALSE : TRUE))) {
-				bPaintFish = FALSE;
+			if (!OkToPlaceFish(nFishIndex, m_pFish[nFishIndex]->GetPosition(), (m_pFish[nFishIndex]->GetTypeCode() ? false : true))) {
+				bPaintFish = false;
 			}
 
 			// Ok, it is safe to rotate
@@ -1635,16 +1635,16 @@ void CBFishWindow::AssignFishToGrid(int nFishIndex) {
 
 int CBFishWindow::GetUserGridIndex(CPoint point) {
 	int i, j, iVal, jVal, nGridIndex;
-	BOOL bEndLoop;
+	bool bEndLoop;
 
 	iVal = -1;
 	jVal = -1;
-	bEndLoop = FALSE;
+	bEndLoop = false;
 	for (i = 0; i < GRID_ROWS; i++) {
 		for (j = 0; j < GRID_COLS; j++) {
 			if ((point.x == gLeftGrid[i][j].x) && (point.y == gLeftGrid[i][j].y)) {
 				assert(iVal == -1 && jVal == -1);
-				bEndLoop = TRUE;
+				bEndLoop = true;
 				iVal = i;
 				jVal = j;
 				break;
@@ -1709,7 +1709,7 @@ void CBFishWindow::OnRButtonDown(unsigned int, CPoint point) {
 
 	if (m_bUserEditMode) {
 
-		assert(m_bGameActive != TRUE);
+		assert(m_bGameActive != true);
 
 		if (m_bMovingFish) {
 
@@ -1759,7 +1759,7 @@ void CBFishWindow::OnLButtonDown(unsigned int, CPoint point) {
 	CDC    *pDC;
 	int     i,
 	        nPick;
-	BOOL    bOkToPlay;
+	bool    bOkToPlay;
 
 	tmpRect = m_pScrollSprite->GetRect();
 
@@ -1813,11 +1813,11 @@ void CBFishWindow::OnLButtonDown(unsigned int, CPoint point) {
 
 			// Check to make sure all fish are correctly placed
 			//
-			bOkToPlay = TRUE;
+			bOkToPlay = true;
 			for (i = 0; i < MAX_FISH; i++) {
 				ptTmp = m_pFish[i]->GetPosition();
 				if (ptTmp.x == ptFishBin[i].x && ptTmp.y == ptFishBin[i].y) {
-					bOkToPlay = FALSE;
+					bOkToPlay = false;
 					break;
 				}
 			}
@@ -1833,8 +1833,8 @@ void CBFishWindow::OnLButtonDown(unsigned int, CPoint point) {
 					ReleaseDC(pDC);
 				}
 
-				m_bUserEditMode = FALSE;
-				m_bGameActive = TRUE;
+				m_bUserEditMode = false;
+				m_bGameActive = true;
 				m_nTurns = m_nUserFish;
 
 
@@ -1910,7 +1910,7 @@ void CBFishWindow::OnLButtonDown(unsigned int, CPoint point) {
 
 					if (tmpRect.PtInRect(point)) {
 
-						m_bMovingFish = TRUE;
+						m_bMovingFish = true;
 						m_pDragFish = m_pFish[i];
 						m_cLastPoint = m_pDragFish->GetPosition();
 						m_bLastRotated = m_pDragFish->GetTypeCode();
@@ -1944,7 +1944,7 @@ void CBFishWindow::OnLButtonDown(unsigned int, CPoint point) {
 				if (m_nTurns == 0) {
 					// Computers turn to shoot
 					//
-					m_bUsersTurn = FALSE;
+					m_bUsersTurn = false;
 					SendMessage(WM_COMMAND, COMPUTERS_TURN, BN_CLICKED);
 				}
 
@@ -1983,21 +1983,21 @@ void CBFishWindow::OnLButtonUp(unsigned int, CPoint point) {
 	CRect rect, tmpRect;
 	CDC *pDC;
 	int i;
-	BOOL bRevert;
+	bool bRevert;
 
 	if (m_bUserEditMode && m_bMovingFish) {
 
-		assert(m_bGameActive != TRUE);
+		assert(m_bGameActive != true);
 		assert(m_pDragFish != nullptr);
 
-		m_bMovingFish = FALSE;
+		m_bMovingFish = false;
 
 		size = m_pDragFish->GetSize();
 		point.x -= size.cx / 2;
 		point.y -= size.cy / 2;
 
 		point = SnapToGrid(point);
-		bRevert = FALSE;
+		bRevert = false;
 
 		// test for valid fish placement
 		//
@@ -2005,7 +2005,7 @@ void CBFishWindow::OnLButtonUp(unsigned int, CPoint point) {
 
 		if (!OkToPlaceFish(GetFishIndex(m_pDragFish), point, m_pDragFish->GetTypeCode())) {
 			point = m_cLastPoint;
-			bRevert = TRUE;
+			bRevert = true;
 		}
 
 		// drop fish
@@ -2039,20 +2039,20 @@ void CBFishWindow::OnLButtonUp(unsigned int, CPoint point) {
 	}
 }
 
-BOOL CBFishWindow::OkToPlaceFish(int nFishIndex, CPoint point, BOOL bRotated) {
+bool CBFishWindow::OkToPlaceFish(int nFishIndex, CPoint point, bool bRotated) {
 	int i, nRow, nCol, nGridIndex, nID;
-	BOOL bOk;
+	bool bOk;
 
 	nID = IndexToId(nFishIndex);
 	nGridIndex = GetUserGridIndex(point);
 
 	// assume the fish will fit
-	bOk = TRUE;
+	bOk = true;
 
 	// if point is not in the grid, then we can't put the fish here
 	//
 	if (nGridIndex == -1) {
-		bOk = FALSE;
+		bOk = false;
 
 	} else {
 
@@ -2073,14 +2073,14 @@ BOOL CBFishWindow::OkToPlaceFish(int nFishIndex, CPoint point, BOOL bRotated) {
 			// do not exceed grid boundary
 			//
 			if (nRow < 0 || nRow >= GRID_ROWS || nCol < 0 || nCol >= GRID_COLS) {
-				bOk = FALSE;
+				bOk = false;
 				break;
 			}
 
 			// can't put the new fish into a non-empty square
 			//
 			if ((m_nUserGrid[nRow][nCol] != EMPTY) && (m_nUserGrid[nRow][nCol] != (byte)nID)) {
-				bOk = FALSE;
+				bOk = false;
 				break;
 			}
 		}
@@ -2360,7 +2360,7 @@ void CBFishWindow::SinkEnemyFish(int nFishIndex) {
 
 	assert(pSprite != nullptr);
 
-	pSprite->SetTypeCode(TRUE);
+	pSprite->SetTypeCode(true);
 	pSprite->LinkSprite();
 
 	if ((pDC = GetDC()) != nullptr) {
@@ -2415,8 +2415,8 @@ void CBFishWindow::ComputersTurn(void) {
 			// get index to fish
 			nFishIndex = IdToIndex(nSquare);
 
-			if ((m_bStillCheck == FALSE) || (m_nDifficultyLevel == DIFF_AVERAGE)) {
-				m_bStillCheck = TRUE;
+			if ((m_bStillCheck == false) || (m_nDifficultyLevel == DIFF_AVERAGE)) {
+				m_bStillCheck = true;
 				nLastRow = nRow;
 				nLastCol = nCol;
 			}
@@ -2437,7 +2437,7 @@ void CBFishWindow::ComputersTurn(void) {
 			//
 			if (--m_aUserFishInfo[nFishIndex].life == 0) {
 
-				m_bStillCheck = FALSE;
+				m_bStillCheck = false;
 
 				assert(m_nUserFish > 0);
 
@@ -2538,19 +2538,19 @@ int CBFishWindow::SelectRandomTarget(void) {
 
 int CBFishWindow::SelectBurningTarget(void) {
 	int i, nGridIndex, nRow, nCol;
-	BOOL bFound;
+	bool bFound;
 
 	nRow = nCol = 0;
 
 	// try to re-aquire a fish we have already damaged, but has not yet sank
 	//
-	bFound = FALSE;
+	bFound = false;
 	for (i = 0; i < GRID_ROWS * GRID_COLS; i++) {
 		nRow = i / GRID_ROWS;
 		nCol = i % GRID_COLS;
 
 		if ((m_nUserGrid[nRow][nCol] & SHOT) && (m_nUserGrid[nRow][nCol] != (EMPTY | SHOT))) {
-			bFound = TRUE;
+			bFound = true;
 			break;
 		}
 	}
@@ -2605,15 +2605,15 @@ int CBFishWindow::SelectBestFitTarget(void) {
 	return nGridIndex;
 }
 
-BOOL CBFishWindow::FishFits(int nFishIndex, int row, int col) {
+bool CBFishWindow::FishFits(int nFishIndex, int row, int col) {
 	FISH cFishInfo;
 	int nRow, nCol, colTmp, rowTmp;
 	int i, j, k, rotate;
-	BOOL bFound;
+	bool bFound;
 
 	// Try fish at both 0 and 90 degrees
 	//
-	bFound = FALSE;
+	bFound = false;
 	for (i = 0; i < 2; i++) {
 
 		rotate = brand() & 1;
@@ -2641,7 +2641,7 @@ BOOL CBFishWindow::FishFits(int nFishIndex, int row, int col) {
 
 				// Does the fish fit at this location
 				//
-				bFound = TRUE;
+				bFound = true;
 				for (k = 0; k < MAX_FISH_SIZE; k++) {
 
 					// if there are no more squares for this fish, then done
@@ -2655,7 +2655,7 @@ BOOL CBFishWindow::FishFits(int nFishIndex, int row, int col) {
 					colTmp = (cFishInfo.nLoc[k].y += nCol);
 
 					if ((rowTmp >= GRID_ROWS) || (colTmp >= GRID_COLS) || (m_nUserGrid[rowTmp][colTmp] == (EMPTY | SHOT))) {
-						bFound = FALSE;
+						bFound = false;
 						break;
 					}
 				}
@@ -2862,7 +2862,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 	int row, col, rowTmp, colTmp, nGridIndex;
 	int nUseRow, nUseCol;
 	int nHits, nBestHits;
-	BOOL bFound, bUse;
+	bool bFound, bUse;
 
 	rowTmp = colTmp = 0;
 	nBestRow = nBestCol = 0;
@@ -2890,11 +2890,11 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 
 	// Try to match a fish pattern onto the grid
 	//
-	bUse = FALSE;
-	bFound = FALSE;
+	bUse = false;
+	bFound = false;
 	for (i = MAX_FISH - 1; i >= 0; i--) {
 
-		bFound = FALSE;
+		bFound = false;
 		if (m_aUserFishInfo[i].life != 0) {
 
 			// Try fish at both 0 and 90 degrees
@@ -2902,7 +2902,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 			rotate = brand() & 1;
 			for (j = 0; j < 2; j++) {
 
-				bFound = FALSE;
+				bFound = false;
 				for (l = 0; l < MAX_FISH_SIZE; l++) {
 
 					// make a fresh copy of this fish
@@ -2927,7 +2927,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 
 						// Does the fish fit at this location
 						//
-						bFound = TRUE;
+						bFound = true;
 						for (k = 0; k < MAX_FISH_SIZE; k++) {
 
 							// if there are no more squares for this fish, then done
@@ -2941,7 +2941,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 							colTmp = (cFishInfo.nLoc[k].y += nCol);
 
 							if ((rowTmp < 0) || (rowTmp >= GRID_ROWS) || (colTmp < 0) || (colTmp >= GRID_COLS) || (m_nUserGrid[rowTmp][colTmp] == (EMPTY | SHOT))) {
-								bFound = FALSE;
+								bFound = false;
 								break;
 							}
 						}
@@ -2949,7 +2949,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 						// Check to see if we can shoot one of these spots
 						//
 						if (bFound) {
-							bFound = FALSE;
+							bFound = false;
 							nLast = -1;
 							nBestRow = row;
 							nBestCol = col;
@@ -2976,7 +2976,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 										nBestCol = colTmp;
 										nLast = n;
 									}
-									bFound = TRUE;
+									bFound = true;
 								} else if (m_nUserGrid[rowTmp][colTmp] & IndexToId(i)) {
 									nHits++;
 								}
@@ -2995,7 +2995,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 								nBestHits = nHits;
 								nUseRow = rowTmp = nBestRow;
 								nUseCol = colTmp = nBestCol;
-								bUse = TRUE;
+								bUse = true;
 							}
 						}
 					}
@@ -3026,7 +3026,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 	int nRow, nCol, nBestRow, nBestCol;
 	int n, nLast;
 	int row, col, rowTmp, colTmp, nGridIndex;
-	BOOL bFound;
+	bool bFound;
 
 	rowTmp = colTmp = 0;
 	nBestRow = nBestCol = 0;
@@ -3053,10 +3053,10 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 
 	// Try to match a fish pattern onto the grid
 	//
-	bFound = FALSE;
+	bFound = false;
 	for (i = MAX_FISH - 1; i >= 0; i--) {
 
-		bFound = FALSE;
+		bFound = false;
 		if (m_aUserFishInfo[i].life != 0) {
 
 			// Try fish at both 0 and 90 degrees
@@ -3064,7 +3064,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 			rotate = brand() & 1;
 			for (j = 0; j < 2; j++) {
 
-				bFound = FALSE;
+				bFound = false;
 				for (l = 0; l < MAX_FISH_SIZE; l++) {
 
 					// make a fresh copy of this fish
@@ -3089,7 +3089,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 
 						// Does the fish fit at this location
 						//
-						bFound = TRUE;
+						bFound = true;
 						for (k = 0; k < MAX_FISH_SIZE; k++) {
 
 							// if there are no more squares for this fish, then done
@@ -3103,7 +3103,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 							colTmp = (cFishInfo.nLoc[k].y += nCol);
 
 							if ((rowTmp < 0) || (rowTmp >= GRID_ROWS) || (colTmp < 0) || (colTmp >= GRID_COLS) || (m_nUserGrid[rowTmp][colTmp] == (EMPTY | SHOT))) {
-								bFound = FALSE;
+								bFound = false;
 								break;
 							}
 						}
@@ -3111,7 +3111,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 						// Check to see if we can shoot one of these spots
 						//
 						if (bFound) {
-							bFound = FALSE;
+							bFound = false;
 							nLast = -1;
 							nBestRow = row;
 							nBestCol = col;
@@ -3136,7 +3136,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 										nBestCol = colTmp;
 										nLast = n;
 									}
-									bFound = TRUE;
+									bFound = true;
 								}
 							}
 							if (bFound) {
@@ -3167,7 +3167,7 @@ int CBFishWindow::FindMatch(int nLastHitRow, int nLastHitCol) {
 	assert(bFound);
 
 	if (!bFound) {
-		assert(m_bStillCheck == FALSE);
+		assert(m_bStillCheck == false);
 		rowTmp = row;
 		colTmp = col;
 	}
@@ -3200,14 +3200,14 @@ void CBFishWindow::CreatePlume(CPoint point) {
 
 			// attach good guy to the Game Palette
 			//
-			if (pSprite->SharePalette(m_pGamePalette) != FALSE) {
+			if (pSprite->SharePalette(m_pGamePalette) != false) {
 
-				if (pSprite->LoadResourceSprite(pDC, IDB_PLUME) != FALSE) {
+				if (pSprite->LoadResourceSprite(pDC, IDB_PLUME) != false) {
 
 					pSprite->LoadResourceCels(pDC, IDB_APLUME, N_PLUME_CELS);
 
-					pSprite->SetMasked(TRUE);
-					pSprite->SetMobile(TRUE);
+					pSprite->SetMasked(true);
+					pSprite->SetMobile(true);
 
 					for (i = 0; i < N_PLUME_CELS; i++) {
 						pSprite->PaintSprite(pDC, point);
@@ -3266,14 +3266,14 @@ void CBFishWindow::CreateHarpoon(CPoint point) {
 
 			// attach good guy to the Game Palette
 			//
-			if (pSprite->SharePalette(m_pGamePalette) != FALSE) {
+			if (pSprite->SharePalette(m_pGamePalette) != false) {
 
-				if (pSprite->LoadResourceSprite(pDC, IDB_HARP) != FALSE) {
+				if (pSprite->LoadResourceSprite(pDC, IDB_HARP) != false) {
 
 					pSprite->LoadResourceCels(pDC, IDB_AHARP, N_HARP_CELS);
 
-					pSprite->SetMasked(TRUE);
-					pSprite->SetMobile(TRUE);
+					pSprite->SetMasked(true);
+					pSprite->SetMobile(true);
 
 					for (i = 0; i < N_HARP_CELS; i++) {
 						pSprite->PaintSprite(pDC, point);
@@ -3542,20 +3542,20 @@ void CBFishWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned
 *
 *       unsigned int nState = WA_ACTIVE, WA_CLICKACTIVE or WA_INACTIVE
 *       CWnd *pWnd  = Pointer to Window that is losing/gaining activation
-*       BOOL bMin   = TRUE if this app is minimized
+*       bool bMin   = true if this app is minimized
 *
 *  RETURN VALUE:
 *
 *       None
 *
 ****************************************************************/
-void CBFishWindow::OnActivate(unsigned int nState, CWnd *, BOOL bMinimized) {
+void CBFishWindow::OnActivate(unsigned int nState, CWnd *, bool bMinimized) {
 	if (!bMinimized) {
 
 		switch (nState) {
 		case WA_ACTIVE:
 		case WA_CLICKACTIVE:
-			//InvalidateRect(nullptr, FALSE);
+			//InvalidateRect(nullptr, false);
 			break;
 
 		case WA_INACTIVE:
@@ -3572,14 +3572,14 @@ void CBFishWindow::FlushInputEvents(void) {
 
 	// find and remove all keyboard events
 	//
-	while (TRUE) {
+	while (true) {
 		if (!PeekMessage(&msg, nullptr, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE))
 			break;
 	}
 
 	// find and remove all mouse events
 	//
-	while (TRUE) {
+	while (true) {
 		if (!PeekMessage(&msg, nullptr, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE))
 			break;
 	}
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.h b/engines/bagel/hodjnpodj/battlefish/bfish.h
index 257e9b1f4f6..f31a85f4531 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.h
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.h
@@ -70,7 +70,7 @@ protected:
 	int         GetEnemyGridIndex(CPoint);
 	int         GetUserGridIndex(CPoint);
 	int         GetFishIndex(CSprite *);
-	BOOL        OkToPlaceFish(int, CPoint, BOOL);
+	bool        OkToPlaceFish(int, CPoint, bool);
 	void        PlaceFish(int, CPoint);
 	int         IndexToId(int);
 	int         IdToIndex(int);
@@ -83,7 +83,7 @@ protected:
 	int         FindNeighborTarget(int, int);
 	int         FindTarget(int, int);
 	int         FindMatch(int, int);
-	BOOL        FishFits(int, int, int);
+	bool        FishFits(int, int, int);
 	int         GetNeighbors(int, int);
 	void        CreatePlume(CPoint);
 	void        CreateHarpoon(CPoint);
@@ -92,7 +92,7 @@ protected:
 	void        PlaceTurnHarpoons(void);
 	void        RemoveTurnHarpoon(void);
 
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	LRESULT     OnMCINotify(WPARAM, LPARAM);
 	LRESULT     OnMMIONotify(WPARAM, LPARAM);
 	void        OnSoundNotify(CSound *);
@@ -104,7 +104,7 @@ protected:
 	void        OnSysChar(unsigned int, unsigned int, unsigned int);
 	void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	void        OnKeyDown(unsigned int, unsigned int, unsigned int);
-	void        OnActivate(unsigned int, CWnd *, BOOL) override;
+	void        OnActivate(unsigned int, CWnd *, bool) override;
 	void        OnClose(void);
 
 	DECLARE_MESSAGE_MAP()
@@ -134,14 +134,14 @@ protected:
 	int         m_nUserFish;
 	int         m_nTurns;
 	int         m_nDifficultyLevel;
-	BOOL        m_bGameActive;
-	BOOL        m_bPause;
-	BOOL        m_bUserEditMode;
-	BOOL        m_bMovingFish;
-	BOOL        m_bLastRotated;
-	BOOL        m_bStillCheck;
-	BOOL        m_bUsersTurn;
-	BOOL        m_bInMenu;
+	bool        m_bGameActive;
+	bool        m_bPause;
+	bool        m_bUserEditMode;
+	bool        m_bMovingFish;
+	bool        m_bLastRotated;
+	bool        m_bStillCheck;
+	bool        m_bUsersTurn;
+	bool        m_bInMenu;
 };
 
 } // namespace Battlefish
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
index 694e5238360..6432e037e44 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
@@ -57,7 +57,7 @@ CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	DoModal();
 }
 
-BOOL CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog(void) {
 	CRect tmpRect;
 	CDC *pDC;
 
@@ -69,7 +69,7 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 	tmpRect.SetRect(22, 135, 122, 155);
 	if ((m_pScrollBar = new CScrollBar) != nullptr) {
 		m_pScrollBar->Create(WS_VISIBLE | WS_CHILD | SBS_HORZ | SBS_BOTTOMALIGN, tmpRect, this, ID_LIMIT);
-		m_pScrollBar->SetScrollRange(DIFF_MIN, DIFF_MAX, TRUE);
+		m_pScrollBar->SetScrollRange(DIFF_MIN, DIFF_MAX, true);
 	}
 
 	if ((pDC = GetDC()) != nullptr) {
@@ -121,12 +121,12 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 		m_pCompButton->SetControl(ID_COMPUTER, this);
 	}
 
-	m_bSave = FALSE;
+	m_bSave = false;
 
 	LoadIniSettings();
 
 	PutDlgData();
-	return TRUE;
+	return true;
 }
 
 
@@ -140,13 +140,13 @@ void CUserCfgDlg::PutDlgData() {
 void CUserCfgDlg::GetDlgData() {
 	m_nDifficultyLevel = m_pScrollBar->GetScrollPos();
 
-	m_bUserGoesFirst = FALSE;
+	m_bUserGoesFirst = false;
 	if (m_pUserButton->GetCheck() == 1)
-		m_bUserGoesFirst = TRUE;
+		m_bUserGoesFirst = true;
 }
 
 
-BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	//
 	// respond to user
 	//
@@ -155,23 +155,23 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 		switch (wParam) {
 
 		case IDOK:
-			m_bSave = TRUE;
+			m_bSave = true;
 			ClearDialogImage();
 			EndDialog(IDOK);
-			return FALSE;
+			return false;
 
 		case IDCANCEL:
 			ClearDialogImage();
 			EndDialog(IDCANCEL);
-			return FALSE;
+			return false;
 
 		case ID_PLAYER:
-			m_bUserGoesFirst = TRUE;
+			m_bUserGoesFirst = true;
 			PutDlgData();
 			break;
 
 		case ID_COMPUTER:
-			m_bUserGoesFirst = FALSE;
+			m_bUserGoesFirst = false;
 			PutDlgData();
 			break;
 
@@ -277,7 +277,7 @@ void CUserCfgDlg::LoadIniSettings(void) {
 	// Get the UserGoesFirst option setting
 	//
 	nVal = GetPrivateProfileInt(INI_SECTION, "UserGoesFirst", TURN_DEF, INI_FILENAME);
-	m_bUserGoesFirst = (nVal == 0 ? FALSE : TRUE);
+	m_bUserGoesFirst = (nVal == 0 ? false : true);
 }
 
 void CUserCfgDlg::SaveIniSettings() {
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.h b/engines/bagel/hodjnpodj/battlefish/usercfg.h
index 3ddcb3244a9..e5e06f6108d 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.h
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.h
@@ -37,7 +37,7 @@ namespace Battlefish {
 #define DIFF_MAX    2
 #define DIFF_DEF    2
 
-#define TURN_DEF    FALSE
+#define TURN_DEF    false
 
 class CUserCfgDlg : public CBmpDialog {
 public:
@@ -45,8 +45,8 @@ public:
 
 protected:
 
-	virtual BOOL OnCommand(WPARAM, LPARAM) override;
-	virtual BOOL OnInitDialog(void) override;
+	virtual bool OnCommand(WPARAM, LPARAM) override;
+	virtual bool OnInitDialog(void) override;
 	void PutDlgData(void);
 	void GetDlgData(void);
 	void DispLimit(void);
@@ -69,8 +69,8 @@ protected:
 	CText        *m_pTxtOrder;
 	CScrollBar   *m_pScrollBar;
 	unsigned int          m_nDifficultyLevel;       // Difficulty level for BattleFish
-	BOOL          m_bSave;                  // True if should save theses settings
-	BOOL          m_bUserGoesFirst;         // TRUE if Human player goes 1st
+	bool          m_bSave;                  // True if should save theses settings
+	bool          m_bUserGoesFirst;         // true if Human player goes 1st
 };
 
 } // namespace Battlefish
diff --git a/engines/bagel/hodjnpodj/beacon/beacon.cpp b/engines/bagel/hodjnpodj/beacon/beacon.cpp
index 643e8f415a3..9490734b8a3 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.cpp
+++ b/engines/bagel/hodjnpodj/beacon/beacon.cpp
@@ -39,8 +39,8 @@ namespace Beacon {
 
 void CALLBACK GetSubOptions(CWnd *pParentWind);
 void CALLBACK StepAlongLine(int xpos, int ypos, CDC *cdc);
-BOOL InArtRegion(CPoint point);
-void MyFocusRect(CDC *pDC, CRect rect, BOOL bPressed);
+bool InArtRegion(CPoint point);
+void MyFocusRect(CDC *pDC, CRect rect, bool bPressed);
 
 CBmpButton  *m_pScrollButton;               // Scroll button
 
@@ -63,11 +63,11 @@ CDC         *pArtDC = nullptr,
 CText       *m_pScoreTxt = nullptr;
 CText       *m_pSweepTxt = nullptr;
 
-BOOL        bSuccess;
-BOOL        m_bIgnoreScrollClick;
-BOOL        bChanged;
-BOOL        bPlaying = FALSE;
-BOOL        bNewGame = FALSE;                           // Not playing a game right now
+bool        bSuccess;
+bool        m_bIgnoreScrollClick;
+bool        bChanged;
+bool        bPlaying = false;
+bool        bNewGame = false;                           // Not playing a game right now
 
 unsigned int        nCurrentIndex = BUTTON_ENTRY;               // The current beacon color index
 unsigned int        nNextIndex = BUTTON_ENTRY;                  // The next beacon color index
@@ -83,11 +83,11 @@ unsigned int        m_nSweeps = MAX_SWEEPS;
 unsigned int        m_nSpeed = MAX_SPEED;
 unsigned int        tempSweeps = 100;                           // default sweeps = 100
 unsigned int        tempSpeed = MAX_SPEED;                      // default speed = Hovercraft
-BOOL        m_bAutomatic = FALSE;
-BOOL        m_bChangeAtTwelve = FALSE;
+bool        m_bAutomatic = false;
+bool        m_bChangeAtTwelve = false;
 float       m_Score = 0;
 
-BOOL        PictureGrid[NUM_COLUMNS][NUM_ROWS];
+bool        PictureGrid[NUM_COLUMNS][NUM_ROWS];
 
 static CSound   *pGameSound = nullptr;                             // Game theme song
 
@@ -141,7 +141,7 @@ CMainWindow::CMainWindow() {
 	pDC = GetDC();
 	pBorderBitmap = FetchBitmap(pDC, &pGamePalette, MAINSCREEN);
 
-	pOldPal = pDC->SelectPalette(pGamePalette, FALSE);  // select the game palette
+	pOldPal = pDC->SelectPalette(pGamePalette, false);  // select the game palette
 	pDC->RealizePalette();                              //...and realize it
 
 //	SetBeamEntries( pDC );
@@ -167,7 +167,7 @@ CMainWindow::CMainWindow() {
 	pScrollDown = nullptr;
 
 	ASSERT(bSuccess);
-	m_bIgnoreScrollClick = FALSE;
+	m_bIgnoreScrollClick = false;
 
 	pBackBitmap = new CBitmap();
 	pBackDC = new CDC();
@@ -175,7 +175,7 @@ CMainWindow::CMainWindow() {
 	pBackBitmap->CreateCompatibleBitmap(pDC, GAME_WIDTH, GAME_HEIGHT);
 	pBackDC->CreateCompatibleDC(pDC);
 	pOldBmp1 = pBackDC->SelectObject(pBackBitmap);
-	pOldPal1 = pBackDC->SelectPalette(pGamePalette, FALSE);
+	pOldPal1 = pBackDC->SelectPalette(pGamePalette, false);
 	pBackDC->RealizePalette();
 
 	pArtBitmap = new CBitmap();
@@ -184,7 +184,7 @@ CMainWindow::CMainWindow() {
 	pArtBitmap->CreateCompatibleBitmap(pDC, GAME_WIDTH, GAME_HEIGHT);
 	pArtDC->CreateCompatibleDC(pDC);
 	pOldBmp2 = pArtDC->SelectObject(pArtBitmap);
-	pOldPal2 = pArtDC->SelectPalette(pGamePalette, FALSE);
+	pOldPal2 = pArtDC->SelectPalette(pGamePalette, false);
 	pArtDC->RealizePalette();
 
 	PaintBitmap(pArtDC, pGamePalette, pBorderBitmap, 0, 0);      //SplashScreen to art bitmap
@@ -213,7 +213,7 @@ CMainWindow::CMainWindow() {
 
 		(*pArtDC).FillRect(colorBlock[i].rLocation, pMyBrush);
 
-		MyFocusRect(pArtDC, colorBlock[i].rLocation, FALSE);     // standard highlight on button
+		MyFocusRect(pArtDC, colorBlock[i].rLocation, false);     // standard highlight on button
 
 		if (pMyBrush != nullptr) {                         // If the brush was constructed, delete it
 			pMyBrush->DeleteObject();
@@ -224,7 +224,7 @@ CMainWindow::CMainWindow() {
 
 	statRect.SetRect(SIDE_BORDER + ART_WIDTH, TOP_BORDER,
 	                 GAME_WIDTH - SIDE_BORDER, GAME_HEIGHT - BOTTOM_BORDER);
-	MyFocusRect(pArtDC, statRect, FALSE);                // highlight button area
+	MyFocusRect(pArtDC, statRect, false);                // highlight button area
 
 	statRect.SetRect(BLOCK_OFFSET_X + 5, TOP_BORDER + 5, GAME_WIDTH - SIDE_BORDER, TOP_BORDER + 25);
 	if ((m_pScoreTxt = new CText()) != nullptr) {
@@ -236,7 +236,7 @@ CMainWindow::CMainWindow() {
 		(*m_pSweepTxt).SetupText(pDC, pGamePalette, &statRect, JUSTIFY_LEFT);
 	}
 
-	(*pDC).SelectPalette(pOldPal, FALSE);           // Select back the old palette
+	(*pDC).SelectPalette(pOldPal, false);           // Select back the old palette
 	ReleaseDC(pDC);
 
 	//srand((unsigned) time(nullptr));         // seed the random number generator
@@ -252,7 +252,7 @@ CMainWindow::CMainWindow() {
 	EndWaitCursor();
 
 	if (pGameInfo->bPlayingMetagame) {
-		bNewGame = TRUE;                                        // in meta start out in a game
+		bNewGame = true;                                        // in meta start out in a game
 		pGameInfo->lScore = 0L;                                 // Make sure if they bail out it's 0
 	} else
 		PostMessage(WM_COMMAND, IDC_SCROLL, BN_CLICKED);         // Activate the Options dialog
@@ -269,11 +269,11 @@ void CMainWindow::initStatics() {
 	pArtDC = pBackDC = nullptr;
 	m_pScoreTxt = m_pSweepTxt = nullptr;
 
-	bSuccess = FALSE;
-	m_bIgnoreScrollClick = FALSE;
-	bChanged = FALSE;
-	bPlaying = FALSE;
-	bNewGame = FALSE;
+	bSuccess = false;
+	m_bIgnoreScrollClick = false;
+	bChanged = false;
+	bPlaying = false;
+	bNewGame = false;
 
 	nCurrentIndex = BUTTON_ENTRY;
 	nNextIndex = BUTTON_ENTRY;
@@ -285,8 +285,8 @@ void CMainWindow::initStatics() {
 	m_nSpeed = MAX_SPEED;
 	tempSweeps = 100;
 	tempSpeed = MAX_SPEED;
-	m_bAutomatic = FALSE;
-	m_bChangeAtTwelve = FALSE;
+	m_bAutomatic = false;
+	m_bChangeAtTwelve = false;
 	m_Score = 0;
 }
 
@@ -303,10 +303,10 @@ void CMainWindow::OnPaint() {
 	char    msg[64];
 
 	pDC = GetDC();
-	pOldPal = (*pDC).SelectPalette(pGamePalette, FALSE);
+	pOldPal = (*pDC).SelectPalette(pGamePalette, false);
 	(*pDC).RealizePalette();
 
-	InvalidateRect(nullptr, FALSE);            // invalidate the entire window
+	InvalidateRect(nullptr, false);            // invalidate the entire window
 	BeginPaint(&lpPaint);
 
 	pBeaconBitmap = FetchResourceBitmap(pArtDC, nullptr, IDB_BEACON_BMP);
@@ -329,7 +329,7 @@ void CMainWindow::OnPaint() {
 
 	EndPaint(&lpPaint);
 
-	(*pDC).SelectPalette(pOldPal, FALSE);
+	(*pDC).SelectPalette(pOldPal, false);
 	ReleaseDC(pDC);
 }
 
@@ -349,7 +349,7 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 	int     radius;
 	float   degrees, x, y, radians, rads;
 
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);     // Select in game palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);     // Select in game palette
 	(*pDC).RealizePalette();                                // Use it
 
 	pBigBmp = new CBitmap();
@@ -361,7 +361,7 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 	ASSERT(bSuccess);
 	pBigBmpOld = pBigDC->SelectObject(pBigBmp);
 	ASSERT(pBigBmpOld != nullptr);
-	pBigPalOld = pBigDC->SelectPalette(pGamePalette, FALSE);
+	pBigPalOld = pBigDC->SelectPalette(pGamePalette, false);
 	pBigDC->RealizePalette();
 
 	Center.x = ART_WIDTH;
@@ -418,12 +418,12 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 	}
 
 	(*pDC).BitBlt(SIDE_BORDER, TOP_BORDER, ART_WIDTH, ART_HEIGHT, pBigDC, ART_WIDTH / 2, ART_HEIGHT / 2, SRCCOPY);
-	(*pDC).SelectPalette(pPalOld, FALSE);           // Select back the old palette
+	(*pDC).SelectPalette(pPalOld, false);           // Select back the old palette
 
 	if (pBigBmpOld != nullptr)                         // Get rid of Big stuff
 		pBigDC->SelectObject(pBigBmpOld);
 	if (pBigPalOld != nullptr)
-		pBigDC->SelectPalette(pBigPalOld, FALSE);
+		pBigDC->SelectPalette(pBigPalOld, false);
 	if (pBigDC->m_hDC != nullptr) {
 		pBigDC->DeleteDC();
 		delete pBigDC;
@@ -444,7 +444,7 @@ void CMainWindow::DrawBeams(CDC *pDC) {
 // typically in order to process control related activities.
 //
 
-BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	CDC *pDC = nullptr;
 
 	if (HIWORD(lParam) == BN_CLICKED) {
@@ -461,12 +461,12 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 		case IDC_RULES:
 			CSound::waitWaveSounds();
 
-			m_bIgnoreScrollClick = TRUE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
+			m_bIgnoreScrollClick = true;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
 			(void) RulesDlg.DoModal();
-			m_bIgnoreScrollClick = FALSE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
+			m_bIgnoreScrollClick = false;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
 
 			if (bPlaying) SetTimer(BEACON_TIMER, SPEED_BASE - (m_nSpeed * SPEED_STEP), nullptr);
 			SetBeamEntries(pDC);
@@ -474,19 +474,19 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 		case IDC_SCROLL:
 			if (m_bIgnoreScrollClick) {
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 				break;
 			}
 
-			m_bIgnoreScrollClick = TRUE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
-			SendDlgItemMessage(IDC_SCROLL, BM_SETSTATE, TRUE, 0L);
+			m_bIgnoreScrollClick = true;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
+			SendDlgItemMessage(IDC_SCROLL, BM_SETSTATE, true, 0L);
 
 			switch (COptionsWind.DoModal()) {
 
 			case IDC_OPTIONS_NEWGAME:                           // Selected New Game
-				bPlaying = FALSE;
-				MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, FALSE);    // erase highlight on nNextIndex
+				bPlaying = false;
+				MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, false);    // erase highlight on nNextIndex
 				NewGame();
 				char        msg[64];
 				Common::sprintf_s(msg, "Score: %.0f %%", m_Score);
@@ -495,13 +495,13 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 				Common::sprintf_s(msg, "Sweeps: %d", m_nSweepCount);
 				(*m_pSweepTxt).DisplayString(pDC, msg, 16, FW_BOLD, OPTIONS_COLOR);
 
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-				m_bIgnoreScrollClick = FALSE;
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+				m_bIgnoreScrollClick = false;
 				break;
 
 			case IDC_OPTIONS_RETURN:
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-				m_bIgnoreScrollClick = FALSE;
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+				m_bIgnoreScrollClick = false;
 				if (bPlaying)
 					SetTimer(BEACON_TIMER, SPEED_BASE - (m_nSpeed * SPEED_STEP), nullptr);
 				break;
@@ -509,7 +509,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			case IDC_OPTIONS_QUIT:                      // Quit button was clicked
 				PostMessage(WM_CLOSE, 0, 0);         // Post a program exit
 				ReleaseDC(pDC);
-				return FALSE;
+				return false;
 
 			} //end switch(ComDlg.DoModal())
 
@@ -518,7 +518,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			//
 			// Check to see if the music state was changed and adjust to match it
 			//
-			if ((pGameInfo->bMusicEnabled == FALSE) && (pGameSound != nullptr)) {
+			if ((pGameInfo->bMusicEnabled == false) && (pGameSound != nullptr)) {
 				if (pGameSound->playing())
 					pGameSound->stop();
 			} else if (pGameInfo->bMusicEnabled) {
@@ -537,7 +537,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 	ReleaseDC(pDC);
 	(*this).SetFocus();                     // Reset focus back to the main window
-	return TRUE;
+	return true;
 }
 
 
@@ -577,11 +577,11 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	                  NEWGAME_LOCATION_X + NEWGAME_WIDTH,
 	                  NEWGAME_LOCATION_Y + NEWGAME_HEIGHT);
 
-	if (rectTitle.PtInRect(point) && (pGameInfo->bPlayingMetagame == FALSE)) {
+	if (rectTitle.PtInRect(point) && (pGameInfo->bPlayingMetagame == false)) {
 		KillTimer(BEACON_TIMER);
-		bPlaying = FALSE;                   // Want to get a new piece of artwork
-		bNewGame = FALSE;                   // Will be reset to TRUE in NewGame()
-		MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, FALSE);        // erase highlight on nNextIndex
+		bPlaying = false;                   // Want to get a new piece of artwork
+		bNewGame = false;                   // Will be reset to true in NewGame()
+		MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, false);        // erase highlight on nNextIndex
 		NewGame();                          // Activate New Game
 		char        msg[64];
 		Common::sprintf_s(msg, "Score: %.0f %%", m_Score);
@@ -626,7 +626,7 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	CDC     *pDC;
 	int     i;
-	BOOL    bHit = FALSE;
+	bool    bHit = false;
 	char    msg[64];
 
 	pDC = GetDC();
@@ -634,23 +634,23 @@ void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 	if (!m_bAutomatic && bNewGame) {
 		for (i = 0; i < NUM_BUTTONS; i++) {
 			if (colorBlock[i].rLocation.PtInRect(point)) {
-				bHit = TRUE;
+				bHit = true;
 				if (pGameInfo->bSoundEffectsEnabled)
 					sndPlaySound(PICK_SOUND, SND_ASYNC);                                     // Make a noise
-				MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, FALSE);    // erase highlight on nNextIndex
-				MyFocusRect(pArtDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, FALSE);     // erase highlight on nNextIndex
+				MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, false);    // erase highlight on nNextIndex
+				MyFocusRect(pArtDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, false);     // erase highlight on nNextIndex
 				nNextIndex = colorBlock[i].nColorIndex;                                     // make this the next beam color
-				MyFocusRect(pDC, colorBlock[i].rLocation, TRUE);                             // draw hightlight on nNextIndex
-				MyFocusRect(pArtDC, colorBlock[i].rLocation, TRUE);                          // draw hightlight on nNextIndex
+				MyFocusRect(pDC, colorBlock[i].rLocation, true);                             // draw hightlight on nNextIndex
+				MyFocusRect(pArtDC, colorBlock[i].rLocation, true);                          // draw hightlight on nNextIndex
 //bar
 // SWITCH ON DEMAND:
-//bar               if ( m_bChangeAtTwelve == FALSE )
+//bar               if ( m_bChangeAtTwelve == false )
 //bar                   nCurrentIndex = nNextIndex;                                             //...switch to the new beacon color
 			}
 		} // end for
 
 		if (!bPlaying && bHit) {                                                 // first time
-			bPlaying = TRUE;
+			bPlaying = true;
 			nCurrentIndex = nNextIndex;
 			SetTimer(BEACON_TIMER, SPEED_BASE - (m_nSpeed * SPEED_STEP), nullptr);
 			if (m_nSweeps < MAX_SWEEPS)
@@ -804,10 +804,10 @@ void CMainWindow::OnTimer(uintptr nIDEvent) {
 			if (m_bAutomatic) {                                                      // Game plays by itself
 				if (++nNextIndex >= (BUTTON_ENTRY + NUM_BUTTONS))                    // Step through colors
 					nNextIndex = BUTTON_ENTRY;
-				MyFocusRect(pDC, colorBlock[nCurrentIndex - BUTTON_ENTRY].rLocation, FALSE);     // erase highlight on nNextIndex
-				MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, TRUE);         // draw hightlight on nNextIndex
-				MyFocusRect(pArtDC, colorBlock[nCurrentIndex - BUTTON_ENTRY].rLocation, FALSE);  // erase highlight on nNextIndex
-				MyFocusRect(pArtDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, TRUE);          // draw hightlight on nNextIndex
+				MyFocusRect(pDC, colorBlock[nCurrentIndex - BUTTON_ENTRY].rLocation, false);     // erase highlight on nNextIndex
+				MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, true);         // draw hightlight on nNextIndex
+				MyFocusRect(pArtDC, colorBlock[nCurrentIndex - BUTTON_ENTRY].rLocation, false);  // erase highlight on nNextIndex
+				MyFocusRect(pArtDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, true);          // draw hightlight on nNextIndex
 				nCurrentIndex = nNextIndex;                         //...switch to the new beacon color
 			}
 
@@ -816,10 +816,10 @@ void CMainWindow::OnTimer(uintptr nIDEvent) {
 
 			if (m_nRemoved >= m_nTotalSquares) {
 				KillTimer(BEACON_TIMER);
-				bPlaying = FALSE;                               // Want to get a new piece of artwork
-				bNewGame = FALSE;                           // Will be set to TRUE in NewGame()
+				bPlaying = false;                               // Want to get a new piece of artwork
+				bNewGame = false;                           // Will be set to true in NewGame()
 				if (m_bAutomatic) {
-					MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, FALSE);    // erase highlight on nNextIndex
+					MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, false);    // erase highlight on nNextIndex
 					NewGame();
 
 					Common::sprintf_s(msg, "Score: %.0f %%", m_Score);
@@ -839,8 +839,8 @@ void CMainWindow::OnTimer(uintptr nIDEvent) {
 			}
 			if (m_nSweepCount == 0) {
 				KillTimer(BEACON_TIMER);
-				bPlaying = FALSE;
-				bNewGame = FALSE;                           // Will be set to TRUE in NewGame()
+				bPlaying = false;
+				bNewGame = false;                           // Will be set to true in NewGame()
 				if (pGameInfo->bSoundEffectsEnabled)
 					sndPlaySound(LOSE_SOUND, SND_ASYNC);                 // Make a "you lost" noise
 				CMessageBox GameOverDlg((CWnd *)this, pGamePalette, "Game over.", "Out of sweeps.");
@@ -894,7 +894,7 @@ void CMainWindow::MoveBeam() {
 	PALETTEENTRY    tempent[2];
 
 	pDC = GetDC();
-	pOldPal = (*pDC).SelectPalette(pGamePalette, FALSE);     // Select in game palette
+	pOldPal = (*pDC).SelectPalette(pGamePalette, false);     // Select in game palette
 
 	tempent[1].peRed = 255;                                 // Make entry [1] white
 	tempent[1].peGreen = 255;
@@ -915,7 +915,7 @@ void CMainWindow::MoveBeam() {
 		nSlice = START_ENTRY;
 	}
 
-	(*pDC).SelectPalette(pOldPal, FALSE);           // Select back the old palette
+	(*pDC).SelectPalette(pOldPal, false);           // Select back the old palette
 	ReleaseDC(pDC);
 
 } // end MoveBeam
@@ -976,7 +976,7 @@ void CMainWindow::CheckUnderBeam() {
 		End.x = Start.x + (int)(x * radius);
 		End.y = Start.y + (int)(y * radius);
 
-		bChanged = TRUE;
+		bChanged = true;
 		LineDDA(Start.x, Start.y, End.x, End.y, StepAlongLine, pDC);
 
 		degrees += 1.0F;
@@ -995,7 +995,7 @@ void CALLBACK StepAlongLine(int xpos, int ypos, CDC *cdc) {
 	if (bChanged) {
 		point.x = xpos;
 		point.y = ypos;
-		if (InArtRegion(point) && ((CMainWindow::UnderLighthouse(point) == FALSE) &&
+		if (InArtRegion(point) && ((CMainWindow::UnderLighthouse(point) == false) &&
 		                           CMainWindow::InPictureSquare(point))) {
 			bChanged = CMainWindow::CompareColors(pDC, point);
 		}
@@ -1022,11 +1022,11 @@ void CALLBACK StepAlongLine(int xpos, int ypos, CDC *cdc) {
  *
  *  RETURN VALUE:
  *
- *      BOOL    True if a grid space matched and was modified,
+ *      bool    True if a grid space matched and was modified,
  *              False if the space did not match
  *
  ****************************************************************/
-BOOL CMainWindow::CompareColors(CDC *pDC, CPoint point) {
+bool CMainWindow::CompareColors(CDC *pDC, CPoint point) {
 	CPoint      square;
 	COLORREF    test;
 	byte        ar, ag, ab, br, bg, bb;
@@ -1054,16 +1054,16 @@ BOOL CMainWindow::CompareColors(CDC *pDC, CPoint point) {
 		DrawPart(pArtDC, square, square, GRID_WIDTH, GRID_HEIGHT);
 		m_nRemoved++;
 		square = PointToGrid(point);
-		PictureGrid[square.x][square.y] = FALSE;
-		return TRUE;
+		PictureGrid[square.x][square.y] = false;
+		return true;
 	}
 
 	index = (*pGamePalette).GetNearestPaletteIndex(test);        // get the nearest index of test color
 	if (((index < BUTTON_ENTRY) && (index >= START_ENTRY))       // if it's in the beam area
 	        && (index != nSlice))                               // and doesn't match the beam's index
-		return FALSE;  //TRUE );                                           //
+		return false;  //true );                                           //
 
-	return FALSE;
+	return false;
 } // end CompareColors
 
 
@@ -1088,19 +1088,19 @@ BOOL CMainWindow::CompareColors(CDC *pDC, CPoint point) {
  *
  *  RETURN VALUE:
  *
- *      BOOL    True if point lies under the lighthouse area,
+ *      bool    True if point lies under the lighthouse area,
  *              False if the point isn't
  *
  ****************************************************************/
-BOOL CMainWindow::UnderLighthouse(CPoint point) {
+bool CMainWindow::UnderLighthouse(CPoint point) {
 	if ((point.x >= (SIDE_BORDER + ART_WIDTH / 2 - START_OFFSET_X)) &&
 	        (point.x <= (SIDE_BORDER + ART_WIDTH / 2 + START_OFFSET_X))) {
 		if ((point.y >= (TOP_BORDER + ART_HEIGHT / 2 - START_OFFSET_Y)) &&
 		        (point.y <= (TOP_BORDER + ART_HEIGHT / 2 + (START_HEIGHT - START_OFFSET_Y)))) {
-			return TRUE;
+			return true;
 		}
 	}
-	return FALSE;
+	return false;
 } // end CompareColors
 
 
@@ -1125,11 +1125,11 @@ BOOL CMainWindow::UnderLighthouse(CPoint point) {
  *
  *  RETURN VALUE:
  *
- *      BOOL    True if point lies in a picture-filled grid space,
+ *      bool    True if point lies in a picture-filled grid space,
  *              False if the point doesn't
  *
  ****************************************************************/
-BOOL CMainWindow::InPictureSquare(CPoint point) {
+bool CMainWindow::InPictureSquare(CPoint point) {
 	CPoint  Grid;
 
 	Grid = PointToGrid(point);
@@ -1200,7 +1200,7 @@ CPoint CMainWindow::PointToGrid(CPoint point) {
  *      none
  *
  ****************************************************************/
-BOOL CMainWindow::LoadArtWork(CDC *pDC) {
+bool CMainWindow::LoadArtWork(CDC *pDC) {
 //	CBitmap      *pNextArt = nullptr;
 	CPalette    *pTempPalette = nullptr,
 	             *pPalOld = nullptr;
@@ -1217,7 +1217,7 @@ BOOL CMainWindow::LoadArtWork(CDC *pDC) {
 	ifstream inFile;
 	inFile.open(DATA_FILE);                                  // open the data store
 	if (inFile.fail()) {
-		return FALSE;
+		return false;
 	}
 	inFile.getline(chNumEntries, sizeof(chNumEntries));     // read number of names in file
 	nNumEntries = atoi(chNumEntries);
@@ -1237,7 +1237,7 @@ BOOL CMainWindow::LoadArtWork(CDC *pDC) {
 	pSourceDoc = new CDibDoc();
 	ASSERT(pSourceDoc != nullptr);
 	if (pSourceDoc == nullptr) {
-		return FALSE;
+		return false;
 	}
 
 	char bufName[MAX_FILE_LENGTH + 10];
@@ -1248,7 +1248,7 @@ BOOL CMainWindow::LoadArtWork(CDC *pDC) {
 	ASSERT(pTempPalette == nullptr);
 	pTempPalette = (*pSourceDoc).DetachPalette();       // Acquire the shared palette for our game from the art
 
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);                            // Select Game Palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);                            // Select Game Palette
 	(*pDC).RealizePalette();                                                        // Use it
 
 	// Transfer the button colors to Game Palette
@@ -1304,7 +1304,7 @@ BOOL CMainWindow::LoadArtWork(CDC *pDC) {
 
 		(*pArtDC).FillRect(colorBlock[i].rLocation, pMyBrush);
 
-		MyFocusRect(pArtDC, colorBlock[i].rLocation, FALSE);     // standard highlight on button
+		MyFocusRect(pArtDC, colorBlock[i].rLocation, false);     // standard highlight on button
 
 		if (pMyBrush != nullptr) {                                 // If the brush was constructed, delete it
 			pMyBrush->DeleteObject();
@@ -1315,7 +1315,7 @@ BOOL CMainWindow::LoadArtWork(CDC *pDC) {
 
 	pBeaconBitmap = FetchResourceBitmap(pDC, nullptr, IDB_BEACON_BMP);          // Add the lighthouse
 
-	(*pDC).SelectPalette(pPalOld, FALSE);
+	(*pDC).SelectPalette(pPalOld, false);
 
 	if (pTempPalette != nullptr) {
 		pTempPalette->DeleteObject();
@@ -1325,7 +1325,7 @@ BOOL CMainWindow::LoadArtWork(CDC *pDC) {
 	delete pSourceDoc;
 	pSourceDoc = nullptr;
 
-	return TRUE;
+	return true;
 
 } // end LoadArtWork()
 
@@ -1383,15 +1383,15 @@ void CMainWindow::DrawPart(CDC *pDC, CPoint Src, CPoint Dst, int nWidth, int nHe
  *
  *  RETURN VALUE:
  *
- *      BOOL:   TRUE if point is within the Art Region,
- *              FALSE if point is outside the Art Region
+ *      bool:   true if point is within the Art Region,
+ *              false if point is outside the Art Region
  *
  ****************************************************************/
-BOOL InArtRegion(CPoint point) {
+bool InArtRegion(CPoint point) {
 	if ((point.x > SIDE_BORDER && point.x < (ART_WIDTH + SIDE_BORDER)) &&         // See if point lies within
 	        (point.y > TOP_BORDER && point.y < (ART_HEIGHT + TOP_BORDER)))        //...ArtWork area
-		return TRUE;                                                            // Return true if it's inside
-	else return FALSE;                                                          //...and false if not
+		return true;                                                            // Return true if it's inside
+	else return false;                                                          //...and false if not
 }
 
 /*****************************************************************
@@ -1421,7 +1421,7 @@ BOOL InArtRegion(CPoint point) {
  *      void
  *
  ****************************************************************/
-void MyFocusRect(CDC *pDC, CRect rect, BOOL nPressed) {
+void MyFocusRect(CDC *pDC, CRect rect, bool nPressed) {
 	CBrush      *pMyBrush = nullptr;                   // New Brush
 	CBrush      *pOldBrush = nullptr;                  // Pointer to old brush
 	CPen        *pLitePen = nullptr;                       // New Pen
@@ -1443,7 +1443,7 @@ void MyFocusRect(CDC *pDC, CRect rect, BOOL nPressed) {
 	pDarkPen->CreatePen(PS_INSIDEFRAME, HILITE_BORDER,
 	                    PALETTEINDEX((uint16)(DARK_TRIM)));        // Create a new pen
 
-	pPalOld = (*pDC).SelectPalette(pGamePalette, FALSE);     // Select in game palette
+	pPalOld = (*pDC).SelectPalette(pGamePalette, false);     // Select in game palette
 	(*pDC).RealizePalette();                                // Use it
 	pOldBrush = pDC->SelectObject(pMyBrush);     // Select the new brush & save old
 
@@ -1467,7 +1467,7 @@ void MyFocusRect(CDC *pDC, CRect rect, BOOL nPressed) {
 	pDC->SelectObject(pOldPen);                  // Select the old pen
 	pDC->SelectObject(pOldBrush);                // Select the old brush
 
-	(*pDC).SelectPalette(pPalOld, FALSE);           // Select back the old palette
+	(*pDC).SelectPalette(pPalOld, false);           // Select back the old palette
 
 	if (pMyBrush != nullptr) {                         // If the brush was constructed, delete it
 		pMyBrush->DeleteObject();
@@ -1524,12 +1524,12 @@ void CMainWindow::NewGame() {
 
 	for (i = 0; i < NUM_COLUMNS; i++) {
 		for (j = 0; j < NUM_ROWS; j++) {
-			PictureGrid[i][j] = TRUE;                               // Assume they all start with picture in 'em
+			PictureGrid[i][j] = true;                               // Assume they all start with picture in 'em
 		}
 	}
 
 	pDC = GetDC();
-	pOldPal = pDC->SelectPalette(pGamePalette, FALSE);           // select the game palette
+	pOldPal = pDC->SelectPalette(pGamePalette, false);           // select the game palette
 	pDC->RealizePalette();                                          //...and realize it
 
 	pBrushNew = new CBrush();                                       // Construct a new brush object
@@ -1538,7 +1538,7 @@ void CMainWindow::NewGame() {
 		pBrushOld = (*pDC).SelectObject(pBrushNew);                  // Select into the DC my new brush
 		(*pDC).Rectangle(SIDE_BORDER, TOP_BORDER, ART_WIDTH + SIDE_BORDER, ART_HEIGHT + TOP_BORDER);
 		(*pDC).SelectObject(pBrushOld);                          // Select in the old brush
-		(*pDC).SelectPalette(pOldPal, FALSE);                        // Select in the old palette
+		(*pDC).SelectPalette(pOldPal, false);                        // Select in the old palette
 		delete pBrushNew;                                           // Delete the new brush
 	}
 
@@ -1546,7 +1546,7 @@ void CMainWindow::NewGame() {
 
 	SetBeamEntries(pDC);
 
-	pOldPal = pDC->SelectPalette(pGamePalette, FALSE);                   // select the game palette
+	pOldPal = pDC->SelectPalette(pGamePalette, false);                   // select the game palette
 	pDC->RealizePalette();                                                  //...and realize it
 
 	pDC->BitBlt(SIDE_BORDER, TOP_BORDER, GAME_WIDTH - (2 * SIDE_BORDER), GAME_HEIGHT - (2 * BOTTOM_BORDER),
@@ -1590,13 +1590,13 @@ void CMainWindow::NewGame() {
 		nCurrentIndex = BUTTON_ENTRY;
 		nNextIndex = BUTTON_ENTRY;
 		SetTimer(BEACON_TIMER, SPEED_BASE - (m_nSpeed * SPEED_STEP), nullptr);
-		MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, TRUE);     // draw hightlight on nNextIndex
+		MyFocusRect(pDC, colorBlock[nNextIndex - BUTTON_ENTRY].rLocation, true);     // draw hightlight on nNextIndex
 	}
 
-	(*pDC).SelectPalette(pOldPal, FALSE);
+	(*pDC).SelectPalette(pOldPal, false);
 	ReleaseDC(pDC);
 
-	bNewGame = TRUE;
+	bNewGame = true;
 
 } // End NewGame()
 
@@ -1605,7 +1605,7 @@ void CMainWindow::SetBeamEntries(CDC *pDC) {
 	PALETTEENTRY    entry[NUM_BEAMS];
 	int i;
 
-	pDC->SelectPalette(pGamePalette, FALSE);             // select the game palette
+	pDC->SelectPalette(pGamePalette, false);             // select the game palette
 	pDC->RealizePalette();                              //...and realize it
 
 	for (i = 0; i < (NUM_BEAMS); i++) {                  // Set palette area to animate for beacon  + NUM_BUTTONS
@@ -1671,7 +1671,7 @@ void CMainWindow::OnClose() {
 	if (pOldBmp1 != nullptr)                           // Get rid of Source
 		pBackDC->SelectObject(pOldBmp1);
 	if (pOldPal1 != nullptr)
-		pBackDC->SelectPalette(pOldPal1, FALSE);
+		pBackDC->SelectPalette(pOldPal1, false);
 	if (pBackDC->m_hDC != nullptr) {
 		pBackDC->DeleteDC();
 		delete pBackDC;
@@ -1683,7 +1683,7 @@ void CMainWindow::OnClose() {
 	if (pOldBmp2 != nullptr)                           // Get rid of Source
 		pArtDC->SelectObject(pOldBmp2);
 	if (pOldPal2 != nullptr)
-		pArtDC->SelectPalette(pOldPal2, FALSE);
+		pArtDC->SelectPalette(pOldPal2, false);
 	if (pArtDC->m_hDC != nullptr) {
 		pArtDC->DeleteDC();
 		delete pArtDC;
diff --git a/engines/bagel/hodjnpodj/beacon/beacon.h b/engines/bagel/hodjnpodj/beacon/beacon.h
index 17d55e23b0c..0d70983bf6d 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.h
+++ b/engines/bagel/hodjnpodj/beacon/beacon.h
@@ -134,18 +134,18 @@ public:
 	void CheckUnderBeam();
 	void SetBeamEntries(CDC *pDC);
 	static void DrawPart(CDC *pDC, CPoint Src, CPoint Dst, int nWidth, int nHeight);
-	static BOOL CompareColors(CDC *pDC, CPoint point);
-	static BOOL UnderLighthouse(CPoint point);
-	static BOOL InPictureSquare(CPoint point);
+	static bool CompareColors(CDC *pDC, CPoint point);
+	static bool UnderLighthouse(CPoint point);
+	static bool InPictureSquare(CPoint point);
 	static CPoint PointToGrid(CPoint point);
-	BOOL LoadArtWork(CDC *pDC);
+	bool LoadArtWork(CDC *pDC);
 
 //added data members:
 private:
 	void OnSoundNotify(CSound *pSound);
 
 protected:
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
diff --git a/engines/bagel/hodjnpodj/beacon/optndlg.cpp b/engines/bagel/hodjnpodj/beacon/optndlg.cpp
index 96c7ebebf6b..efb8d80c8d1 100644
--- a/engines/bagel/hodjnpodj/beacon/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/beacon/optndlg.cpp
@@ -50,8 +50,8 @@ int     m_nSweepSettings[15] =  {MIN_SWEEPS, 10, 15, 20, 30, 40, 50, 60, 80, 100
 COptnDlg::COptnDlg(CWnd* pParent, CPalette* pPalette)
 	: CBmpDialog(pParent, pPalette, IDD_SUBOPTIONS, ".\\ART\\SSCROLL.BMP") {
 	//{{AFX_DATA_INIT(COptnDlg)
-	m_bAutomatic = FALSE;
-	m_bChangeAtTwelve = FALSE;
+	m_bAutomatic = false;
+	m_bChangeAtTwelve = false;
 	m_nSweeps = 0;
 	m_nSpeed = MIN_SPEED;
 	nSweepSets = 15;
@@ -101,7 +101,7 @@ int COptnDlg::OnCreate(LPCREATESTRUCT lpCreateStruct) {
 	return 0;
 }
 
-BOOL COptnDlg::OnInitDialog() {
+bool COptnDlg::OnInitDialog() {
 	CBmpDialog::OnInitDialog();
 
 	CDC     *pDC;
@@ -130,7 +130,7 @@ BOOL COptnDlg::OnInitDialog() {
 	m_ScrollSweeps.SetScrollRange(0, nSweepSets - 1, 0);
 	for (i = 0; i < (int)nSweepSets; i++) {
 		if (m_nSweepSettings[i] == (int)m_nSweeps)
-			m_ScrollSweeps.SetScrollPos(i, TRUE);
+			m_ScrollSweeps.SetScrollPos(i, true);
 	}
 
 	statRect.SetRect(LEFT_SIDE, 70, LEFT_SIDE + 115, 88);
@@ -139,7 +139,7 @@ BOOL COptnDlg::OnInitDialog() {
 	}
 
 	m_ScrollSpeed.SetScrollRange(MIN_SPEED, MAX_SPEED, 0);
-	m_ScrollSpeed.SetScrollPos(m_nSpeed, TRUE);
+	m_ScrollSpeed.SetScrollPos(m_nSpeed, true);
 
 	if ((pOKButton = new CColorButton) != nullptr) {                   // build a color QUIT button to let us exit
 		(*pOKButton).SetPalette(pSubOptionsPalette);                        // set the palette to use
@@ -165,12 +165,12 @@ BOOL COptnDlg::OnInitDialog() {
 
 	ReleaseDC(pDC);
 
-	return TRUE;  // return TRUE  unless you set the focus to a control
+	return true;  // return true  unless you set the focus to a control
 }
 
 
-BOOL COptnDlg::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;
+bool COptnDlg::OnEraseBkgnd(CDC *pDC) {
+	return true;
 }
 
 
@@ -179,7 +179,7 @@ void COptnDlg::OnDestroy(void) {
 }
 
 
-BOOL COptnDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool COptnDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 	if (HIWORD(lParam) == BN_CLICKED) {
 
@@ -210,7 +210,7 @@ BOOL COptnDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 		} // end switch
 	} // end if
 
-	return TRUE;
+	return true;
 
 } // end OnCommand
 
@@ -252,7 +252,7 @@ void COptnDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pS
 	if (NewPos > pMax) NewPos = pMax;
 
 	if (NewPos != OldPos) {                              //To prevent "flicker"
-		(*pScrollBar).SetScrollPos(NewPos, TRUE);        //...only update when
+		(*pScrollBar).SetScrollPos(NewPos, true);        //...only update when
 	}                                                   //...changed
 
 	UpdateScrollbars();
diff --git a/engines/bagel/hodjnpodj/beacon/optndlg.h b/engines/bagel/hodjnpodj/beacon/optndlg.h
index 3a3915307fc..aee0ca96b37 100644
--- a/engines/bagel/hodjnpodj/beacon/optndlg.h
+++ b/engines/bagel/hodjnpodj/beacon/optndlg.h
@@ -50,8 +50,8 @@ public:
 	enum { IDD = IDD_SUBOPTIONS };
 	CScrollBar m_ScrollSweeps;
 	CScrollBar m_ScrollSpeed;
-	BOOL    m_bAutomatic;
-	BOOL    m_bChangeAtTwelve;
+	bool    m_bAutomatic;
+	bool    m_bChangeAtTwelve;
 	unsigned int    m_nSweeps;
 	unsigned int    m_nSpeed;
 	unsigned int    nSweepSets;
@@ -64,11 +64,11 @@ protected:
 
 	// Generated message map functions
 	//{{AFX_MSG(COptnDlg)
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
-	virtual BOOL OnInitDialog() override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnInitDialog() override;
 	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
+	afx_msg bool OnEraseBkgnd(CDC *pDC);
 	virtual void OnOK() override;
 	virtual void OnCancel() override;
 	afx_msg void OnPaint();
diff --git a/engines/bagel/hodjnpodj/crypt/crypt.cpp b/engines/bagel/hodjnpodj/crypt/crypt.cpp
index df67ae59574..4c6deb080c2 100644
--- a/engines/bagel/hodjnpodj/crypt/crypt.cpp
+++ b/engines/bagel/hodjnpodj/crypt/crypt.cpp
@@ -64,7 +64,7 @@ CCryptogram::CCryptogram(CDC *pDC) {
 	* Solved switch is used to prevent further user updates *
 	* after cryptogram is solved.                           *
 	********************************************************/
-	bIsGameOver         = FALSE;        // Initialize solved switch
+	bIsGameOver         = false;        // Initialize solved switch
 
 	BagelMetaEngine::setKeybindingMode(KBMODE_MINIMAL);
 }
@@ -132,11 +132,11 @@ CCryptogram::~CCryptogram() {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CCryptogram::DrawGram(CDC *pDC) {
-	bIsGameOver = FALSE;
+bool CCryptogram::DrawGram(CDC *pDC) {
+	bIsGameOver = false;
 
-	if (m_cRecordGram->GetRecord(m_cStats->ResetGame()) == FALSE)        // Attempt to get the record
-		return FALSE;
+	if (m_cRecordGram->GetRecord(m_cStats->ResetGame()) == false)        // Attempt to get the record
+		return false;
 
 	m_cPaintGram->ClearGram(pDC);
 	m_cPaintGram->PaintAlphabet(pDC);
@@ -147,7 +147,7 @@ BOOL CCryptogram::DrawGram(CDC *pDC) {
 	m_cPaintGram->InitGramPosition(m_cRecordGram);
 	m_cPaintGram->PaintGram(pDC, m_chEncryptGram);
 
-	return TRUE;
+	return true;
 }
 
 void CCryptogram::DrawSource(CDC *pDC) {
@@ -227,7 +227,7 @@ void CCryptogram::SolveCryptogram(CDC *pDC) {
  *  void
  *
  ****************************************************************/
-BOOL CCryptogram::HandleUserUpdate(CDC *pDC, CPoint cpointClicked) {
+bool CCryptogram::HandleUserUpdate(CDC *pDC, CPoint cpointClicked) {
 	CSprite *pSprite;
 	int     nClickedCode;
 	int     nHiLiteCode;
@@ -238,9 +238,9 @@ BOOL CCryptogram::HandleUserUpdate(CDC *pDC, CPoint cpointClicked) {
 	/*****************************
 	* Cryptogram already solved? *
 	*****************************/
-	if (bIsGameOver == TRUE) {
+	if (bIsGameOver == true) {
 		//MessageBeep(-1);                          // No - exit
-		return FALSE;
+		return false;
 	}
 
 	pSprite = m_cPaintGram->m_cDisplayLetters->Touched(cpointClicked);
@@ -250,31 +250,31 @@ BOOL CCryptogram::HandleUserUpdate(CDC *pDC, CPoint cpointClicked) {
 	********************************/
 	if (pSprite == nullptr) {
 		//MessageBeep(-1);                          // No - exit
-		return FALSE;
+		return false;
 	}
 
 	/********************
 	* Symbol hilited?   *
 	********************/
 	nClickedCode = (*pSprite).GetTypeCode();
-	if (m_cPaintGram->IsSymbolChar(nClickedCode) == TRUE) {
-		return FALSE;                                   // Yes - do not hilite symbols
+	if (m_cPaintGram->IsSymbolChar(nClickedCode) == true) {
+		return false;                                   // Yes - do not hilite symbols
 	}
 
 	/********************
 	* Anything hilited? *
 	********************/
-	if (m_cPaintGram->IsHiLiteOn() == FALSE) {
+	if (m_cPaintGram->IsHiLiteOn() == false) {
 		m_cPaintGram->HiLiteOn(pDC, nClickedCode);  // No - hilite letter
-		return FALSE;
+		return false;
 	}
 
 	/****************************************************************
 	* Was the letter clicked same as the letter currenly hilited?   *
 	****************************************************************/
-	if (m_cPaintGram->IsHiLiteType(nClickedCode) == TRUE) {
+	if (m_cPaintGram->IsHiLiteType(nClickedCode) == true) {
 		m_cPaintGram->HiLiteOff(pDC);                // Yes - toggle hilite to off state
-		return FALSE;
+		return false;
 	}
 
 	/************************************************************
@@ -290,14 +290,14 @@ BOOL CCryptogram::HandleUserUpdate(CDC *pDC, CPoint cpointClicked) {
 	) {
 		m_cPaintGram->HiLiteOff(pDC);               // Yes - turn hilite off
 		m_cPaintGram->HiLiteOn(pDC, nClickedCode);  // ...hilite new char
-		return FALSE;                               // out of here.
+		return false;                               // out of here.
 	}
 
 	/************************************************************
 	* User wants to switch letters.                             *
 	* Need to update internal cryptogram and visual reps.       *
 	************************************************************/
-	if (m_cPaintGram->IsAlphabetType(nHiLiteCode) == TRUE) {     // Is the hilited char in the alphabet region?
+	if (m_cPaintGram->IsAlphabetType(nHiLiteCode) == true) {     // Is the hilited char in the alphabet region?
 		nAlphaCode  = nHiLiteCode;                              // Yes - assign it the alpha code
 		nGramCode   = nClickedCode;
 	} else {
@@ -370,7 +370,7 @@ BOOL CCryptogram::HandleUserUpdate(CDC *pDC, CPoint cpointClicked) {
  *  void
  *
  ****************************************************************/
-BOOL CCryptogram::HandleUserUpdate(CDC *pDC, unsigned int nChar) {
+bool CCryptogram::HandleUserUpdate(CDC *pDC, unsigned int nChar) {
 	char    nNewChar = toupper(nChar);
 	int     nHiLiteCode;
 	int     nReplaceCode;
@@ -380,25 +380,25 @@ BOOL CCryptogram::HandleUserUpdate(CDC *pDC, unsigned int nChar) {
 	/*****************************
 	* Cryptogram already solved? *
 	*****************************/
-	if (bIsGameOver == TRUE) {
+	if (bIsGameOver == true) {
 		//MessageBeep(-1);                          // No - exit
-		return FALSE;
+		return false;
 	}
 
 	/****************************************
 	* Is this a valid alphabetical letter?  *
 	****************************************/
-	if (Common::isAlpha(nNewChar) == FALSE) {
+	if (Common::isAlpha(nNewChar) == false) {
 		MessageBeep(-1);                            // No - exit
-		return FALSE;
+		return false;
 	}
 
 	/********************
 	* Anything hilited? *
 	********************/
-	if (m_cPaintGram->IsHiLiteOn() == FALSE) {
+	if (m_cPaintGram->IsHiLiteOn() == false) {
 		m_cPaintGram->HiLiteOn(pDC, nNewChar);      // Turn hilite on that spec char
-		return FALSE;
+		return false;
 	}
 
 	/*******************************
@@ -406,9 +406,9 @@ BOOL CCryptogram::HandleUserUpdate(CDC *pDC, unsigned int nChar) {
 	*******************************/
 	nHiLiteCode = m_cPaintGram->GetHiLiteType(pDC);
 	ASSERT(nHiLiteCode);
-	if (m_cPaintGram->IsGramType(nHiLiteCode) == FALSE) {
+	if (m_cPaintGram->IsGramType(nHiLiteCode) == false) {
 		MessageBeep(-1);                            // No - exit
-		return FALSE;
+		return false;
 	}
 
 	/*************************************
@@ -416,7 +416,7 @@ BOOL CCryptogram::HandleUserUpdate(CDC *pDC, unsigned int nChar) {
 	*************************************/
 	if (nHiLiteCode == nNewChar) {
 		m_cPaintGram->HiLiteOff(pDC);               // Turn hilite off
-		return FALSE;
+		return false;
 	}
 
 	nAlphaCode  = nNewChar;
@@ -502,7 +502,7 @@ void CCryptogram::Encrypt() {
 	* Encrypt entire string using crypt map. *
 	*****************************************/
 	for (i = 0; m_chEncryptGram[i] != 0; i++) {
-		if ((m_cPaintGram->IsAlphaChar(m_chEncryptGram[i]) == TRUE) &&                   // Is this a char?
+		if ((m_cPaintGram->IsAlphaChar(m_chEncryptGram[i]) == true) &&                   // Is this a char?
 		        (m_nCryptMap[DECRYPT_MAP][m_cPaintGram->CharToIndex(m_chEncryptGram[i])] != NOT_USED)   // and should this char be encrypted?
 		   ) {
 			m_chEncryptGram[i] = m_cPaintGram->IndexToChar(
@@ -544,7 +544,7 @@ void CCryptogram::Encrypt() {
 void CCryptogram::CreateCryptMap(int nLettersSolved) {
 	int     nEncryptCode;       // encrypted value
 	int     nDecryptCode;       // normal/decrypted value
-	BOOL    bIsUsed;            // tells if encrypt-decrypt map was used
+	bool    bIsUsed;            // tells if encrypt-decrypt map was used
 	int     i, j;               // index
 
 	/*******************
@@ -560,12 +560,12 @@ void CCryptogram::CreateCryptMap(int nLettersSolved) {
 	* Create encryption map based on letters in phrase. *
 	****************************************************/
 	for (i = 0; m_chEncryptGram[i] != 0; i++) {
-		if (m_cPaintGram->IsAlphaChar(m_chEncryptGram[i]) == TRUE) {     // Is this a char?
+		if (m_cPaintGram->IsAlphaChar(m_chEncryptGram[i]) == true) {     // Is this a char?
 
 			nDecryptCode = m_cPaintGram->CharToIndex(m_chEncryptGram[i]);
 			bIsUsed = (m_nCryptMap[DECRYPT_MAP][nDecryptCode] != NOT_USED);
 
-			if (bIsUsed == TRUE)     // Char already encrypted?
+			if (bIsUsed == true)     // Char already encrypted?
 				continue;           // Yes - loop to next char in text
 
 			/******************************
@@ -574,7 +574,7 @@ void CCryptogram::CreateCryptMap(int nLettersSolved) {
 			do {
 				nEncryptCode = brand() % ALPHABET;
 				bIsUsed = (m_nCryptMap[ENCRYPT_MAP][nEncryptCode] != NOT_USED);
-			} while (bIsUsed == TRUE || nEncryptCode == nDecryptCode);   // find unused map
+			} while (bIsUsed == true || nEncryptCode == nDecryptCode);   // find unused map
 
 			/**************************************
 			* Record new encrypt/decrypt mapping. *
@@ -597,13 +597,13 @@ void CCryptogram::CreateCryptMap(int nLettersSolved) {
 			    m_nCryptMap[DECRYPT_MAP][j] != NOT_USED &&      // in the quote and
 			    m_nCryptMap[DECRYPT_MAP][j] != j                // not already solved
 			) {
-				bIsUsed = TRUE;             // Yes - so break
+				bIsUsed = true;             // Yes - so break
 				break;
 			} else
-				bIsUsed = FALSE;            // No - not this letter, keep looking
+				bIsUsed = false;            // No - not this letter, keep looking
 		}
 
-		if (bIsUsed == FALSE)                // Any letters left to decrypt?
+		if (bIsUsed == false)                // Any letters left to decrypt?
 			break;                          // No - by pass loop.
 
 		do {
@@ -612,7 +612,7 @@ void CCryptogram::CreateCryptMap(int nLettersSolved) {
 			              m_nCryptMap[DECRYPT_MAP][nDecryptCode] != NOT_USED &&   // in quote and
 			              m_nCryptMap[DECRYPT_MAP][nDecryptCode] != nDecryptCode  // not already solved
 			          );
-		} while (bIsUsed == FALSE);
+		} while (bIsUsed == false);
 
 		nEncryptCode = m_nCryptMap[DECRYPT_MAP][nDecryptCode];  // gets corres decoder
 
@@ -622,7 +622,7 @@ void CCryptogram::CreateCryptMap(int nLettersSolved) {
 		* be used in it's place.                                            *
 		********************************************************************/
 		bIsUsed = (m_nCryptMap[ENCRYPT_MAP][nDecryptCode] != NOT_USED);
-		if (bIsUsed == TRUE) {                                                               // Decrypted letter used before?
+		if (bIsUsed == true) {                                                               // Decrypted letter used before?
 			m_nCryptMap[DECRYPT_MAP][m_nCryptMap[ENCRYPT_MAP][nDecryptCode]] = nEncryptCode;    // Yes - Swap around encrypted chars
 			m_nCryptMap[ENCRYPT_MAP][nEncryptCode] = m_nCryptMap[ENCRYPT_MAP][nDecryptCode];
 		} else {
@@ -734,18 +734,18 @@ int CCryptogram::UpdateCryptMap(int nOldType, int nNewType) {
  *  nTotalSolved - number of correctly decrypted letters
  *
  ****************************************************************/
-BOOL CCryptogram::IsSolved() {
+bool CCryptogram::IsSolved() {
 	int i;
 
 	for (i = 0; i < ALPHABET;  i++) {                    // flip thru Crypt Map
 		if ((m_nCryptMap[DECRYPT_MAP][i] != i) &&        // Any chars rep another char?
 		        (m_nCryptMap[DECRYPT_MAP][i] != NOT_USED))
-			return FALSE;                               // Yes - cryptogram not solved
+			return false;                               // Yes - cryptogram not solved
 	}
 
-	bIsGameOver = TRUE;                                 // Mark cryptogram as solved
+	bIsGameOver = true;                                 // Mark cryptogram as solved
 
-	return TRUE;
+	return true;
 }
 
 /*****************************************************************
diff --git a/engines/bagel/hodjnpodj/crypt/crypt.h b/engines/bagel/hodjnpodj/crypt/crypt.h
index 7e5293c0e6a..aca9ca0e797 100644
--- a/engines/bagel/hodjnpodj/crypt/crypt.h
+++ b/engines/bagel/hodjnpodj/crypt/crypt.h
@@ -46,13 +46,13 @@ public:
 	CCryptogram(CDC *pDC);
 	~CCryptogram();
 
-	BOOL        DrawGram(CDC *pDC);
-	BOOL        HandleUserUpdate(CDC *pDC, CPoint cpointClicked);
-	BOOL        HandleUserUpdate(CDC *pDC, unsigned int nChar);
+	bool        DrawGram(CDC *pDC);
+	bool        HandleUserUpdate(CDC *pDC, CPoint cpointClicked);
+	bool        HandleUserUpdate(CDC *pDC, unsigned int nChar);
 	void        Encrypt();
 	void        CreateCryptMap(int nLettersSolved);
 	int         UpdateCryptMap(int nOldType, int nNewType);
-	BOOL        IsSolved();
+	bool        IsSolved();
 	int         LettersSolved();
 	void        MarkSolvedLetters(CDC *pDC);
 	void        SolveCryptogram(CDC *pDC);
@@ -61,7 +61,7 @@ public:
 	char        m_chEncryptGram[MAX_GRAM_LEN];
 	CPaintGram  *m_cPaintGram = nullptr;
 	CStats      *m_cStats = nullptr;
-	BOOL        bIsGameOver = FALSE;
+	bool        bIsGameOver = false;
 };
 
 // Globals!
diff --git a/engines/bagel/hodjnpodj/crypt/main.cpp b/engines/bagel/hodjnpodj/crypt/main.cpp
index a2d0e2f57ad..f6828b04dfe 100644
--- a/engines/bagel/hodjnpodj/crypt/main.cpp
+++ b/engines/bagel/hodjnpodj/crypt/main.cpp
@@ -50,7 +50,7 @@ CPalette        *pGamePalette = nullptr;       // Palette to be used throughout
 static CSound   *pGameSound = nullptr;         // Game theme song
 CCryptogram     *m_cCryptograms;            // cryptogram game object
 static CSprite  *aHourGlass[MAX_HOURS];
-static BOOL     m_bPause;                   // flag to pause the timer
+static bool     m_bPause;                   // flag to pause the timer
 static int      m_nTimer;
 static int      tempLetters;
 static int      tempTimeLimit;
@@ -87,12 +87,12 @@ CMainWindow::CMainWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) {
 	CString WndClass;
 	CDibDoc *pDibDoc = nullptr;            // pointer to the background art DIB
 	CSize   mySize;
-	BOOL    bSuccess;                   // bitmap button vars
+	bool    bSuccess;                   // bitmap button vars
 	CRect   ScrollRect;                 // bitmap button vars
 	CSprite *pSprite = nullptr;
 	int     i;
 
-	m_bPause = FALSE;
+	m_bPause = false;
 	m_nTimer = 0;
 	m_pHourGlass = nullptr;
 	m_hCallAppWnd = hCallingWnd;
@@ -167,7 +167,7 @@ CMainWindow::CMainWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) {
 	               "SCROLLUP"
 	           );
 	ASSERT(bSuccess);
-	m_bIgnoreScrollClick = FALSE;                           // set to process button clicks
+	m_bIgnoreScrollClick = false;                           // set to process button clicks
 
 	/*******************************************************
 	* Put up something to look at while we load up the game*
@@ -180,7 +180,7 @@ CMainWindow::CMainWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) {
 	*************************/
 	m_cCryptograms = new CCryptogram(pDC);
 	ASSERT(m_cCryptograms != nullptr);
-	if (m_lpGameStruct->bPlayingMetagame != FALSE) {
+	if (m_lpGameStruct->bPlayingMetagame != false) {
 		switch (m_lpGameStruct->nSkillLevel) {
 
 		case SKILLLEVEL_LOW:
@@ -207,7 +207,7 @@ CMainWindow::CMainWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) {
 
 	tempLetters = m_cCryptograms->m_cStats->m_nLettersSolved;
 	tempTimeLimit = m_cCryptograms->m_cStats->m_nTime;
-	m_bIsFirstTimeHack = TRUE;
+	m_bIsFirstTimeHack = true;
 
 	// pre-load of sections of the sun dial
 	//
@@ -221,8 +221,8 @@ CMainWindow::CMainWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) {
 			pSprite->SetPosition(HOUR_X, HOUR_Y);
 
 			pSprite->SetTypeCode(IDB_HOUR + i);
-			pSprite->SetMasked(TRUE);
-			pSprite->SetMobile(FALSE);
+			pSprite->SetMasked(true);
+			pSprite->SetMobile(false);
 
 		}
 	} // end for
@@ -310,7 +310,7 @@ CMainWindow::~CMainWindow() {
 void CMainWindow::OnPaint() {
 	PAINTSTRUCT lpPaint;
 
-	InvalidateRect(nullptr, FALSE);                    // invalidate the entire window
+	InvalidateRect(nullptr, false);                    // invalidate the entire window
 	BeginPaint(&lpPaint);                           // bracket start of window update
 	SplashScreen();                                 // repaint our window's content
 	RefreshStats();                                 // repaint the stats
@@ -352,7 +352,7 @@ void CMainWindow::SplashScreen() {
 	CDibDoc myDoc;                                      // contains the artwork's DIB information
 	HDIB    hDIB;                                       // a handle to the DIB itself
 	CSprite *pSprite;                                   // points to sprite being processed
-	BOOL    bSuccess;
+	bool    bSuccess;
 
 	bSuccess = myDoc.OpenDocument(SPLASHSPEC);          // open the background art file and
 	ASSERT(bSuccess);                                   // open the background art file and
@@ -380,15 +380,15 @@ void CMainWindow::SplashScreen() {
 		pSprite = (*pSprite).GetNextSprite();
 	}          // ... fetch/save the background it covers up
 
-	if (m_bIsFirstTimeHack == TRUE) {
-		m_bIsFirstTimeHack = FALSE;
+	if (m_bIsFirstTimeHack == true) {
+		m_bIsFirstTimeHack = false;
 	}
 
 	ReleaseDC(pDC);                                     // release the window's context
 }
 
 void CMainWindow::DisplayStats(CDC *pDC) {
-	BOOL        bSuccess;
+	bool        bSuccess;
 
 	if (m_cCryptograms->m_cStats->m_nTime != MAX_TIME) {
 		(*m_pHourGlass).ClearBackground();                  // ... background and repaint its image, thus
@@ -400,7 +400,7 @@ void CMainWindow::DisplayStats(CDC *pDC) {
 
 void CMainWindow::RefreshStats() {
 	CDC         *pDC;
-	//BOOL        bSuccess;
+	//bool        bSuccess;
 
 	pDC = GetDC();
 
@@ -410,7 +410,7 @@ void CMainWindow::RefreshStats() {
 			(*m_pHourGlass).RefreshSprite(pDC);      // ... restoring the image but forcing it to
 		}
 	}
-	if (m_cCryptograms->bIsGameOver == TRUE) {
+	if (m_cCryptograms->bIsGameOver == true) {
 		if (m_lpGameStruct->bPlayingMetagame)
 			m_lpGameStruct->lScore = m_cCryptograms->m_cStats->m_nScore;
 	}
@@ -424,7 +424,7 @@ void CMainWindow::GameWin() {
 
 	KillTimer(STAT_TIMER_ID);
 	m_cCryptograms->m_cStats->m_nScore = SCORE_JACKPOT;
-	m_cCryptograms->bIsGameOver = TRUE;
+	m_cCryptograms->bIsGameOver = true;
 
 	RefreshStats();
 	pDC = GetDC();
@@ -443,7 +443,7 @@ void CMainWindow::GameLose() {
 	KillTimer(STAT_TIMER_ID);
 	pDC = GetDC();
 
-	m_cCryptograms->bIsGameOver = TRUE;
+	m_cCryptograms->bIsGameOver = true;
 	m_cCryptograms->m_cStats->m_nCountDown = 0;
 	m_cCryptograms->m_cStats->m_nScore = m_cCryptograms->LettersSolved() * SCORE_FACTOR;
 
@@ -484,7 +484,7 @@ void CMainWindow::GameLose() {
  *  n/a
  *
  ****************************************************************/
-BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	CDC         *pDC;
 	long        IntervalLength = 0;
 	CRules      RulesDlg((CWnd *)this, RULES_TEXT, pGamePalette,
@@ -497,18 +497,18 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	    (m_lpGameStruct->bSoundEffectsEnabled ? RULES_WAV : nullptr),
 		m_lpGameStruct);
 
-	m_bPause = TRUE;
+	m_bPause = true;
 
 	if (HIWORD(lParam) == BN_CLICKED) {
 		switch (wParam) {
 
 		case IDC_OPTIONS_RULES:
-			m_bIgnoreScrollClick = TRUE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
+			m_bIgnoreScrollClick = true;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
 			CSound::waitWaveSounds();
 			(void) RulesDlg.DoModal();
-			m_bPause = FALSE;
+			m_bPause = false;
 
 			break;
 
@@ -522,12 +522,12 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			/**********************************************************
 			* Dump User out if error occured in cryptogram text file. *
 			**********************************************************/
-			if (m_cCryptograms->DrawGram(pDC) == FALSE) {
+			if (m_cCryptograms->DrawGram(pDC) == false) {
 				char szMsg[128];
 				Common::sprintf_s(szMsg, "File error.  Check %s.", CRYPT_TXT_FILE);
 				MessageBox(szMsg);
 				PostMessage(WM_CLOSE, 0, 0);
-				return FALSE;
+				return false;
 			}
 
 			KillTimer(STAT_TIMER_ID);
@@ -547,38 +547,38 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 			ReleaseDC(pDC);
 
-			m_bIgnoreScrollClick = FALSE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-			if (m_cCryptograms->IsSolved() == TRUE) {
+			m_bIgnoreScrollClick = false;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+			if (m_cCryptograms->IsSolved() == true) {
 				GameWin();
 				if (m_lpGameStruct->bPlayingMetagame)
 					PostMessage(WM_CLOSE, 0, 0);
 			}
-			m_bPause = FALSE;
+			m_bPause = false;
 
 			break;
 
 		case IDC_SCROLL:
 			if (m_bIgnoreScrollClick) {
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 				break;
 			}
-			m_bIgnoreScrollClick = TRUE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
-			SendDlgItemMessage(IDC_SCROLL, BM_SETSTATE, TRUE, 0L);
+			m_bIgnoreScrollClick = true;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
+			SendDlgItemMessage(IDC_SCROLL, BM_SETSTATE, true, 0L);
 
 			switch (COptionsWind.DoModal()) {
 
 			case IDC_OPTIONS_RETURN:
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-				m_bIgnoreScrollClick = FALSE;
-				m_bPause = FALSE;
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+				m_bIgnoreScrollClick = false;
+				m_bPause = false;
 				break;
 
 			case IDC_OPTIONS_NEWGAME:
 				pDC = GetDC();
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-				m_bIgnoreScrollClick = FALSE;
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+				m_bIgnoreScrollClick = false;
 
 				//UpdateWindow();
 				PostMessage(WM_COMMAND, IDC_OPTIONS_NEWGAME, BN_CLICKED);
@@ -586,10 +586,10 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 			case IDC_OPTIONS_QUIT:
 				PostMessage(WM_CLOSE, 0, 0);
-				return FALSE;
+				return false;
 
 			} //end switch(ComDlg.DoModal())
-			if ((m_lpGameStruct->bMusicEnabled == FALSE) && (pGameSound != nullptr)) {
+			if ((m_lpGameStruct->bMusicEnabled == false) && (pGameSound != nullptr)) {
 				if (pGameSound->playing())
 					(*pGameSound).stop();
 			} else if (m_lpGameStruct->bMusicEnabled) {
@@ -609,7 +609,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	}
 
 	(*this).SetFocus();                     // Reset focus back to the main window
-	return TRUE;
+	return true;
 }
 
 /*****************************************************************
@@ -644,7 +644,7 @@ void CMainWindow::OnChar(unsigned int nChar, unsigned int nRepCnt, unsigned int
 
 	pDC = GetDC();
 
-	if (m_cCryptograms->HandleUserUpdate(pDC, nChar) == TRUE) {
+	if (m_cCryptograms->HandleUserUpdate(pDC, nChar) == true) {
 		GameWin();
 		if (m_lpGameStruct->bPlayingMetagame)
 			PostMessage(WM_CLOSE, 0, 0);
@@ -741,7 +741,7 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	        torch3Rect,
 	        torch4Rect,
 	        hourRect;
-	BOOL    bSuccess;
+	bool    bSuccess;
 	int     i,
 	        nPick = 0,
 	        nSleepTime;
@@ -760,7 +760,7 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	hourRect.SetRect(HOUR_X, HOUR_Y, HOUR_X + HOUR_DX, HOUR_Y + HOUR_DY);
 
 	pDC = GetDC();
-	if ((*m_cCryptograms).HandleUserUpdate(pDC, point) == TRUE) {
+	if ((*m_cCryptograms).HandleUserUpdate(pDC, point) == true) {
 		GameWin();
 		if (m_lpGameStruct->bPlayingMetagame)
 			PostMessage(WM_CLOSE, 0, 0);
@@ -768,7 +768,7 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	}
 	ReleaseDC(pDC);
 
-	if ((m_cNewGame.PtInRect(point) == TRUE) && (!m_lpGameStruct->bPlayingMetagame))
+	if ((m_cNewGame.PtInRect(point) == true) && (!m_lpGameStruct->bPlayingMetagame))
 		PostMessage(WM_COMMAND, IDC_OPTIONS_NEWGAME, BN_CLICKED);
 	else if (skullRect.PtInRect(point)) {
 		pDC = GetDC();
@@ -776,8 +776,8 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 		(*pSprite).SharePalette(pGamePalette);
 		bSuccess = (*pSprite).LoadCels(pDC, ".\\art\\skull.bmp", NUM_SKULL_CELS);
 		ASSERT(bSuccess);
-		(*pSprite).SetMasked(FALSE);
-		(*pSprite).SetMobile(FALSE);
+		(*pSprite).SetMasked(false);
+		(*pSprite).SetMobile(false);
 
 		if (m_lpGameStruct->bSoundEffectsEnabled) {
 			nPick = brand() % NUM_SKULL_SOUNDS;
@@ -837,8 +837,8 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 		(*pSprite).SharePalette(pGamePalette);
 		bSuccess = (*pSprite).LoadCels(pDC, ".\\art\\urn01.bmp", NUM_URN1_CELS);
 		ASSERT(bSuccess);
-		(*pSprite).SetMasked(FALSE);
-		(*pSprite).SetMobile(FALSE);
+		(*pSprite).SetMasked(false);
+		(*pSprite).SetMobile(false);
 
 		if (m_lpGameStruct->bSoundEffectsEnabled) {
 			pEffect = new CSound((CWnd *)this, WAV_URN1, SOUND_QUEUE |
@@ -862,8 +862,8 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 		(*pSprite).SharePalette(pGamePalette);
 		bSuccess = (*pSprite).LoadCels(pDC, ".\\art\\urn02.bmp", NUM_URN2_CELS);
 		ASSERT(bSuccess);
-		(*pSprite).SetMasked(FALSE);
-		(*pSprite).SetMobile(FALSE);
+		(*pSprite).SetMasked(false);
+		(*pSprite).SetMobile(false);
 
 		if (m_lpGameStruct->bSoundEffectsEnabled) {
 			pEffect = new CSound((CWnd *)this, WAV_URN2, SOUND_QUEUE |
@@ -887,8 +887,8 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 		(*pSprite).SharePalette(pGamePalette);
 		bSuccess = (*pSprite).LoadCels(pDC, ".\\art\\urn03.bmp", NUM_URN3_CELS);
 		ASSERT(bSuccess);
-		(*pSprite).SetMasked(FALSE);
-		(*pSprite).SetMobile(FALSE);
+		(*pSprite).SetMasked(false);
+		(*pSprite).SetMobile(false);
 
 		if (m_lpGameStruct->bSoundEffectsEnabled) {
 			pEffect = new CSound((CWnd *)this, WAV_URN3, SOUND_QUEUE |
@@ -938,7 +938,7 @@ void CMainWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 	CDC *pDC;
 
 	pDC = GetDC();
-	if ((*m_cCryptograms).HandleUserUpdate(pDC, point) == TRUE) {
+	if ((*m_cCryptograms).HandleUserUpdate(pDC, point) == true) {
 		GameWin();
 		if (m_lpGameStruct->bPlayingMetagame)
 			PostMessage(WM_CLOSE, 0, 0);
@@ -946,7 +946,7 @@ void CMainWindow::OnLButtonDblClk(unsigned int nFlags, CPoint point) {
 		return;
 	}
 
-	if ((m_cNewGame.PtInRect(point) == TRUE) && (!m_lpGameStruct->bPlayingMetagame))
+	if ((m_cNewGame.PtInRect(point) == true) && (!m_lpGameStruct->bPlayingMetagame))
 		PostMessage(WM_COMMAND, IDC_OPTIONS_NEWGAME, BN_CLICKED);
 }
 
@@ -1009,7 +1009,7 @@ void CMainWindow::OnRButtonDblClk(unsigned int nFlags, CPoint point) {
  *
  ****************************************************************/
 void CMainWindow::OnTimer(uintptr nIDEvent) {
-	if ((nIDEvent == STAT_TIMER_ID) && (m_bPause == FALSE)) {
+	if ((nIDEvent == STAT_TIMER_ID) && (m_bPause == false)) {
 		// move pointer to next hour glass formation
 		//
 		m_nTimer++;
@@ -1088,12 +1088,12 @@ void CMainWindow::OnSysKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigne
 void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
 	if (nChar == VK_F1) {                                  // F1 key is hit
 		SendMessage(WM_COMMAND, IDC_OPTIONS_RULES, BN_CLICKED);  // Activate the Options dialog
-		(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L); // Reset scroll button to up state
-		m_bIgnoreScrollClick = FALSE;
+		(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L); // Reset scroll button to up state
+		m_bIgnoreScrollClick = false;
 	} else if (nChar == VK_F2) {                                 // F2 key is hit
 		SendMessage(WM_COMMAND, IDC_SCROLL, BN_CLICKED);     // Activate the Rules dialog
-		(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L); // Reset scroll button to up state
-		m_bIgnoreScrollClick = FALSE;
+		(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L); // Reset scroll button to up state
+		m_bIgnoreScrollClick = false;
 	}
 }
 
@@ -1181,12 +1181,12 @@ void CMainWindow::OnDestroy() {
 void CMainWindow::FlushInputEvents(void) {
 	MSG msg;
 
-	while (TRUE) {                                      // find and remove all keyboard events
+	while (true) {                                      // find and remove all keyboard events
 		if (!PeekMessage(&msg, nullptr, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE))
 			break;
 	}
 
-	while (TRUE) {                                      // find and remove all mouse events
+	while (true) {                                      // find and remove all mouse events
 		if (!PeekMessage(&msg, nullptr, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE))
 			break;
 	}
@@ -1215,11 +1215,11 @@ void CMainWindow::FlushInputEvents(void) {
  *
  * RETURN VALUE:
  *
- *      BOOL        Success (TRUE) / Failure (FALSE) status
+ *      bool        Success (true) / Failure (false) status
  *
  ****************************************************************/
 /*
-BOOL CTheApp::InitInstance()
+bool CTheApp::InitInstance()
 {
     CMainWindow *pMyMain;
 
@@ -1236,7 +1236,7 @@ BOOL CTheApp::InitInstance()
 
     m_pMainWnd->UpdateWindow();
 
-    return(TRUE);
+    return(true);
 }
 
 */
diff --git a/engines/bagel/hodjnpodj/crypt/main.h b/engines/bagel/hodjnpodj/crypt/main.h
index 7f5f098f602..8aaf6911d11 100644
--- a/engines/bagel/hodjnpodj/crypt/main.h
+++ b/engines/bagel/hodjnpodj/crypt/main.h
@@ -162,17 +162,17 @@ private:
 	CRect       m_cNewGame;             // area spanned by new game rect
 //	CCryptogram  *m_cCryptograms;        // cryptogram game object
 	CBmpButton  *m_pScrollButton;       // scroll button
-	BOOL        m_bIgnoreScrollClick;   // scroll button
-	BOOL        m_bIsFirstTimeHack;
+	bool        m_bIgnoreScrollClick;   // scroll button
+	bool        m_bIsFirstTimeHack;
 	CSprite     *m_pHourGlass;
 //	int          m_nTimer;
-//	BOOL     m_bPause;
+//	bool     m_bPause;
 
 private:
 	void        OnSoundNotify(CSound *pSound);
 
 protected:
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 
 	//{{AFX_MSG( CMainWindow )
 	afx_msg void OnPaint();
@@ -208,7 +208,7 @@ protected:
 //
 class CTheApp : public CWinApp {
 public:
-	BOOL InitInstance();
+	bool InitInstance();
 	int ExitInstance();
 };
 
diff --git a/engines/bagel/hodjnpodj/crypt/optn.cpp b/engines/bagel/hodjnpodj/crypt/optn.cpp
index fc66bd25d32..71b12dac32b 100644
--- a/engines/bagel/hodjnpodj/crypt/optn.cpp
+++ b/engines/bagel/hodjnpodj/crypt/optn.cpp
@@ -99,7 +99,7 @@ int COptn::TimeToIndex(int nTime) {
 			return (int)nLow;
 	}
 
-	return FALSE;
+	return false;
 }
 
 void COptn::DoDataExchange(CDataExchange* pDX) {
@@ -123,12 +123,12 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // COptn message handlers
 
-BOOL COptn::OnInitDialog() {
+bool COptn::OnInitDialog() {
 	CRect   statsRect;                      // game stats displays
 	int     nStat_col_offset;               // game stats placement
 	int     nStat_row_offset;
 	int     nStatWidth, nStatHeight;
-	BOOL    bAssertCheck;
+	bool    bAssertCheck;
 	CDC     *pDC;
 
 	CBmpDialog::OnInitDialog();
@@ -171,8 +171,8 @@ BOOL COptn::OnInitDialog() {
 		bAssertCheck = (*m_pLttrsSlvd).SetupText(pDC, pGamePalette, &statsRect, JUSTIFY_LEFT);
 		ASSERT(bAssertCheck);               // initialize the text objext
 	}
-	m_LttrsSlvd.SetScrollRange(MIN_LTTRSSLVD, MAX_LTTRSSLVD, FALSE);    // setup Letters Solved defaults
-	m_LttrsSlvd.SetScrollPos(m_nLttrsSlvd, TRUE);
+	m_LttrsSlvd.SetScrollRange(MIN_LTTRSSLVD, MAX_LTTRSSLVD, false);    // setup Letters Solved defaults
+	m_LttrsSlvd.SetScrollPos(m_nLttrsSlvd, true);
 
 	nStat_row_offset += BOX_ROW_OFFSET;     // Time stat display box
 	statsRect.SetRect(
@@ -187,8 +187,8 @@ BOOL COptn::OnInitDialog() {
 		ASSERT(bAssertCheck);               // initialize the text objext
 	}
 
-	m_Time.SetScrollRange(MIN_INDEX_TIME, MAX_INDEX_TIME, FALSE);               // Time scroll bar defaults
-	m_Time.SetScrollPos(m_nTime, TRUE);
+	m_Time.SetScrollRange(MIN_INDEX_TIME, MAX_INDEX_TIME, false);               // Time scroll bar defaults
+	m_Time.SetScrollPos(m_nTime, true);
 
 	if ((pOKButton = new CColorButton) != nullptr) {                   // build a color QUIT button to let us exit
 		(*pOKButton).SetPalette(pGamePalette);                      // set the palette to use
@@ -201,7 +201,7 @@ BOOL COptn::OnInitDialog() {
 	}
 
 	ReleaseDC(pDC);
-	return TRUE;  // return TRUE  unless you set the focus to a control
+	return true;  // return true  unless you set the focus to a control
 }
 
 void COptn::OnDestroy(void) {
@@ -212,7 +212,7 @@ void COptn::OnDestroy(void) {
 void COptn::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar) {
 	// TODO: Add your message handler code here and/or call default
 	CDC     *pDC;
-	BOOL    bAssertCheck;
+	bool    bAssertCheck;
 	char    msg[64];
 
 	pDC = GetDC();
@@ -259,7 +259,7 @@ void COptn::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScro
 		Common::sprintf_s(msg, "Letters Solved: %d", m_nLttrsSlvd);
 		bAssertCheck = (*m_pLttrsSlvd).DisplayString(pDC, msg, FONT_SIZE, FW_BOLD, OPTIONS_COLOR);
 		ASSERT(bAssertCheck);
-		pScrollBar->SetScrollPos(m_nLttrsSlvd, TRUE);
+		pScrollBar->SetScrollPos(m_nLttrsSlvd, true);
 
 	} else if (pScrollBar->GetDlgCtrlID() == IDC_TIME) {
 		switch (nSBCode) {
@@ -298,7 +298,7 @@ void COptn::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScro
 		bAssertCheck = (*m_pTime).DisplayString(pDC, msg, FONT_SIZE, FW_BOLD, OPTIONS_COLOR);
 		ASSERT(bAssertCheck);   // paint the text
 
-		pScrollBar->SetScrollPos(m_nTime, TRUE);
+		pScrollBar->SetScrollPos(m_nTime, true);
 	} // end if
 
 	ReleaseDC(pDC);
@@ -308,7 +308,7 @@ void COptn::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScro
 
 void COptn::OnPaint() {
 	CDC     *pDC;
-	BOOL    bAssertCheck;
+	bool    bAssertCheck;
 	char    msg[64];
 
 	CBmpDialog::OnPaint();
@@ -327,8 +327,8 @@ void COptn::OnPaint() {
 	ReleaseDC(pDC);
 }
 
-BOOL COptn::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;
+bool COptn::OnEraseBkgnd(CDC *pDC) {
+	return true;
 }
 
 void COptn::OnOK() {
diff --git a/engines/bagel/hodjnpodj/crypt/optn.h b/engines/bagel/hodjnpodj/crypt/optn.h
index 880c21a6fee..e68d154b322 100644
--- a/engines/bagel/hodjnpodj/crypt/optn.h
+++ b/engines/bagel/hodjnpodj/crypt/optn.h
@@ -60,7 +60,7 @@ private:
 	int         TimeToIndex(int nTime);
 
 public:
-	COptn(CWnd* pParent = nullptr, CPalette *pGamePalette = nullptr, int nLttrsSolvd = FALSE, int nTime = FALSE); // standard constructor
+	COptn(CWnd* pParent = nullptr, CPalette *pGamePalette = nullptr, int nLttrsSolvd = false, int nTime = false); // standard constructor
 	~COptn();
 	void ClearDialogImage(void);
 
@@ -78,9 +78,9 @@ protected:
 
 	// Generated message map functions
 	//{{AFX_MSG(COptn)
-	virtual BOOL OnInitDialog() override;
+	virtual bool OnInitDialog() override;
 	afx_msg void OnPaint();
-	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
+	afx_msg bool OnEraseBkgnd(CDC *pDC);
 	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	virtual void OnOK() override;
 	virtual void OnCancel() override;
diff --git a/engines/bagel/hodjnpodj/crypt/pnt_gram.cpp b/engines/bagel/hodjnpodj/crypt/pnt_gram.cpp
index 1afa057bd96..cb15dcfb145 100644
--- a/engines/bagel/hodjnpodj/crypt/pnt_gram.cpp
+++ b/engines/bagel/hodjnpodj/crypt/pnt_gram.cpp
@@ -66,7 +66,7 @@ CPaintGram::CPaintGram(CDC *pDC)
 	    m_nStandardCharWidth(STANDARD_CHAR_WIDTH) {
 	CBitmap *pFontSource = nullptr,
 	         *pFontCel = nullptr;
-	BOOL    bSuccess;
+	bool    bSuccess;
 	int     i;
 	int     nExtraWidth = 0;
 	int     nFontWidth[] =  { 11, 10, 5, 9, 11, 11, 11, 11, 11,             // 9 symbols
@@ -105,8 +105,8 @@ CPaintGram::CPaintGram(CDC *pDC)
 		bSuccess = (*m_cAlphabet[i]).LoadSprite(pFontCel, pGamePalette);
 		ASSERT(bSuccess);
 
-		(*m_cAlphabet[i]).SetMobile(TRUE);
-		(*m_cAlphabet[i]).SetMasked(TRUE);
+		(*m_cAlphabet[i]).SetMobile(true);
+		(*m_cAlphabet[i]).SetMasked(true);
 		(*m_cAlphabet[i]).SetTypeCode(IndexToChar(i));  // set user defined Type Code to corres to the letter
 	}  // end for
 
@@ -119,8 +119,8 @@ CPaintGram::CPaintGram(CDC *pDC)
 		bSuccess = (*m_cUsedAlphabet[i]).LoadSprite(pFontCel, pGamePalette);
 		ASSERT(bSuccess);
 
-		(*m_cUsedAlphabet[i]).SetMobile(TRUE);
-		(*m_cUsedAlphabet[i]).SetMasked(TRUE);
+		(*m_cUsedAlphabet[i]).SetMobile(true);
+		(*m_cUsedAlphabet[i]).SetMasked(true);
 		(*m_cUsedAlphabet[i]).SetTypeCode(SetAlphaType(IndexToChar(i)));    // set user defined Type Code to corres to the letter
 	}  // end for
 
@@ -133,8 +133,8 @@ CPaintGram::CPaintGram(CDC *pDC)
 		bSuccess = (*m_cRevealAlphabet[i]).LoadSprite(pFontCel, pGamePalette);
 		ASSERT(bSuccess);
 
-		(*m_cRevealAlphabet[i]).SetMobile(TRUE);
-		(*m_cRevealAlphabet[i]).SetMasked(TRUE);
+		(*m_cRevealAlphabet[i]).SetMobile(true);
+		(*m_cRevealAlphabet[i]).SetMasked(true);
 		(*m_cRevealAlphabet[i]).SetTypeCode(SetAlphaType(IndexToChar(i)));  // set user defined Type Code to corres to the letter
 	}  // end for
 
@@ -149,9 +149,9 @@ CPaintGram::CPaintGram(CDC *pDC)
 	bSuccess = (*m_cHiLite).LoadResourceSprite(pDC, HILITE_RESOURCE_ID);
 	ASSERT(bSuccess);
 
-	(*m_cHiLite).SetMobile(TRUE);
-	(*m_cHiLite).SetMasked(TRUE);
-	(*m_cHiLite).SetTypeCode(SetHiLiteTypeOn(FALSE));
+	(*m_cHiLite).SetMobile(true);
+	(*m_cHiLite).SetMasked(true);
+	(*m_cHiLite).SetTypeCode(SetHiLiteTypeOn(false));
 
 }
 
@@ -219,11 +219,11 @@ CPaintGram::~CPaintGram() {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CPaintGram::IsHiLiteType(int nTypeCode) {
-	if ((nTypeCode & HILITE_TYPE) != FALSE) {    // True is anything > 0
-		return TRUE;
+bool CPaintGram::IsHiLiteType(int nTypeCode) {
+	if ((nTypeCode & HILITE_TYPE) != false) {    // True is anything > 0
+		return true;
 	} else {
-		return FALSE;
+		return false;
 	}
 }
 
@@ -252,11 +252,11 @@ BOOL CPaintGram::IsHiLiteType(int nTypeCode) {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CPaintGram::IsAlphabetType(int nTypeCode) {
-	if ((nTypeCode & ALPHA_TYPE) != FALSE) {     // True is anything > 0
-		return TRUE;
+bool CPaintGram::IsAlphabetType(int nTypeCode) {
+	if ((nTypeCode & ALPHA_TYPE) != false) {     // True is anything > 0
+		return true;
 	} else {
-		return FALSE;
+		return false;
 	}
 }
 
@@ -285,11 +285,11 @@ BOOL CPaintGram::IsAlphabetType(int nTypeCode) {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CPaintGram::IsGramType(int nTypeCode) {
-	if (IsAlphabetType(nTypeCode) == FALSE) {    // True is anything > 0
-		return TRUE;
+bool CPaintGram::IsGramType(int nTypeCode) {
+	if (IsAlphabetType(nTypeCode) == false) {    // True is anything > 0
+		return true;
 	} else {
-		return FALSE;
+		return false;
 	}
 }
 
@@ -318,19 +318,19 @@ BOOL CPaintGram::IsGramType(int nTypeCode) {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CPaintGram::IsUsedType(int nTypeCode) {
-	if ((nTypeCode & USED_TYPE) != FALSE) {      // True is anything > 0
-		return TRUE;
+bool CPaintGram::IsUsedType(int nTypeCode) {
+	if ((nTypeCode & USED_TYPE) != false) {      // True is anything > 0
+		return true;
 	} else {
-		return FALSE;
+		return false;
 	}
 }
 
-BOOL CPaintGram::IsRevealType(int nTypeCode) {
-	if ((nTypeCode & REVEAL_TYPE) != FALSE) {    // True is anything > 0
-		return TRUE;
+bool CPaintGram::IsRevealType(int nTypeCode) {
+	if ((nTypeCode & REVEAL_TYPE) != false) {    // True is anything > 0
+		return true;
 	} else {
-		return FALSE;
+		return false;
 	}
 }
 
@@ -359,11 +359,11 @@ BOOL CPaintGram::IsRevealType(int nTypeCode) {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CPaintGram::IsAlphaChar(char chChar) {
+bool CPaintGram::IsAlphaChar(char chChar) {
 	if (chChar >= A && chChar <= Z) {
-		return TRUE;
+		return true;
 	} else {
-		return FALSE;
+		return false;
 	}
 }
 
@@ -392,8 +392,8 @@ BOOL CPaintGram::IsAlphaChar(char chChar) {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CPaintGram::IsSymbolChar(char chChar) {
-	return SymbToIndex(chChar) != FALSE;
+bool CPaintGram::IsSymbolChar(char chChar) {
+	return SymbToIndex(chChar) != false;
 }
 
 /*****************************************************************
@@ -463,7 +463,7 @@ char CPaintGram::IndexToSymb(int nIndex) {
 	case 44:
 		return '9';
 	default:
-		return FALSE;
+		return false;
 	}
 }
 
@@ -534,7 +534,7 @@ int CPaintGram::SymbToIndex(char chChar) {
 	case '9':
 		return 44;
 	default:
-		return FALSE;
+		return false;
 	}
 }
 
@@ -566,7 +566,7 @@ int CPaintGram::SymbToIndex(char chChar) {
 char CPaintGram::IndexToChar(int nIndex) {
 	char chSym = IndexToSymb(nIndex);
 
-	if (chSym != FALSE) {
+	if (chSym != false) {
 		return (chSym);
 	} else {
 		return (char)nIndex + ASCII_OFFSET;
@@ -601,7 +601,7 @@ char CPaintGram::IndexToChar(int nIndex) {
 int CPaintGram::CharToIndex(char chChar) {
 	int nSym = SymbToIndex(chChar);
 
-	if (nSym != FALSE) {
+	if (nSym != false) {
 		return nSym;
 	} else {
 		return (int)toupper(chChar) - ASCII_OFFSET;
@@ -693,7 +693,7 @@ void CPaintGram::PaintGram(CDC *pDC, const char *lpszCryptedGram) {
 	* Once it finds a complete line within this boundary, it will   *
 	* call 'PaintLine' member to draw the visual line.              *
 	****************************************************************/
-	for (i = 0, nSpaceMarker = 0, nStartPos = 0; TRUE; i++) {
+	for (i = 0, nSpaceMarker = 0, nStartPos = 0; true; i++) {
 		if (lpszCryptedGram[i] == 0) {
 			if ((nLineLength + m_nGramRightMargin) >= m_cGramRegion.Width()) {
 				nSpaceMarker++;                     // Advance one past space
@@ -740,7 +740,7 @@ void CPaintGram::PaintGram(CDC *pDC, const char *lpszCryptedGram) {
 			//((*m_cAlphabet[nChar]).GetSize()).cx + m_nGramLetterSpacing;
 		} // end if
 
-		if ((nIndexChar = SymbToIndex(lpszCryptedGram[i])) != FALSE) {   // '.' thru ':'
+		if ((nIndexChar = SymbToIndex(lpszCryptedGram[i])) != false) {   // '.' thru ':'
 			nLineLength += ((*m_cAlphabet[nIndexChar]).GetSize()).cx + m_nGramLetterSpacing;
 		} // end if
 	} // end for
@@ -795,7 +795,7 @@ void CPaintGram::PaintLine(CDC *pDC, const char *lpszCryptedGram, CSize cPos, in
 		} // end if
 
 
-		if (IsAlphaChar(lpszCryptedGram[j]) == TRUE) {   // A - Z char?
+		if (IsAlphaChar(lpszCryptedGram[j]) == true) {   // A - Z char?
 			nChar = CharToIndex(lpszCryptedGram[j]);
 			m_cDisplayLetters = (*m_cAlphabet[nChar]).DuplicateSprite(pDC);
 			//(*m_cDisplayLetters).SetTypeCode(SetGramType(IndexToAlpha(i)));
@@ -807,7 +807,7 @@ void CPaintGram::PaintLine(CDC *pDC, const char *lpszCryptedGram, CSize cPos, in
 			//cLetterDim.cx + m_nGramLetterSpacing;
 		} // end if
 
-		if (IsSymbolChar(lpszCryptedGram[j]) == TRUE) {      // '.' thru ':'
+		if (IsSymbolChar(lpszCryptedGram[j]) == true) {      // '.' thru ':'
 			nChar = CharToIndex(lpszCryptedGram[j]);
 			m_cDisplayLetters = (*m_cAlphabet[nChar]).DuplicateSprite(pDC);
 			(*m_cDisplayLetters).LinkSprite();
@@ -849,7 +849,7 @@ int CPaintGram::CenterGramVert(CCryptRecord *pRec) {
 	for (
 	    i = 0,
 	    nSpaceMarker = 0,
-	    nLineLength = m_nGramLeftMargin; TRUE ; i++
+	    nLineLength = m_nGramLeftMargin; true ; i++
 	) {             // Estimate for Gram
 		if (lpszGram[i] == 0) {
 			if ((nLineLength + m_nGramRightMargin) >= m_cGramRegion.Width()) {
@@ -894,7 +894,7 @@ int CPaintGram::CenterGramVert(CCryptRecord *pRec) {
 	for (
 	    i = 0,
 	    nSpaceMarker = 0,
-	    nLineLength = m_nGramLeftMargin; TRUE ; i++
+	    nLineLength = m_nGramLeftMargin; true ; i++
 	) {             // Estimate for Gram
 		if (lpszSource[i] == 0) {
 			if ((nLineLength + m_nGramRightMargin) >= m_cGramRegion.Width()) {
@@ -964,16 +964,16 @@ int CPaintGram::CenterGramVert(CCryptRecord *pRec) {
  *      [Discuss return value]
  *
  ****************************************************************/
-BOOL CPaintGram::IsHiLiteOn() {
+bool CPaintGram::IsHiLiteOn() {
 	m_cDisplayLetters = CSprite::GetSpriteChain();
 	while (m_cDisplayLetters != nullptr) {
-		if (IsHiLiteType((*m_cDisplayLetters).GetTypeCode()) == TRUE) {
-			return TRUE;
+		if (IsHiLiteType((*m_cDisplayLetters).GetTypeCode()) == true) {
+			return true;
 		}
 		m_cDisplayLetters = (*m_cDisplayLetters).GetNextSprite();
 	}
 
-	return FALSE;
+	return false;
 }
 
 /*****************************************************************
@@ -1007,12 +1007,12 @@ int CPaintGram::GetHiLiteType(CDC *pDC) {
 
 	m_cDisplayLetters = CSprite::GetSpriteChain();
 	while (m_cDisplayLetters != nullptr) {
-		if (IsHiLiteType((*m_cDisplayLetters).GetTypeCode()) == TRUE) {
+		if (IsHiLiteType((*m_cDisplayLetters).GetTypeCode()) == true) {
 			crectSprite = (*m_cDisplayLetters).GetRect();
 			m_cDisplayLetters = (*m_cDisplayLetters).Interception(&crectSprite);
 			nTypeCode = (*m_cDisplayLetters).GetTypeCode();
 
-			if (IsHiLiteType(nTypeCode) == TRUE) {
+			if (IsHiLiteType(nTypeCode) == true) {
 				return (*m_cDisplayLetters).Interception(&crectSprite, m_cDisplayLetters)->GetTypeCode();
 			} else {
 				return nTypeCode;
@@ -1021,7 +1021,7 @@ int CPaintGram::GetHiLiteType(CDC *pDC) {
 		m_cDisplayLetters = (*m_cDisplayLetters).GetNextSprite();
 	}
 
-	return FALSE;
+	return false;
 }
 
 /*****************************************************************
@@ -1062,7 +1062,7 @@ void CPaintGram::HiLiteOff(CDC *pDC) {
 	while (m_cDisplayLetters != nullptr) {
 		nTypeCode = (*m_cDisplayLetters).GetTypeCode();         // Get sprite's Hilite Code
 
-		if (IsHiLiteType(nTypeCode) == TRUE) {               // Is this sprite hi-lited?
+		if (IsHiLiteType(nTypeCode) == true) {               // Is this sprite hi-lited?
 			pSprite = (*m_cDisplayLetters).GetNextSprite();     // Yes - save current pos in sprite chain
 			(*m_cDisplayLetters).RefreshBackground(pDC);        // ...repaint background
 			(*m_cDisplayLetters).UnlinkSprite();                // ...unlink it from chain
@@ -1121,7 +1121,7 @@ void CPaintGram::HiLiteOn(CDC *pDC, int nTypeCode) {
 			(*m_cDisplayLetters).LinkSprite();
 			(*m_cDisplayLetters).PaintSprite(pDC, cpointSprite);
 
-			if (IsAlphabetType(nTypeCode) == TRUE)               // Hilited char in alpha region?
+			if (IsAlphabetType(nTypeCode) == true)               // Hilited char in alpha region?
 				break;                                              // Yes - break out
 
 			m_cDisplayLetters = pSprite;                            // faster than GetNextSprite call
@@ -1181,9 +1181,9 @@ void CPaintGram::ReplaceLetter(CDC *pDC, int nOldType, int nNewType) {
 			delete m_cDisplayLetters;
 
 			nIndexCode = CharToIndex(nNewType);
-			if (IsRevealType(nNewType) == TRUE) {
+			if (IsRevealType(nNewType) == true) {
 				m_cDisplayLetters = (*m_cRevealAlphabet[nIndexCode]).DuplicateSprite(pDC);  // setup new sprite
-			} else if (IsUsedType(nNewType) == TRUE) {
+			} else if (IsUsedType(nNewType) == true) {
 				m_cDisplayLetters = (*m_cUsedAlphabet[nIndexCode]).DuplicateSprite(pDC);    // setup new sprite
 			} else {
 				m_cDisplayLetters = (*m_cAlphabet[nIndexCode]).DuplicateSprite(pDC);        // setup new sprite
@@ -1192,8 +1192,8 @@ void CPaintGram::ReplaceLetter(CDC *pDC, int nOldType, int nNewType) {
 			(*m_cDisplayLetters).LinkSprite();
 			(*m_cDisplayLetters).PaintSprite(pDC, cpointSprite);
 
-			if ((IsAlphabetType(nNewType) == TRUE) ||
-			        (IsAlphabetType(nOldType) == TRUE))                 // Replacing letter in the Alphabet region?
+			if ((IsAlphabetType(nNewType) == true) ||
+			        (IsAlphabetType(nOldType) == true))                 // Replacing letter in the Alphabet region?
 				return;                                             // Yes - only on in alphabet region to replace, so quit
 
 			m_cDisplayLetters = pSprite;                            // faster than GetNextSprite call
diff --git a/engines/bagel/hodjnpodj/crypt/pnt_gram.h b/engines/bagel/hodjnpodj/crypt/pnt_gram.h
index 001a38d81a8..b7f5d691f4f 100644
--- a/engines/bagel/hodjnpodj/crypt/pnt_gram.h
+++ b/engines/bagel/hodjnpodj/crypt/pnt_gram.h
@@ -128,7 +128,7 @@ public:
 	void    PaintGram(CDC *pDC, const char *lpszCryptedGram);
 	void    PaintLine(CDC *pDC, const char *lpszCryptedGram, CSize cPos, int i);
 	void    ReplaceLetter(CDC *pDC, int nOldType, int nNewType);
-	BOOL    IsHiLiteOn();
+	bool    IsHiLiteOn();
 	int     GetHiLiteType(CDC *pDC);
 	void    HiLiteOff(CDC *pDC);
 	void    HiLiteOn(CDC *pDC, int nTypeCode);
@@ -137,13 +137,13 @@ public:
 	void    RevealOn(CDC *pDC, int nTypeCode);
 	void    ClearGram(CDC *pDC);
 
-	BOOL IsHiLiteType(int nTypeCode);
-	BOOL IsAlphabetType(int nTypeCode);
-	BOOL IsGramType(int nTypeCode);
-	BOOL IsUsedType(int nTypeCode);
-	BOOL IsRevealType(int nTypeCode);
-	BOOL IsAlphaChar(char chChar);
-	BOOL IsSymbolChar(char chChar);
+	bool IsHiLiteType(int nTypeCode);
+	bool IsAlphabetType(int nTypeCode);
+	bool IsGramType(int nTypeCode);
+	bool IsUsedType(int nTypeCode);
+	bool IsRevealType(int nTypeCode);
+	bool IsAlphaChar(char chChar);
+	bool IsSymbolChar(char chChar);
 
 
 	char IndexToSymb(int nIndex);
diff --git a/engines/bagel/hodjnpodj/crypt/rec.cpp b/engines/bagel/hodjnpodj/crypt/rec.cpp
index f4c40d34395..3ddd637ce8b 100644
--- a/engines/bagel/hodjnpodj/crypt/rec.cpp
+++ b/engines/bagel/hodjnpodj/crypt/rec.cpp
@@ -27,20 +27,20 @@ namespace Bagel {
 namespace HodjNPodj {
 namespace Crypt {
 
-BOOL CCryptRecord::GetRecord(int nID) {
+bool CCryptRecord::GetRecord(int nID) {
 	Common::SeekableReadStream *cryptFile;
 	char chBuf;
 	int i;
 
 	if ((cryptFile = makeLzssStream(CRYPT_TXT_FILE)) == nullptr)
-		return FALSE;
+		return false;
 
 	cryptFile->seek(nID * RECORD_LEN + 1);
 
 	for (i = 0; ; i++) {                                 // Grab cryptogram
 		if (i >= MAX_GRAM_LEN) {
 			delete cryptFile;
-			return FALSE;
+			return false;
 		}
 
 		chBuf = (char)cryptFile->readByte();
@@ -63,7 +63,7 @@ BOOL CCryptRecord::GetRecord(int nID) {
 	for (i = 0; ; i++) {
 		// Grab source
 		if (i >= MAX_SOURCE_LEN)
-			return FALSE;
+			return false;
 
 		chBuf = (char)cryptFile->readByte();
 		if (chBuf == '\\') {
@@ -78,7 +78,7 @@ BOOL CCryptRecord::GetRecord(int nID) {
 	}
 
 	delete cryptFile;
-	return TRUE;
+	return true;
 }
 
 } // namespace Crypt
diff --git a/engines/bagel/hodjnpodj/crypt/rec.h b/engines/bagel/hodjnpodj/crypt/rec.h
index adcf2206431..94a7a90d16d 100644
--- a/engines/bagel/hodjnpodj/crypt/rec.h
+++ b/engines/bagel/hodjnpodj/crypt/rec.h
@@ -44,7 +44,7 @@ private:
 	char    m_lpszSource[MAX_SOURCE_LEN] = { 0 };
 
 public:
-	BOOL GetRecord(int nID);
+	bool GetRecord(int nID);
 
 	int GetID() const {
 		return m_nID;
diff --git a/engines/bagel/hodjnpodj/dfa/dfa.cpp b/engines/bagel/hodjnpodj/dfa/dfa.cpp
index 9e0ea54d4fe..b2961cc2659 100644
--- a/engines/bagel/hodjnpodj/dfa/dfa.cpp
+++ b/engines/bagel/hodjnpodj/dfa/dfa.cpp
@@ -64,9 +64,9 @@ int     anBeaverShown[NUM_BEAVERS];
 
 static  CSound  *pGameSound = nullptr;                             // Game theme song
 int     nCurrentTimer;
-BOOL    bEndGame;
-BOOL    bResetGame;
-BOOL    bStart;
+bool    bEndGame;
+bool    bResetGame;
+bool    bStart;
 
 /*****************************************************************
  *
@@ -106,7 +106,7 @@ CMainDFAWindow::CMainDFAWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
 	CPalette    *pOldPal = nullptr;
 	CString     WndClass;
 	CSize       mySize;
-	BOOL        bTestCreate, bTestDibDoc;           // bool for testing the creation of each button
+	bool        bTestCreate, bTestDibDoc;           // bool for testing the creation of each button
 	CText       atxtDisplayRow[NUMBEROFROWS];
 	CDibDoc     *pDibDoc = nullptr;
 	int         x, i;
@@ -149,7 +149,7 @@ CMainDFAWindow::CMainDFAWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
 	MainRect.right = MainRect.left + GAME_WIDTH;    // determine where to place the game window
 	MainRect.bottom = MainRect.top + GAME_HEIGHT;   // ... so it is centered on the screen
 
-	pDC->SelectPalette(pOldPal, FALSE);             // replace old palette
+	pDC->SelectPalette(pOldPal, false);             // replace old palette
 	ReleaseDC(pDC);                                 // release our window context
 
 
@@ -211,9 +211,9 @@ CMainDFAWindow::CMainDFAWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
 	pTimerSprite->SharePalette(pGamePalette);
 	bTestCreate = pTimerSprite->LoadCels(pDC, TIMERSPRITE, TIMERSPRITECELS);
 	ASSERT(bTestCreate);                    // test for sprite's creation
-	pTimerSprite->SetMasked(TRUE);
-	pTimerSprite->SetMobile(TRUE);
-	pTimerSprite->SetOptimizeSpeed(TRUE);
+	pTimerSprite->SetMasked(true);
+	pTimerSprite->SetMobile(true);
+	pTimerSprite->SetOptimizeSpeed(true);
 
 	//
 	//  Set up the Mallet
@@ -224,9 +224,9 @@ CMainDFAWindow::CMainDFAWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
 	bTestCreate = pMalletSprite->LoadCels(pDC, MALLET, MALLETCELS);
 	ASSERT(bTestCreate);                    // test for sprite's creation
 
-	pMalletSprite->SetMasked(TRUE);
-	pMalletSprite->SetMobile(TRUE);
-	pMalletSprite->SetOptimizeSpeed(TRUE);
+	pMalletSprite->SetMasked(true);
+	pMalletSprite->SetMobile(true);
+	pMalletSprite->SetOptimizeSpeed(true);
 	pMalletSprite->SetHotspot(0, 12);            // Set HotSpot to center of Sprite
 	pMalletSprite->LinkSprite();
 	pMalletSprite->SetZOrder(SPRITE_TOPMOST);
@@ -245,9 +245,9 @@ CMainDFAWindow::CMainDFAWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
 		apBeaverSprite[x]->SharePalette(pGamePalette);
 		bTestCreate = apBeaverSprite[x]->LoadSprite(pDC, BeaverFiles[x]);
 		ASSERT(bTestCreate);                    // test for sprite's creation
-		apBeaverSprite[x]->SetMasked(TRUE);
-		apBeaverSprite[x]->SetMobile(TRUE);
-		apBeaverSprite[x]->SetOptimizeSpeed(TRUE);
+		apBeaverSprite[x]->SetMasked(true);
+		apBeaverSprite[x]->SetMobile(true);
+		apBeaverSprite[x]->SetOptimizeSpeed(true);
 		apBeaverSprite[x]->LinkSprite();
 		apBeaverSprite[x]->SetZOrder(SPRITE_BACKGROUND);
 		anBeaverShown[x] = 0;
@@ -266,11 +266,11 @@ CMainDFAWindow::CMainDFAWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
 	//
 	ArtRect.SetRect(0, TOP_BORDER, GAME_WIDTH,  GAME_HEIGHT - TOP_BORDER);
 
-	bResetGame = FALSE;
-	bEndGame = FALSE;
+	bResetGame = false;
+	bEndGame = false;
 	m_lScore = 0L;
 
-	if (m_lpGameStruct->bPlayingMetagame == TRUE) {
+	if (m_lpGameStruct->bPlayingMetagame == true) {
 		switch (m_lpGameStruct->nSkillLevel) {
 
 		case SKILLLEVEL_LOW:
@@ -288,15 +288,15 @@ CMainDFAWindow::CMainDFAWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct) :
 		}
 
 		nCurrentCel = -1;
-		bStart = TRUE;
+		bStart = true;
 	} else {
 		m_nTimeForGame = 30;
 		m_nBeaverDuration = 3;
 		nCurrentCel = -1;
-		bStart = FALSE;
+		bStart = false;
 	}
 
-	if (LoadBeaverSounds() == FALSE) {
+	if (LoadBeaverSounds() == false) {
 		MessageBox("Could not load sound files.", "Error in Dam Furry Animals", MB_ICONINFORMATION | MB_OK);
 	}
 
@@ -387,9 +387,9 @@ void CMainDFAWindow::OnPaint() {
  ****************************************************************/
 void CMainDFAWindow::SplashScreen() {
 	CDC         *pDC = GetDC();                                                                          // get a device context for the window
-	CPalette    *pOldPalette = pDC->SelectPalette(pGamePalette, FALSE);      // load game palette;
+	CPalette    *pOldPalette = pDC->SelectPalette(pGamePalette, false);      // load game palette;
 	CDibDoc     myDoc;
-	BOOL        bTestDibDoc;
+	bool        bTestDibDoc;
 	CRect       rcDest;         // defines where the art gets painted
 	CRect       rcDIB;          // defines where the art comes from
 	HDIB        hDIB;           // a handle to the DIB itself
@@ -422,7 +422,7 @@ void CMainDFAWindow::SplashScreen() {
 		pTimerSprite->PaintSprite(pDC, WATCH_X, WATCH_Y);
 	}
 
-	pDC->SelectPalette(pOldPalette, FALSE);                      // replace old palette
+	pDC->SelectPalette(pOldPalette, false);                      // replace old palette
 	ReleaseDC(pDC);                                                 // release the window's context
 
 }
@@ -466,7 +466,7 @@ void CMainDFAWindow::ResetGame() {
 		}
 	}
 	nCurrentTimer = 0;
-	bEndGame = FALSE;
+	bEndGame = false;
 	m_lScore = 0L;
 	ReleaseDC(pDC);
 	nCurrentCel = -1;
@@ -591,7 +591,7 @@ void CALLBACK lpfnOptionCallback(CWnd * pWnd) {
 	return;
 }
 
-BOOL CMainDFAWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CMainDFAWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	int nMainOption = 0;                        // return from the Options dialog
 
 	if (HIWORD(lParam) == BN_CLICKED)   {       // only want to look at button clicks
@@ -607,9 +607,9 @@ BOOL CMainDFAWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			SetCursor(LoadCursor(nullptr, IDC_ARROW));
 			ReleaseDC(pDC);
 
-			pOptionButton->EnableWindow(FALSE);
-			bResetGame = FALSE;
-			if (m_lpGameStruct->bPlayingMetagame == TRUE) {
+			pOptionButton->EnableWindow(false);
+			bResetGame = false;
+			if (m_lpGameStruct->bPlayingMetagame == true) {
 				CMainMenu       dlgMainOpts((CWnd *)this, pGamePalette, (NO_NEWGAME | NO_OPTIONS),
 				                            lpfnOptionCallback, RULESFILE,
 				                            (m_lpGameStruct->bSoundEffectsEnabled ? RULES_WAV : nullptr), m_lpGameStruct);
@@ -632,17 +632,17 @@ BOOL CMainDFAWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 					break;
 				case IDC_OPTIONS_NEWGAME:
 					// reset the game and start a new hand
-					bResetGame = TRUE;
+					bResetGame = true;
 					break;
 				}
 			}
-			pOptionButton->EnableWindow(TRUE);
+			pOptionButton->EnableWindow(true);
 			SetFocus();
 
-			if ((m_lpGameStruct->bMusicEnabled == FALSE) && (pGameSound != nullptr)) {
+			if ((m_lpGameStruct->bMusicEnabled == false) && (pGameSound != nullptr)) {
 				if (pGameSound->playing())
 					(*pGameSound).stop();
-			} else if (m_lpGameStruct->bMusicEnabled == TRUE) {
+			} else if (m_lpGameStruct->bMusicEnabled == true) {
 				if (pGameSound == nullptr) {
 					pGameSound = new CSound(this, GAME_THEME,
 					                        SOUND_MIDI | SOUND_LOOP | SOUND_DONT_LOOP_TO_END);
@@ -670,12 +670,12 @@ BOOL CMainDFAWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	}
 
 	(*this).SetFocus();                         // Reset focus back to the main window
-	return TRUE;
+	return true;
 }
 
 void CMainDFAWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	if (bStart) {
-		bStart = FALSE;
+		bStart = false;
 	}
 	CWnd::OnRButtonDown(nFlags, point);
 }
@@ -698,7 +698,7 @@ void CMainDFAWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 		ResetGame();
 		return;
 	} else if (bStart) {
-		bStart = FALSE;
+		bStart = false;
 		return;
 	}
 
@@ -901,7 +901,7 @@ void CMainDFAWindow::OnTimer(uintptr nWhichTimer) {
 			CMsgDlg msgBox((CWnd*)this, pGamePalette);
 
 			KillTimer(GAMETIMER);
-			bEndGame = TRUE;
+			bEndGame = true;
 			for (x = 0; x < NUM_BEAVERS; x++) {
 				apBeaverSprite[x]->EraseSprite(pDC);
 				anBeaverShown[x] = 0;
@@ -980,17 +980,17 @@ void CMainDFAWindow::OnTimer(uintptr nWhichTimer) {
  *
  ****************************************************************/
 
-BOOL CMainDFAWindow::OnEraseBkgnd(CDC *pDC) {
+bool CMainDFAWindow::OnEraseBkgnd(CDC *pDC) {
 // eat this
-	return TRUE;
+	return true;
 }
 
-void CMainDFAWindow::OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) {
+void CMainDFAWindow::OnActivate(unsigned int nState, CWnd   *pWndOther, bool bMinimized) {
 	if (!bMinimized)
 		switch (nState) {
 		case WA_ACTIVE:
 		case WA_CLICKACTIVE:
-			InvalidateRect(nullptr, FALSE);
+			InvalidateRect(nullptr, false);
 			break;
 		}
 	return;
@@ -1169,12 +1169,12 @@ void CMainDFAWindow::ReleaseResources(void) {
 void CMainDFAWindow::FlushInputEvents(void) {
 	MSG msg;
 
-	while (TRUE) {                                      // find and remove all keyboard events
+	while (true) {                                      // find and remove all keyboard events
 		if (!PeekMessage(&msg, nullptr, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE))
 			break;
 	}
 
-	while (TRUE) {                                      // find and remove all mouse events
+	while (true) {                                      // find and remove all mouse events
 		if (!PeekMessage(&msg, nullptr, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE))
 			break;
 	}
@@ -1208,13 +1208,13 @@ void CMainDFAWindow::OnSoundNotify(CSound *pSound) {
 	//
 }
 
-BOOL CMainDFAWindow::LoadBeaverSounds(void) {
+bool CMainDFAWindow::LoadBeaverSounds(void) {
 	HANDLE      hResInfo;
 	HINSTANCE   hInst;
-	BOOL        bSuccess;
+	bool        bSuccess;
 	int         i;
 	// assume no error
-	bSuccess = TRUE;
+	bSuccess = true;
 
 	hInst = (HINSTANCE)GetWindowWord(m_hWnd, GWW_HINSTANCE);
 
@@ -1225,9 +1225,9 @@ BOOL CMainDFAWindow::LoadBeaverSounds(void) {
 			if ((m_hHitRes[i] = LoadResource(hInst, (HRSRC)hResInfo)) != nullptr) {
 				if ((m_pHitSound[i] = (char *)LockResource((HGLOBAL)m_hHitRes[i])) != nullptr) {
 					// we have now loaded at least one of the master sounds
-				} else bSuccess = FALSE;
-			} else bSuccess = FALSE;
-		} else bSuccess = FALSE;
+				} else bSuccess = false;
+			} else bSuccess = false;
+		} else bSuccess = false;
 	}
 
 	for (i = 0; i < NUM_MISS_SOUNDS; i++) {
@@ -1237,9 +1237,9 @@ BOOL CMainDFAWindow::LoadBeaverSounds(void) {
 			if ((m_hMissRes[i] = LoadResource(hInst, (HRSRC)hResInfo)) != nullptr) {
 				if ((m_pMissSound[i] = (char *)LockResource((HGLOBAL)m_hMissRes[i])) != nullptr) {
 					// we have now loaded at least one of the master sounds
-				} else bSuccess = FALSE;
-			} else bSuccess = FALSE;
-		} else bSuccess = FALSE;
+				} else bSuccess = false;
+			} else bSuccess = false;
+		} else bSuccess = false;
 	}
 
 	return bSuccess;
diff --git a/engines/bagel/hodjnpodj/dfa/dfa.h b/engines/bagel/hodjnpodj/dfa/dfa.h
index 06bff1ab98e..54bf5b3c39c 100644
--- a/engines/bagel/hodjnpodj/dfa/dfa.h
+++ b/engines/bagel/hodjnpodj/dfa/dfa.h
@@ -131,10 +131,10 @@ public:
 	int             m_nBeaverDuration;
 
 private:
-	BOOL            m_bPlaySounds;            // bool for am I playing a certain # of rounds
+	bool            m_bPlaySounds;            // bool for am I playing a certain # of rounds
 	HWND            m_hCallAppWnd;
 	LPGAMESTRUCT    m_lpGameStruct;
-	BOOL            m_bMouseCaptured;
+	bool            m_bMouseCaptured;
 	long            m_lScore;
 	CRect   MainRect;						// screen area spanned by the game window
 	CRect   ArtRect;						// screen area inside the border trim
@@ -162,8 +162,8 @@ private:
 	void OnSoundNotify(CSound *pSound);
 
 protected:
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
-	BOOL LoadBeaverSounds();
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
+	bool LoadBeaverSounds();
 	void ReleaseBeaverSounds(void);
 	//
 	// Sound as resource dudes:
@@ -184,8 +184,8 @@ protected:
 	afx_msg void OnMouseMove(unsigned int, CPoint);
 	afx_msg void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	afx_msg void OnKeyDown(unsigned int, unsigned int, unsigned int);
-	afx_msg BOOL OnEraseBkgnd(CDC *);
-	afx_msg void OnActivate(unsigned int nState, CWnd   *pWndOther, BOOL bMinimized) override;
+	afx_msg bool OnEraseBkgnd(CDC *);
+	afx_msg void OnActivate(unsigned int nState, CWnd   *pWndOther, bool bMinimized) override;
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
 	//}}AFX_MSG
diff --git a/engines/bagel/hodjnpodj/dfa/dialogs.h b/engines/bagel/hodjnpodj/dfa/dialogs.h
index 99f62e26a4e..040319ad9cf 100644
--- a/engines/bagel/hodjnpodj/dfa/dialogs.h
+++ b/engines/bagel/hodjnpodj/dfa/dialogs.h
@@ -43,14 +43,14 @@ public:
 	CDFAOptDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MINIOPTIONS_DIALOG);
 	void SetInitialOptions(int = 8, int = 1);    // Sets the private members
 	void ClearDialogImage();
-	BOOL OnInitDialog() override;
+	bool OnInitDialog() override;
 
 protected:
 	//{{AFX_MSG(COptions)
 	virtual void OnCancel(void) override;
 	virtual void OnOK(void) override;
-	virtual BOOL OnCommand(WPARAM, LPARAM) override;
-	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
+	virtual bool OnCommand(WPARAM, LPARAM) override;
+	afx_msg bool OnEraseBkgnd(CDC *pDC);
 	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
@@ -70,13 +70,13 @@ public:
 	CMsgDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_MESSAGEBOX);
 	void SetInitialOptions(int, long);   // Sets the private members
 	void ClearDialogImage();
-	BOOL OnInitDialog() override;
+	bool OnInitDialog() override;
 
 protected:
 	//{{AFX_MSG(COptions)
 	virtual void OnCancel(void) override;
 	virtual void OnOK(void) override;
-	virtual BOOL OnCommand(WPARAM, LPARAM) override;
+	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
 	//}}AFX_MSG
diff --git a/engines/bagel/hodjnpodj/dfa/msgdlg.cpp b/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
index d3e592d8e96..8bad235b8e6 100644
--- a/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
@@ -95,7 +95,7 @@ CMsgDlg::CMsgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
  *      n/a
  *
  ****************************************************************/
-BOOL CMsgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CMsgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 // What ever button is clicked, end the dialog and send the ID of the button
 // clicked as the return from the dialog
 	if (HIWORD(lParam) == BN_CLICKED) {
@@ -162,8 +162,8 @@ void CMsgDlg::SetInitialOptions(int nWhichMsg, long lScore) {
 	return;
 }
 
-BOOL CMsgDlg::OnInitDialog() {
-	BOOL    bSuccess;
+bool CMsgDlg::OnInitDialog() {
+	bool    bSuccess;
 
 	CBmpDialog::OnInitDialog();
 
@@ -173,7 +173,7 @@ BOOL CMsgDlg::OnInitDialog() {
 	bSuccess = pMsgOKButton->SetControl(IDOK, this);
 	ASSERT(bSuccess);
 
-	return TRUE;
+	return true;
 }
 
 /*****************************************************************
@@ -217,7 +217,7 @@ void CMsgDlg::OnPaint(void) {
 
 	CDC     *pDC = GetDC();
 //  CText(CDC *pDC, CPalette *pPalette, CRect *pRect, int nJustify = JUSTIFY_CENTER);
-//  BOOL DisplayString(CDC *pDC, const char* pszText, const int nSize, const int nWeight, const COLORREF crColor = CTEXT_COLOR);
+//  bool DisplayString(CDC *pDC, const char* pszText, const int nSize, const int nWeight, const COLORREF crColor = CTEXT_COLOR);
 
 	CRect   rRect1(16, 40, 200, 50);
 	CRect   rRect2(16, 60, 200, 80);
diff --git a/engines/bagel/hodjnpodj/dfa/optdlg.cpp b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
index dc0a3d6af40..0fad7c9113f 100644
--- a/engines/bagel/hodjnpodj/dfa/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
@@ -112,7 +112,7 @@ CDFAOptDlg::CDFAOptDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
  *      n/a
  *
  ****************************************************************/
-BOOL CDFAOptDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CDFAOptDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 // What ever button is clicked, end the dialog and send the ID of the button
 // clicked as the return from the dialog
 	if (HIWORD(lParam) == BN_CLICKED) {
@@ -192,8 +192,8 @@ void CDFAOptDlg::SetInitialOptions(int nGTime, int nBTime) {
 }
 
 
-BOOL CDFAOptDlg::OnInitDialog() {
-	BOOL    bSuccess;
+bool CDFAOptDlg::OnInitDialog() {
+	bool    bSuccess;
 
 	CBmpDialog::OnInitDialog();
 
@@ -209,7 +209,7 @@ BOOL CDFAOptDlg::OnInitDialog() {
 	bSuccess = pDFACancelButton->SetControl(IDC_MINI_CANCEL, this);
 	ASSERT(bSuccess);
 
-	return TRUE;
+	return true;
 }
 
 /*****************************************************************
@@ -291,11 +291,11 @@ void CDFAOptDlg::OnPaint(void) {
 
 	pGTime = new CScrollBar;
 	pGTime = (CScrollBar *)GetDlgItem(IDC_GAMETIME);
-	pGTime->SetScrollRange(GAMETIMEMIN, GAMETIMEMAX, TRUE);
+	pGTime->SetScrollRange(GAMETIMEMIN, GAMETIMEMAX, true);
 	if (m_nGameTime == 0)
-		pGTime->SetScrollPos(GAMETIMEMAX, TRUE);
+		pGTime->SetScrollPos(GAMETIMEMAX, true);
 	else
-		pGTime->SetScrollPos(m_nGameTime, TRUE);
+		pGTime->SetScrollPos(m_nGameTime, true);
 
 
 	switch (m_nBeaverTime) {
@@ -316,8 +316,8 @@ void CDFAOptDlg::OnPaint(void) {
 
 	pBTime = new CScrollBar;
 	pBTime = (CScrollBar *)GetDlgItem(IDC_BEAVERDUR);
-	pBTime->SetScrollRange(BEAVERTIMEMIN, BEAVERTIMEMAX, TRUE);
-	pBTime->SetScrollPos(m_nBeaverTime, TRUE);
+	pBTime->SetScrollRange(BEAVERTIMEMIN, BEAVERTIMEMAX, true);
+	pBTime->SetScrollPos(m_nBeaverTime, true);
 
 	if (pGTime != nullptr) {
 		pGTime = nullptr;
@@ -368,10 +368,10 @@ void CDFAOptDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar*
 
 // first set the range of the scoll bar
 	if (pScrollBar->GetDlgCtrlID() == IDC_GAMETIME)
-		pScrollBar->SetScrollRange(GAMETIMEMIN, GAMETIMEMAX, TRUE);
+		pScrollBar->SetScrollRange(GAMETIMEMIN, GAMETIMEMAX, true);
 
 	if (pScrollBar->GetDlgCtrlID() == IDC_BEAVERDUR)
-		pScrollBar->SetScrollRange(BEAVERTIMEMIN, BEAVERTIMEMAX, TRUE);
+		pScrollBar->SetScrollRange(BEAVERTIMEMIN, BEAVERTIMEMAX, true);
 
 // get the scroll bar's current position, i.e. the current amount set
 	oldAmnt = pScrollBar->GetScrollPos();
@@ -416,7 +416,7 @@ void CDFAOptDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar*
 	if (pScrollBar->GetDlgCtrlID() == IDC_BEAVERDUR)
 		m_nBeaverTime = newAmnt;
 
-	pScrollBar->SetScrollPos(newAmnt, TRUE);
+	pScrollBar->SetScrollPos(newAmnt, true);
 
 // set the current amount to the new amount just set
 // and paint this new amount onto the screen
@@ -465,8 +465,8 @@ void CDFAOptDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar*
 	CDialog::OnHScroll(nSBCode, nPos, pScrollBar);
 }
 
-BOOL CDFAOptDlg::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;
+bool CDFAOptDlg::OnEraseBkgnd(CDC *pDC) {
+	return true;
 }
 
 void CDFAOptDlg::OnDestroy() {
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.cpp b/engines/bagel/hodjnpodj/fuge/fuge.cpp
index 27c8d8e5363..6e52612e4b8 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.cpp
+++ b/engines/bagel/hodjnpodj/fuge/fuge.cpp
@@ -360,7 +360,7 @@ CFugeWindow::CFugeWindow() : gvCenter(CENTER_X, CENTER_Y) {
 	CDC     *pDC;
 	CBitmap *pBmp;
 	ERROR_CODE errCode;
-	BOOL bSuccess;
+	bool bSuccess;
 
 	// assume no error
 	errCode = ERR_NONE;
@@ -436,7 +436,7 @@ CFugeWindow::CFugeWindow() : gvCenter(CENTER_X, CENTER_Y) {
 
 		if ((m_pScrollButton = new CBmpButton) != nullptr) {
 
-			m_bIgnoreScrollClick = FALSE;
+			m_bIgnoreScrollClick = false;
 			tmpRect.SetRect(SCROLL_BUTTON_X, SCROLL_BUTTON_Y, SCROLL_BUTTON_X + SCROLL_BUTTON_DX, SCROLL_BUTTON_Y + SCROLL_BUTTON_DY);
 			bSuccess = m_pScrollButton->Create(nullptr, BS_OWNERDRAW | WS_CHILD | WS_VISIBLE, tmpRect, this, IDC_MENU);
 			assert(bSuccess);
@@ -514,14 +514,14 @@ void CFugeWindow::initMembers() {
 	m_pScrollButton = nullptr;
 	m_pGamePalette = nullptr;
 	m_pSoundTrack = nullptr;
-	m_bPause = FALSE;
-	m_bGameActive = FALSE;
-	m_bIgnoreScrollClick = FALSE;
-	m_bBallOnPaddle = FALSE;
+	m_bPause = false;
+	m_bGameActive = false;
+	m_bIgnoreScrollClick = false;
+	m_bBallOnPaddle = false;
 	m_nPaddleCelIndex = 29;
 	m_pPaddle = nullptr;
 	m_pBall = nullptr;
-	m_bMovingPaddle = FALSE;
+	m_bMovingPaddle = false;
 	m_lScore = 0;
 	m_pBrickSound = nullptr;
 	m_pWallSound = nullptr;
@@ -533,8 +533,8 @@ void CFugeWindow::initMembers() {
 	m_hExtraLifeRes = nullptr;
 	pGameParams->lScore = 0;
 	m_nNumRows = 0;
-	m_bJoyActive = FALSE;
-	memset(m_bBrickVisible, 0, sizeof(BOOL) * N_BRICKS);
+	m_bJoyActive = false;
+	memset(m_bBrickVisible, 0, sizeof(bool) * N_BRICKS);
 }
 
 void CFugeWindow::initStatics() {
@@ -548,7 +548,7 @@ void CFugeWindow::initStatics() {
 void CFugeWindow::InitializeJoystick(void) {
 	JOYINFO     joyInfo;
 
-	if (joySetCapture(m_hWnd, JOYSTICKID1, 10000, TRUE) == JOYERR_NOERROR) {
+	if (joySetCapture(m_hWnd, JOYSTICKID1, 10000, true) == JOYERR_NOERROR) {
 		//
 		// Calibrate the joystick
 		//
@@ -556,7 +556,7 @@ void CFugeWindow::InitializeJoystick(void) {
 		joyGetPos(JOYSTICKID1, &joyInfo);
 		m_nJoyOrgX = joyInfo.wXpos;
 		m_nJoyOrgY = joyInfo.wYpos;
-		m_bJoyActive = TRUE;
+		m_bJoyActive = true;
 
 	} else {
 		//CMessageBox dlgNoJoystick((CWnd *)this, m_pGamePalette, "Warning!  No Joystick", "Driver Installed");
@@ -594,16 +594,16 @@ ERROR_CODE CFugeWindow::LoadMasterSprites(void) {
 
 			if ((m_pBall = new CSprite) != nullptr) {
 
-				if (m_pBall->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pBall->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pBall->LoadResourceSprite(pDC, IDB_BALL) != FALSE) {
+					if (m_pBall->LoadResourceSprite(pDC, IDB_BALL) != false) {
 
-						m_pBall->SetMasked(TRUE);
-						m_pBall->SetMobile(TRUE);
+						m_pBall->SetMasked(true);
+						m_pBall->SetMobile(true);
 
 						// uncomment this if we decide to animate the ball as
 						// it moves
-						//if (m_pBall->LoadResourceCels(pDC, IDB_BALLSTRIP, N_BALLS) == FALSE)
+						//if (m_pBall->LoadResourceCels(pDC, IDB_BALLSTRIP, N_BALLS) == false)
 						//    errCode = ERR_UNKNOWN;
 
 					} else {
@@ -665,7 +665,7 @@ void CFugeWindow::HandleError(ERROR_CODE errCode) {
 void CFugeWindow::OnPaint() {
 	PAINTSTRUCT lpPaint;
 
-	Invalidate(FALSE);
+	Invalidate(false);
 	BeginPaint(&lpPaint);
 	PaintScreen();
 	EndPaint(&lpPaint);
@@ -733,7 +733,7 @@ void CFugeWindow::RepaintSpriteList(CDC *pDC) {
 }
 
 
-BOOL CFugeWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CFugeWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	CMainMenu COptionsWind((CWnd *)this,
 	                       m_pGamePalette,
 	                       (pGameParams->bPlayingMetagame ? (NO_NEWGAME | NO_OPTIONS) : 0) | (m_bGameActive ? 0 : NO_RETURN),
@@ -749,11 +749,11 @@ BOOL CFugeWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 			// hide the command scroll
 			//
-			m_pScrollButton->SendMessage(BM_SETSTATE, TRUE, 0);
+			m_pScrollButton->SendMessage(BM_SETSTATE, true, 0);
 
 			if (!m_bIgnoreScrollClick) {
 
-				m_bIgnoreScrollClick = TRUE;
+				m_bIgnoreScrollClick = true;
 
 				GamePause();
 
@@ -781,8 +781,8 @@ BOOL CFugeWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 				// show the command scroll
 				//
-				m_pScrollButton->SendMessage(BM_SETSTATE, FALSE, 0);
-				m_bIgnoreScrollClick = FALSE;
+				m_pScrollButton->SendMessage(BM_SETSTATE, false, 0);
+				m_bIgnoreScrollClick = false;
 
 				if (!pGameParams->bMusicEnabled && (m_pSoundTrack != nullptr)) {
 
@@ -801,22 +801,22 @@ BOOL CFugeWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 				GameResume();
 			}
 
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 
 void CFugeWindow::GamePause(void) {
-	m_bPause = TRUE;
+	m_bPause = true;
 };
 
 
 void CFugeWindow::GameResume(void) {
 	if (!m_bBallOnPaddle && m_bMovingPaddle)
-		m_bPause = FALSE;
+		m_bPause = false;
 };
 
 
@@ -848,8 +848,8 @@ void CFugeWindow::PlayGame(void) {
 		StartPaddle();
 
 		// game starts paused
-		m_bPause = TRUE;
-		m_bGameActive = TRUE;
+		m_bPause = true;
+		m_bGameActive = true;
 		SetTimer(TIMER_ID, TIMER_INTERVAL, nullptr);
 	}
 
@@ -880,14 +880,14 @@ ERROR_CODE CFugeWindow::LoadNewPaddle(int nNewSize) {
 
 			if ((m_pPaddle = new CSprite) != nullptr) {
 
-				if (m_pPaddle->SharePalette(m_pGamePalette) != FALSE) {
+				if (m_pPaddle->SharePalette(m_pGamePalette) != false) {
 
-					if (m_pPaddle->LoadCels(pDC, pszPaddles[nNewSize], N_PADDLE_CELS) != FALSE) {
+					if (m_pPaddle->LoadCels(pDC, pszPaddles[nNewSize], N_PADDLE_CELS) != false) {
 
 						m_nOldSize = nNewSize;
-						m_pPaddle->SetMasked(TRUE);
-						m_pPaddle->SetMobile(TRUE);
-						m_pPaddle->SetAnimated(TRUE);
+						m_pPaddle->SetMasked(true);
+						m_pPaddle->SetMobile(true);
+						m_pPaddle->SetAnimated(true);
 
 					} else {
 						errCode = ERR_UNKNOWN;
@@ -1114,7 +1114,7 @@ void CFugeWindow::PaintBall(void) {
 			// Play the ball-gets-sucked-into-black-hole animation
 			//
 			LoseBall();
-			m_bPaddleHit = FALSE;
+			m_bPaddleHit = false;
 
 			// or has ball hit the paddle?
 			//
@@ -1134,7 +1134,7 @@ void CFugeWindow::PaintBall(void) {
 			//
 			// determine if a ball actually hit a brick
 			//
-			m_bPaddleHit = FALSE;
+			m_bPaddleHit = false;
 
 
 			// or did ball hit edge of ferris wheel
@@ -1231,7 +1231,7 @@ void CFugeWindow::PaintBall(void) {
 				m_vBallVector.Reflect(vBall);
 			}
 
-			m_bPaddleHit = FALSE;
+			m_bPaddleHit = false;
 		}
 
 		// only paint the ball if it actually moved
@@ -1261,7 +1261,7 @@ void CFugeWindow::BallvsPaddle(void) {
 	DOUBLE fLen1, fLen2, fLen3, fLen4, fLen5, fLen6, fMin, length;
 	int i, j, k;
 	int nRollBack = 0;
-	BOOL bHit;
+	bool bHit;
 
 	// calculate the 7 critical points for the paddle
 	//
@@ -1313,7 +1313,7 @@ void CFugeWindow::BallvsPaddle(void) {
 	// away from the center of the ball, then the ball has hit
 	// the paddle
 	//
-	bHit = FALSE;
+	bHit = false;
 	for (i = 0; i < N_CRIT_POINTS - 1; i++) {
 
 		switch (i) {
@@ -1358,15 +1358,15 @@ void CFugeWindow::BallvsPaddle(void) {
 		nRollBack = 0;
 		if (fLen1 <= BALL_RADIUS) {
 			nRollBack = BALL_RADIUS - (int)fLen1;
-			bHit = TRUE;
+			bHit = true;
 			break;
 		} else if (fLen2 <= BALL_RADIUS) {
 			nRollBack = (BALL_RADIUS - (int)fLen2);
-			bHit = TRUE;
+			bHit = true;
 			break;
 		} else if (fLen1 + fLen2 <= length) {
 			nRollBack = (int)(length - (fLen1 + fLen2)) + 2;
-			bHit = TRUE;
+			bHit = true;
 			break;
 		}
 	}
@@ -1511,7 +1511,7 @@ void CFugeWindow::BallvsPaddle(void) {
 			}
 		}
 
-		m_bPaddleHit = TRUE;
+		m_bPaddleHit = true;
 	}
 }
 
@@ -1529,7 +1529,7 @@ void CFugeWindow::BallvsBrick(DOUBLE length) {
 	DOUBLE angle;
 	int i, j, nIndex, nLastIndex, nBrickIndex, nMaxHits;
 	int nBrick0, nBrick1, nRow0, nRow1, nRow2, nUse[MAX_BRICK_HITS];
-	BOOL bHit, bStillHit;
+	bool bHit, bStillHit;
 
 	// get bounding rectangle of the ball
 	//
@@ -1653,7 +1653,7 @@ void CFugeWindow::BallvsBrick(DOUBLE length) {
 
 	// which brick did we hit?
 	//
-	bHit = FALSE;
+	bHit = false;
 
 	for (i = 0; i < nMaxHits; i++) {
 		nBrickIndex = nUse[i];
@@ -1679,7 +1679,7 @@ void CFugeWindow::BallvsBrick(DOUBLE length) {
 					vPoints[j] += gvCenter;
 
 					if (distanceBetweenPoints(vBallCenter, vPoints[j]) < 11.0) {
-						bHit = TRUE;
+						bHit = true;
 					}
 				}
 
@@ -1795,7 +1795,7 @@ void CFugeWindow::BallvsBrick(DOUBLE length) {
 						//
 					} else {
 
-						bStillHit = TRUE;
+						bStillHit = true;
 						while (bStillHit) {
 
 							// roll ball back to point of contact with brick
@@ -1804,11 +1804,11 @@ void CFugeWindow::BallvsBrick(DOUBLE length) {
 							// get new center of ball
 							vBallCenter = m_ptBallLocation + BALL_RADIUS;
 
-							bStillHit = FALSE;
+							bStillHit = false;
 							for (j = 0; j < N_BRICK_POINTS; j++) {
 
 								if ((fLen[j] = distanceBetweenPoints(vBallCenter, vPoints[j])) < 11.0) {
-									bStillHit = TRUE;
+									bStillHit = true;
 									break;
 								}
 							}
@@ -1905,7 +1905,7 @@ void CFugeWindow::EraseBrick(CDC *pDC, int nBrickIndex) {
 	//
 	pDC->FloodFill(ptBrickPos[nBrickIndex].x + ptBrickSize[nBrickIndex].cx / 2, ptBrickPos[nBrickIndex].y + ptBrickSize[nBrickIndex].cy / 2, RGB(255, 255, 255));
 
-	m_bBrickVisible[nBrickIndex] = FALSE;
+	m_bBrickVisible[nBrickIndex] = false;
 }
 
 
@@ -1950,12 +1950,12 @@ void CFugeWindow::LoseBall(void) {
 		        //
 		        if ((pSprite = new CSprite) != nullptr) {
 
-		            if (pSprite->SharePalette(m_pGamePalette) != FALSE) {
+		            if (pSprite->SharePalette(m_pGamePalette) != false) {
 
-		                if (pSprite->LoadCels(pDC, ".\\ART\\LOSEBALL.BMP", N_BLACKHOLE_CELS) != FALSE) {
+		                if (pSprite->LoadCels(pDC, ".\\ART\\LOSEBALL.BMP", N_BLACKHOLE_CELS) != false) {
 
-		                    pSprite->SetMasked(TRUE);
-		                    pSprite->SetMobile(TRUE);
+		                    pSprite->SetMasked(true);
+		                    pSprite->SetMobile(true);
 		                    pSprite->LinkSprite();
 
 		                    for (i = 0; i < N_BLACKHOLE_CELS * 2; i++) {
@@ -2038,9 +2038,9 @@ void CFugeWindow::StartPaddle(void) {
 	if (m_pPaddle != nullptr)
 		m_pPaddle->LinkSprite();
 
-	m_bBallOnPaddle = TRUE;
+	m_bBallOnPaddle = true;
 
-	PaintPaddle(TRUE);
+	PaintPaddle(true);
 }
 
 
@@ -2062,8 +2062,8 @@ void CFugeWindow::LaunchBall(void) {
 	assert(m_bGameActive);
 	assert(m_bBallOnPaddle);
 
-	m_bPause = FALSE;
-	m_bBallOnPaddle = FALSE;
+	m_bPause = false;
+	m_bBallOnPaddle = false;
 
 	// starting ball vector is determined by the location of the paddle
 	m_vBallVector = gvCenter - (m_ptBallLocation + BALL_RADIUS);
@@ -2077,11 +2077,11 @@ void CFugeWindow::LaunchBall(void) {
 }
 
 
-void CFugeWindow::PaintPaddle(BOOL bPaint) {
+void CFugeWindow::PaintPaddle(bool bPaint) {
 	CVector vPaddle;
 	CDC *pDC;
 	int nOldIndex;
-	BOOL bSuccess;
+	bool bSuccess;
 
 	// verify that the input was not tainted
 	assert(m_nPaddleCelIndex < N_PADDLE_CELS * 2);
@@ -2184,7 +2184,7 @@ void CFugeWindow::StartBricks(void) {
 	for (i = 0; i < nBricks; i++) {
 
 		if (!m_bBrickVisible[i]) {
-			m_bBrickVisible[i] = TRUE;
+			m_bBrickVisible[i] = true;
 		}
 	}
 
@@ -2217,10 +2217,10 @@ void CFugeWindow::PaintBricks(CDC *pDC) {
 			if ((pMemBmp = new CBitmap) != nullptr) {
 
 				size = GetBitmapSize(pBmp);
-				if ((m_nNumRows != 0) && (pMemBmp->CreateCompatibleBitmap(pDC, size.cx, size.cy) != FALSE)) {
+				if ((m_nNumRows != 0) && (pMemBmp->CreateCompatibleBitmap(pDC, size.cx, size.cy) != false)) {
 
 					pMemDC->CreateCompatibleDC(nullptr);
-					pPalOld = pMemDC->SelectPalette(m_pGamePalette, FALSE);
+					pPalOld = pMemDC->SelectPalette(m_pGamePalette, false);
 					pMemDC->RealizePalette();
 					hOldBitmap = SelectBitmap(pMemDC->m_hDC, pMemBmp->m_hObject);
 
@@ -2235,12 +2235,12 @@ void CFugeWindow::PaintBricks(CDC *pDC) {
 						}
 					}
 
-					pScreenPalOld = pDC->SelectPalette(m_pGamePalette, FALSE);
+					pScreenPalOld = pDC->SelectPalette(m_pGamePalette, false);
 					pDC->BitBlt(0, 0, size.cx, size.cy, pMemDC, 0, 0, SRCCOPY);
-					pDC->SelectPalette(pScreenPalOld, FALSE);
+					pDC->SelectPalette(pScreenPalOld, false);
 
 					SelectBitmap(pMemDC->m_hDC, hOldBitmap);
-					pMemDC->SelectPalette(pPalOld, FALSE);
+					pMemDC->SelectPalette(pPalOld, false);
 
 					// fall back to yucky method
 					//
@@ -2277,14 +2277,14 @@ void CFugeWindow::PaintBricks(CDC *pDC) {
 		}
 	}
 	if (m_pScrollButton != nullptr) {
-		m_pScrollButton->Invalidate(FALSE);
+		m_pScrollButton->Invalidate(false);
 		m_pScrollButton->UpdateWindow();
 	}
 }
 
 
 void CFugeWindow::EndBricks(void) {
-	memset(m_bBrickVisible, 0, sizeof(BOOL) * N_BRICKS);
+	memset(m_bBrickVisible, 0, sizeof(bool) * N_BRICKS);
 }
 
 
@@ -2292,7 +2292,7 @@ void CFugeWindow::EndBricks(void) {
 void CFugeWindow::LoadIniSettings(void) {
 	if (pGameParams->bPlayingMetagame) {
 
-		m_bOutterWall = FALSE;
+		m_bOutterWall = false;
 		m_nInitNumBalls = 1;
 		m_nInitStartLevel = 3;
 		m_nGForceFactor = GFORCE_DEF;
@@ -2334,7 +2334,7 @@ void CFugeWindow::LoadIniSettings(void) {
 
 		m_bOutterWall = GetPrivateProfileInt(INI_SECTION, "OutterWall", 0, INI_FILENAME);
 		if (m_bOutterWall != 0)
-			m_bOutterWall = TRUE;
+			m_bOutterWall = true;
 
 		m_nGForceFactor = GetPrivateProfileInt(INI_SECTION, "Gravity", GFORCE_DEF, INI_FILENAME);
 		if ((m_nGForceFactor < GFORCE_MIN) || (m_nGForceFactor > GFORCE_MAX))
@@ -2361,13 +2361,13 @@ void CFugeWindow::GameReset(void) {
 
 	m_lExtraLifeScore = EXTRA_LIFE_SCORE;       // user needs this many points for an extra life
 
-	m_bGameActive = FALSE;                      // there is no currently active game
+	m_bGameActive = false;                      // there is no currently active game
 
-	m_bPause = FALSE;                           // the game is not paused
+	m_bPause = false;                           // the game is not paused
 
-	m_bBallOnPaddle = FALSE;                    // Ball is not yet on paddle
+	m_bBallOnPaddle = false;                    // Ball is not yet on paddle
 
-	m_bMovingPaddle = FALSE;                    // user is not moving the paddle
+	m_bMovingPaddle = false;                    // user is not moving the paddle
 
 	m_nBalls = m_nInitNumBalls;                 // reset # of balls
 
@@ -2379,7 +2379,7 @@ void CFugeWindow::GameReset(void) {
 
 	m_lScore = 0;                               // reset the score
 
-	m_bPaddleHit = FALSE;                       // paddle starts fresh
+	m_bPaddleHit = false;                       // paddle starts fresh
 }
 
 
@@ -2465,7 +2465,7 @@ long CFugeWindow::OnJoyStick(unsigned int wParam, long lParam) {
 				m_nPaddleCelIndex = 5;
 			}
 		}
-		PaintPaddle(FALSE);
+		PaintPaddle(false);
 	}
 
 	return 0;
@@ -2486,7 +2486,7 @@ void CFugeWindow::OnMouseMove(unsigned int, CPoint point) {
 			nMove = (point.x - m_ptOrigin.x) / MOUSE_SENS + 1;
 
 			m_nPaddleCelIndex += nMove;
-			PaintPaddle(FALSE);
+			PaintPaddle(false);
 			SetCursorPos(m_ptOrigin.x, m_ptOrigin.y);
 
 		} else if (point.x < m_ptOrigin.x) {
@@ -2494,7 +2494,7 @@ void CFugeWindow::OnMouseMove(unsigned int, CPoint point) {
 			nMove = -((m_ptOrigin.x - point.x) / MOUSE_SENS + 1);
 
 			m_nPaddleCelIndex += nMove;
-			PaintPaddle(FALSE);
+			PaintPaddle(false);
 			SetCursorPos(m_ptOrigin.x, m_ptOrigin.y);
 		}
 
@@ -2696,7 +2696,7 @@ void CFugeWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned i
 
 		if (m_bGameActive) {
 			m_nPaddleCelIndex += PADDLE_CEL_JUMP;
-			PaintPaddle(FALSE);
+			PaintPaddle(false);
 		}
 		break;
 
@@ -2707,7 +2707,7 @@ void CFugeWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned i
 
 		if (m_bGameActive) {
 			m_nPaddleCelIndex -= PADDLE_CEL_JUMP;
-			PaintPaddle(FALSE);
+			PaintPaddle(false);
 		}
 		break;
 
@@ -2756,13 +2756,13 @@ void CFugeWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned i
 }
 
 
-void CFugeWindow::OnActivate(unsigned int nState, CWnd *, BOOL bMinimized) {
+void CFugeWindow::OnActivate(unsigned int nState, CWnd *, bool bMinimized) {
 	if (!bMinimized) {
 
 		switch (nState) {
 		case WA_ACTIVE:
 		case WA_CLICKACTIVE:
-			InvalidateRect(nullptr, FALSE);
+			InvalidateRect(nullptr, false);
 			break;
 
 		default:
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.h b/engines/bagel/hodjnpodj/fuge/fuge.h
index bda0eb33cde..33011fa9d73 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.h
+++ b/engines/bagel/hodjnpodj/fuge/fuge.h
@@ -68,7 +68,7 @@ protected:
 	void        LaunchBall(void);
 	void        StartPaddle(void);
 	void        EndPaddle(void);
-	void        PaintPaddle(BOOL);
+	void        PaintPaddle(bool);
 	CVector     BallOnPaddle(void);
 	void        StartBricks(void);
 	void        EndBricks(void);
@@ -77,7 +77,7 @@ protected:
 	void        BallvsPaddle(void);
 	void        BallvsBrick(DOUBLE);
 
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	long        OnJoyStick(unsigned int, long);
 	void        OnPaint(void);
 	void        OnTimer(uintptr);
@@ -87,7 +87,7 @@ protected:
 	void        OnSysChar(unsigned int, unsigned int, unsigned int);
 	void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	void        OnKeyDown(unsigned int, unsigned int, unsigned int);
-	void        OnActivate(unsigned int, CWnd *, BOOL) override;
+	void        OnActivate(unsigned int, CWnd *, bool) override;
 	LRESULT     OnMCINotify(WPARAM, LPARAM);
 	LRESULT     OnMMIONotify(WPARAM, LPARAM);
 	void        OnSoundNotify(CSound *);
@@ -95,7 +95,7 @@ protected:
 
 	DECLARE_MESSAGE_MAP()
 
-	BOOL        m_bBrickVisible[N_BRICKS];
+	bool        m_bBrickVisible[N_BRICKS];
 	CPoint      m_ptOrigin;
 	CRect       m_rNewGameButton;
 	CRect       m_rBlackHole;
@@ -134,14 +134,14 @@ protected:
 	int         m_nPaddleCelIndex;
 	int			m_nOldSize = -1;
 
-	BOOL        m_bMovingPaddle;
-	BOOL        m_bGameActive;
-	BOOL        m_bPause;
-	BOOL        m_bIgnoreScrollClick;
-	BOOL        m_bPaddleHit;
-	BOOL        m_bOutterWall;
-	BOOL        m_bJoyActive;
-	BOOL        m_bBallOnPaddle;
+	bool        m_bMovingPaddle;
+	bool        m_bGameActive;
+	bool        m_bPause;
+	bool        m_bIgnoreScrollClick;
+	bool        m_bPaddleHit;
+	bool        m_bOutterWall;
+	bool        m_bJoyActive;
+	bool        m_bBallOnPaddle;
 
 	CVector gvCenter;
 };
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.cpp b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
index 51622bc0a73..af342091581 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
@@ -86,14 +86,14 @@ void CUserCfgDlg::GetDlgData() {
 	m_nBallSpeed  = m_pScrollBar3->GetScrollPos();
 	m_nPaddleSize = m_pScrollBar4->GetScrollPos();
 
-	m_bOutterWall = FALSE;
+	m_bOutterWall = false;
 	if (m_pWallButton->GetCheck() == 1) {
-		m_bOutterWall = TRUE;
+		m_bOutterWall = true;
 	}
 }
 
 
-BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	/*
 	* respond to user
 	*/
@@ -102,13 +102,13 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 		switch (wParam) {
 
 		case IDOK:
-			m_bSave = TRUE;
+			m_bSave = true;
 			PostMessage(WM_CLOSE, 0, 0);
-			return FALSE;
+			return false;
 
 		case IDCANCEL:
 			PostMessage(WM_CLOSE, 0, 0);
-			return FALSE;
+			return false;
 
 		/*
 		* reset params to default
@@ -119,7 +119,7 @@ BOOL CUserCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 			m_nStartLevel = LEVEL_DEF;
 			m_nBallSpeed  = SPEED_DEF;
 			m_nPaddleSize = PSIZE_DEF;
-			m_bOutterWall = FALSE;
+			m_bOutterWall = false;
 
 			PutDlgData();
 
@@ -259,7 +259,7 @@ void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 }
 
 
-BOOL CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog(void) {
 	CRect tmpRect;
 	CDC *pDC;
 
@@ -275,7 +275,7 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 		tmpRect.SetRect(22, 35, 92, 53);
 		if ((m_pScrollBar1 = new CScrollBar) != nullptr) {
 			m_pScrollBar1->Create(WS_VISIBLE | WS_CHILD | SBS_HORZ | SBS_BOTTOMALIGN, tmpRect, this, ID_SCROLL1);
-			m_pScrollBar1->SetScrollRange(BALLS_MIN, BALLS_MAX, TRUE);
+			m_pScrollBar1->SetScrollRange(BALLS_MIN, BALLS_MAX, true);
 		}
 
 		tmpRect.SetRect(22, 57, 135, 70);
@@ -286,7 +286,7 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 		tmpRect.SetRect(22, 70, 92, 88);
 		if ((m_pScrollBar2 = new CScrollBar) != nullptr) {
 			m_pScrollBar2->Create(WS_VISIBLE | WS_CHILD | SBS_HORZ | SBS_BOTTOMALIGN, tmpRect, this, ID_SCROLL2);
-			m_pScrollBar2->SetScrollRange(LEVEL_MIN, LEVEL_MAX, TRUE);
+			m_pScrollBar2->SetScrollRange(LEVEL_MIN, LEVEL_MAX, true);
 		}
 
 		tmpRect.SetRect(22, 92, 135, 105);
@@ -297,7 +297,7 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 		tmpRect.SetRect(22, 105, 92, 123);
 		if ((m_pScrollBar3 = new CScrollBar) != nullptr) {
 			m_pScrollBar3->Create(WS_VISIBLE | WS_CHILD | SBS_HORZ | SBS_BOTTOMALIGN, tmpRect, this, ID_SCROLL3);
-			m_pScrollBar3->SetScrollRange(SPEED_MIN, SPEED_MAX, TRUE);
+			m_pScrollBar3->SetScrollRange(SPEED_MIN, SPEED_MAX, true);
 		}
 
 		tmpRect.SetRect(22, 127, 110, 140);
@@ -308,7 +308,7 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 		tmpRect.SetRect(22, 140, 92, 158);
 		if ((m_pScrollBar4 = new CScrollBar) != nullptr) {
 			m_pScrollBar4->Create(WS_VISIBLE | WS_CHILD | SBS_HORZ | SBS_BOTTOMALIGN, tmpRect, this, ID_SCROLL4);
-			m_pScrollBar4->SetScrollRange(PSIZE_MIN, PSIZE_MAX, TRUE);
+			m_pScrollBar4->SetScrollRange(PSIZE_MIN, PSIZE_MAX, true);
 		}
 
 		ReleaseDC(pDC);
@@ -334,13 +334,13 @@ BOOL CUserCfgDlg::OnInitDialog(void) {
 		m_pWallButton->SetControl(ID_WALLS, this);
 	}
 
-	m_bSave = FALSE;
+	m_bSave = false;
 
 	LoadIniSettings();
 
 	PutDlgData();
 
-	return TRUE;
+	return true;
 }
 
 void CUserCfgDlg::OnPaint(void) {
@@ -379,8 +379,8 @@ void CUserCfgDlg::UpdateOptions(void) {
 	}
 }
 
-BOOL CUserCfgDlg::OnEraseBkgnd(CDC *) {
-	return TRUE;
+bool CUserCfgDlg::OnEraseBkgnd(CDC *) {
+	return true;
 }
 
 
@@ -501,7 +501,7 @@ void CUserCfgDlg::LoadIniSettings(void) {
 
 	m_bOutterWall = GetPrivateProfileInt(INI_SECTION, "OutterWall", 0, INI_FILENAME);
 	if (m_bOutterWall != 0)
-		m_bOutterWall = TRUE;
+		m_bOutterWall = true;
 }
 
 void CUserCfgDlg::SaveIniSettings(void) {
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.h b/engines/bagel/hodjnpodj/fuge/usercfg.h
index 1039c338098..d97b3a61f7b 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.h
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.h
@@ -59,8 +59,8 @@ public:
 protected:
 
 	virtual void DoDataExchange(CDataExchange *) override;
-	virtual BOOL OnCommand(WPARAM, LPARAM) override;
-	virtual BOOL OnInitDialog(void) override;
+	virtual bool OnCommand(WPARAM, LPARAM) override;
+	virtual bool OnInitDialog(void) override;
 	void PutDlgData(void);
 	void GetDlgData(void);
 	void LoadIniSettings(void);
@@ -68,7 +68,7 @@ protected:
 	void UpdateOptions(void);
 	void ClearDialogImage(void);
 
-	afx_msg BOOL OnEraseBkgnd(CDC *);
+	afx_msg bool OnEraseBkgnd(CDC *);
 	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnClose();
 	void OnDestroy();
@@ -89,9 +89,9 @@ protected:
 	int           m_nStartLevel;
 	int           m_nBallSpeed;
 	int           m_nPaddleSize;
-	BOOL          m_bOutterWall;
+	bool          m_bOutterWall;
 
-	BOOL        m_bSave;                    // True if should save theses values
+	bool        m_bSave;                    // True if should save theses values
 };
 
 } // namespace Fuge
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
index e95f891536d..16c5ffc6f3a 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
@@ -45,10 +45,10 @@ void add_note_to_series(int nNewValue);
 
 CBmpButton  *m_pScrollButton;               // Scroll button
 CPalette    *pGamePalette = nullptr;           // Palette of current artwork
-BOOL        bSuccess = FALSE;
-BOOL        m_bIgnoreScrollClick;
-BOOL        bLDown = FALSE;                 // Make sure we only act on LUp if LDown was on a musician
-BOOL        bPlayingBackSeries = FALSE;
+bool        bSuccess = false;
+bool        m_bIgnoreScrollClick;
+bool        bLDown = false;                 // Make sure we only act on LUp if LDown was on a musician
+bool        bPlayingBackSeries = false;
 
 #define     FIRST_MUSICIAN      100
 #define     NOT_PLAYING         0
@@ -65,16 +65,16 @@ int         m_nButID = 0;                       // button which is animating
 CText       *m_pSignText = nullptr;                // The current series length display on the sign
 CBitmap     *pRibbon = nullptr;                    // The blue ribbon to be put on sign at win condition
 
-BOOL    m_bPlaying;
-BOOL    m_bNewGame = FALSE;
+bool    m_bPlaying;
+bool    m_bNewGame = false;
 
-BOOL    m_bPlayGame;                            // Options variables
+bool    m_bPlayGame;                            // Options variables
 int     m_nSpeed;                               // Speed is in MILLISECONDS
 int     m_nNumButtons;
 int     m_nWinCondition = 0;                    // Number needed to win the game (in meta mode only)
 
 // Temporary variables for new Options
-BOOL    tempPlayGame;
+bool    tempPlayGame;
 int     tempSpeed;          // Speed is in MILLISECONDS
 int     tempNumButtons;
 
@@ -154,7 +154,7 @@ CMainWindow::CMainWindow() {
 
 	pDC = GetDC();
 	pBackBitmap = FetchBitmap(pDC, &pGamePalette, MAINSCREEN);
-	pOldPal = pDC->SelectPalette(pGamePalette, FALSE);           // select the game palette
+	pOldPal = pDC->SelectPalette(pGamePalette, false);           // select the game palette
 	pDC->RealizePalette();                                          //...and realize it
 
 	pBackBitmap->DeleteObject();
@@ -173,7 +173,7 @@ CMainWindow::CMainWindow() {
 	ASSERT(bSuccess);
 	bSuccess = (*m_pScrollButton).LoadBitmaps(SCROLLUP, SCROLLDOWN, 0, 0);
 	ASSERT(bSuccess);
-	m_bIgnoreScrollClick = FALSE;
+	m_bIgnoreScrollClick = false;
 
 	if (pGameInfo->bPlayingMetagame)                         // only in metamode
 		pRibbon = FetchBitmap(pDC, nullptr, RIBBON);            // load bitmap for ribbon
@@ -200,8 +200,8 @@ CMainWindow::CMainWindow() {
 		(*pAnimSprite[i]).SharePalette(pGamePalette);
 		bSuccess = (*pAnimSprite[i]).LoadCels(pDC, cAnimName[i], nNumCels[i]);
 		ASSERT(bSuccess);
-		(*pAnimSprite[i]).SetMasked(FALSE);
-		(*pAnimSprite[i]).SetMobile(FALSE);
+		(*pAnimSprite[i]).SetMasked(false);
+		(*pAnimSprite[i]).SetMobile(false);
 	}
 
 	// Set up the text on the sign to display the current series length
@@ -211,12 +211,12 @@ CMainWindow::CMainWindow() {
 		(*m_pSignText).SetupText(pDC, pGamePalette, &StartRect, JUSTIFY_CENTER);
 	}
 
-	(*pDC).SelectPalette(pOldPal, FALSE);           // Select back the old palette
+	(*pDC).SelectPalette(pOldPal, false);           // Select back the old palette
 	ReleaseDC(pDC);
 
 	//srand((unsigned) time(nullptr));                 // seed the random number generator
 
-	m_bPlayGame = TRUE;
+	m_bPlayGame = true;
 
 	if (pGameInfo->bPlayingMetagame) {
 		switch (pGameInfo->nSkillLevel) {
@@ -245,7 +245,7 @@ CMainWindow::CMainWindow() {
 	tempNumButtons = m_nNumButtons;
 	tempSpeed = m_nSpeed;
 
-	m_bPlaying = FALSE;
+	m_bPlaying = false;
 
 	GetNewSequence(MAX_SEQUENCE);                    // Get a random sequence
 	nNoteCount = 1;                                 // Set the count to the first note
@@ -256,7 +256,7 @@ CMainWindow::CMainWindow() {
 
 	EndWaitCursor();
 
-	if (pGameInfo->bPlayingMetagame == FALSE) {
+	if (pGameInfo->bPlayingMetagame == false) {
 		ActivateButtons(m_nNumButtons, NOT_PLAYING);     // Activate the buttons
 		PostMessage(WM_COMMAND, IDC_SCROLL, BN_CLICKED);         // Activate the Options dialog
 	}
@@ -266,10 +266,10 @@ CMainWindow::CMainWindow() {
 void CMainWindow::initStatics() {
 	m_pScrollButton = nullptr;
 	pGamePalette = nullptr;
-	bSuccess = FALSE;
-	m_bIgnoreScrollClick = FALSE;
-	bLDown = FALSE;
-	bPlayingBackSeries = FALSE;
+	bSuccess = false;
+	m_bIgnoreScrollClick = false;
+	bLDown = false;
+	bPlayingBackSeries = false;
 	pMusic = nullptr;
 	Common::fill(pAnimSprite, pAnimSprite + MAX_BUTTONS, nullptr);
 	Common::fill(pMusicians, pMusicians + (MAX_BUTTONS * 2), nullptr);
@@ -277,15 +277,15 @@ void CMainWindow::initStatics() {
 
 	m_pSignText = nullptr;
 	pRibbon = nullptr;
-	m_bPlaying = FALSE;
-	m_bNewGame = FALSE;
-	m_bPlayGame = FALSE;
+	m_bPlaying = false;
+	m_bNewGame = false;
+	m_bPlayGame = false;
 
 	m_nSpeed = 0;
 	m_nNumButtons = 0;
 	m_nWinCondition = 0;
 
-	tempPlayGame = FALSE;
+	tempPlayGame = false;
 	tempSpeed = 0;
 	tempNumButtons = 0;
 	nNoteCount = 0;
@@ -303,7 +303,7 @@ void CMainWindow::initStatics() {
 void CMainWindow::OnPaint() {
 	PAINTSTRUCT lpPaint;
 
-	InvalidateRect(nullptr, FALSE);                    // invalidate the entire window
+	InvalidateRect(nullptr, false);                    // invalidate the entire window
 	BeginPaint(&lpPaint);
 	SplashScreen();                                 // Paint the backdrop and scroll button
 	ActivateButtons(m_nNumButtons, NOT_PLAYING);     // Activate the buttons
@@ -363,7 +363,7 @@ void CMainWindow::SplashScreen() {
 // typically in order to process control related activities.
 //
 
-BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	CDC     *pDC;
 	CNote   *pNewNote;
 	CSound  *pEffect = nullptr;
@@ -384,8 +384,8 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 		case IDC_START:                                 // And we're off!
 			if (pGameInfo->bPlayingMetagame)
 				wait_awhile(PAUSE_TIME);                 // Give the resources, etc. time to load
-			m_bPlaying = TRUE;
-			m_bNewGame = TRUE;
+			m_bPlaying = true;
+			m_bNewGame = true;
 			pNewNote = CNote::GetNoteHead();            // Get the first note
 			if (pNewNote) {                              // if list is not empty
 				PlayBackSeries(nNoteCount);                  // Play the first note
@@ -394,7 +394,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 				SetTimer(PLAYER_TIMER, TIME_LIMIT, nullptr);    // Give the player TIME_LIMIT to respond
 			}                                           //...to head of list
 			else                                            // no note chain,
-				m_bPlaying = FALSE;                         //...so we can't play
+				m_bPlaying = false;                         //...so we can't play
 			break;
 
 		case IDC_A:                                     // If a musician button was hit...
@@ -431,8 +431,8 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 					CSound::waitWaveSounds();
 
 					pNoteMarker = nullptr;
-					m_bPlaying = FALSE;
-					m_bNewGame = FALSE;
+					m_bPlaying = false;
+					m_bNewGame = false;
 					CNote::FlushNoteList();                     // Flush the last series of notes
 					if (pGameInfo->bPlayingMetagame)
 						PostMessage(WM_CLOSE, 0, 0);         // and post a program exit
@@ -459,8 +459,8 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 						CMessageBox GameOverDlg((CWnd *)this, pGamePalette, "Game over", "You have won!");
 						CSound::waitWaveSounds();
-						m_bPlaying = FALSE;
-						m_bNewGame = FALSE;
+						m_bPlaying = false;
+						m_bNewGame = false;
 						CNote::FlushNoteList();
 						if (pGameInfo->bPlayingMetagame)
 							PostMessage(WM_CLOSE, 0, 0);         // and post a program exit
@@ -492,37 +492,37 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			break;
 
 		case IDC_RULES:
-			m_bIgnoreScrollClick = TRUE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
+			m_bIgnoreScrollClick = true;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
 			CSound::waitWaveSounds();
 			(void) RulesDlg.DoModal();
-			m_bIgnoreScrollClick = FALSE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
+			m_bIgnoreScrollClick = false;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
 			break;
 
 		case IDC_SCROLL:
 			if (m_bIgnoreScrollClick) {
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 				break;
 			}
 
-			m_bIgnoreScrollClick = TRUE;
-			(*m_pScrollButton).SendMessage(BM_SETSTATE, TRUE, 0L);
-			SendDlgItemMessage(IDC_SCROLL, BM_SETSTATE, TRUE, 0L);
+			m_bIgnoreScrollClick = true;
+			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
+			SendDlgItemMessage(IDC_SCROLL, BM_SETSTATE, true, 0L);
 
 			switch (COptionsWind.DoModal()) {
 
 			case IDC_OPTIONS_NEWGAME:
 				if (!pGameInfo->bPlayingMetagame)
 					NewGame();
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-				m_bIgnoreScrollClick = FALSE;
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+				m_bIgnoreScrollClick = false;
 				break;
 
 			case IDC_OPTIONS_RETURN:
-				(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-				m_bIgnoreScrollClick = FALSE;
+				(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+				m_bIgnoreScrollClick = false;
 				if (m_bPlayGame && m_bNewGame) {                         // playing repeat game & already
 					wait_awhile(PAUSE_TIME);                             // started...pause for a second
 					PostMessage(WM_COMMAND, IDC_START, BN_CLICKED);  // Activate the Options dialog
@@ -531,7 +531,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 			case IDC_OPTIONS_QUIT:                      // Quit button was clicked
 				PostMessage(WM_CLOSE, 0, 0);         // and post a program exit
-				return FALSE;
+				return false;
 
 			} //end switch(ComDlg.DoModal())
 
@@ -540,7 +540,7 @@ BOOL CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 	ReleaseDC(pDC);
 	(*this).SetFocus();                     // Reset focus back to the main window
-	return TRUE;
+	return true;
 }
 
 /*****************************************************************
@@ -608,7 +608,7 @@ void CMainWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
 	else if (m_bNewGame && m_bPlaying) {
 		for (i = 0; i < m_nNumButtons; i++) {
 			if (rectMusic[i].PtInRect(point)) {
-				bLDown = TRUE;
+				bLDown = true;
 				KillTimer(PLAYER_TIMER);                                             // don't time out
 				m_nButID = i;
 				StartAnimation();
@@ -685,7 +685,7 @@ void CMainWindow::OnLButtonUp(unsigned int nFlags, CPoint point) {
 				StopAnimation();
 				MFC::SendMessage(m_hWnd, WM_COMMAND, m_nButID + IDC_A, BN_CLICKED);          // Activate hit logic
 			}
-			bLDown = FALSE;
+			bLDown = false;
 		}
 	}
 }
@@ -809,7 +809,7 @@ void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned i
 /* one-plus of low priority
 void CMainWindow::OnKeyUp(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags)
 {
-    BOOL    bMusician = FALSE;
+    bool    bMusician = false;
 
         switch (nChar) {
 
@@ -819,7 +819,7 @@ void CMainWindow::OnKeyUp(unsigned int nChar, unsigned int nRepCnt, unsigned int
             case '4':
             case '5':
             case '6':
-                bMusician = TRUE;
+                bMusician = true;
                 break;
 
             default:
@@ -885,7 +885,7 @@ void CMainWindow::OnTimer(uintptr nIDEvent) {
 		CMessageBox GameOverDlg((CWnd *)this, pGamePalette, "Time ran out!", buf);
 		CSound::waitWaveSounds();
 		pNoteMarker = nullptr;
-		m_bPlaying = FALSE;
+		m_bPlaying = false;
 		CNote::FlushNoteList();
 		if (pGameInfo->bPlayingMetagame)
 			PostMessage(WM_CLOSE, 0, 0);                         // and post a program exit
@@ -908,13 +908,13 @@ void CMainWindow::OnTimer(uintptr nIDEvent) {
 
 }
 
-void CMainWindow::OnActivate(unsigned int nState, CWnd *pWndOther, BOOL bMinimized) {
+void CMainWindow::OnActivate(unsigned int nState, CWnd *pWndOther, bool bMinimized) {
 
 	if (!bMinimized) {
 		switch (nState) {
 		case WA_ACTIVE:
 		case WA_CLICKACTIVE:
-			//InvalidateRect(nullptr, FALSE);
+			//InvalidateRect(nullptr, false);
 			break;
 
 		default:
@@ -938,14 +938,14 @@ void CMainWindow::NewGame() {
 
 	pDC = GetDC();
 
-	(*m_pScrollButton).SendMessage(BM_SETSTATE, FALSE, 0L);
-	m_bIgnoreScrollClick = FALSE;
+	(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
+	m_bIgnoreScrollClick = false;
 
 	m_bPlayGame = tempPlayGame;
 	m_nNumButtons = tempNumButtons;
 	m_nSpeed = tempSpeed;
 
-	m_bNewGame = FALSE;
+	m_bNewGame = false;
 
 	CNote::FlushNoteList();
 	ActivateButtons(m_nNumButtons, NOT_PLAYING);             // Bring on the players!!
@@ -957,7 +957,7 @@ void CMainWindow::NewGame() {
 		Common::sprintf_s(msg, "%d", nNoteCount - 1);
 		(*m_pSignText).DisplayString(pDC, msg, 32, FW_NORMAL, SIGN_COLOR);
 	} else {
-		m_bPlaying = TRUE;                                  // Make sure we can play music
+		m_bPlaying = true;                                  // Make sure we can play music
 		Common::sprintf_s(msg, "");
 		(*m_pSignText).DisplayString(pDC, msg, 32, FW_NORMAL, SIGN_COLOR);
 	}
@@ -1014,37 +1014,37 @@ void CMainWindow::StopAnimation() {
 }
 
 
-BOOL CMainWindow::GetNewSequence(const char *pszFileName) {
+bool CMainWindow::GetNewSequence(const char *pszFileName) {
 	int  nNote;
 	char note[5];
 
 	ifstream IFStream(pszFileName);
 	if (IFStream.fail()) {
-		return FALSE;
+		return false;
 	}
 	while (!IFStream.eof()) {
 		IFStream.getline(note, sizeof(note));
 		nNote = atoi(note);
 		add_note_to_series(nNote);
 	}
-	return TRUE;
+	return true;
 }//end GetNewSequence()
 
-BOOL CMainWindow::GetNewSequence(int nLength) {
+bool CMainWindow::GetNewSequence(int nLength) {
 	int i;
 	for (i = nLength; i > 0; --i) {
 		add_note_to_series(brand() % m_nNumButtons);
 	}
-	return TRUE;
+	return true;
 }//end GetNewSequence()
 
-void CMainWindow::ActivateButtons(unsigned int nNumActive, BOOL bState) {
+void CMainWindow::ActivateButtons(unsigned int nNumActive, bool bState) {
 	CDC         *pDC;
 	CPalette    *pOldPal = nullptr;
 	unsigned int i;
 
 	pDC = GetDC();
-	pOldPal = pDC->SelectPalette(pGamePalette, FALSE);           // select the game palette
+	pOldPal = pDC->SelectPalette(pGamePalette, false);           // select the game palette
 	pDC->RealizePalette();                                          //...and realize it
 
 	for (i = 0; i < nNumActive; i++) {
@@ -1057,7 +1057,7 @@ void CMainWindow::ActivateButtons(unsigned int nNumActive, BOOL bState) {
 		i++;
 	}
 
-	(*pDC).SelectPalette(pOldPal, FALSE);                        // Select back the old palette
+	(*pDC).SelectPalette(pOldPal, false);                        // Select back the old palette
 	ReleaseDC(pDC);
 
 }//end ActivateButtons()
@@ -1081,11 +1081,11 @@ void CMainWindow::PlayBackSeries(int nNumNotes) {
 
 	pDC = GetDC();
 
-	bPlayingBackSeries = TRUE;
+	bPlayingBackSeries = true;
 
 //	HCURSOR HOldCursor = MFC::SetCursor( AfxGetApp ()->LoadStandardCursor( nullptr ) ); // Make cursor go away
 	HCURSOR HOldCursor = MFC::SetCursor(LoadCursor(nullptr, IDC_WAIT));          // Refresh cursor object
-	MFC::ShowCursor(TRUE);
+	MFC::ShowCursor(true);
 
 	pNewNote = CNote::GetNoteHead();
 	for (i = nNumNotes; i > 0; --i) {
@@ -1103,17 +1103,17 @@ void CMainWindow::PlayBackSeries(int nNumNotes) {
 	}
 	pNewNote = nullptr;
 
-	MFC::ShowCursor(FALSE);
+	MFC::ShowCursor(false);
 	MFC::SetCursor(HOldCursor);
 
-	bPlayingBackSeries = FALSE;
+	bPlayingBackSeries = false;
 
 	ReleaseDC(pDC);
 
 }//end PlayBackSeries
 
 
-BOOL CMainWindow::wait_awhile(int nHundSecs) {                      // Given time is in hundreths of sec
+bool CMainWindow::wait_awhile(int nHundSecs) {                      // Given time is in hundreths of sec
 	uint32   goal;
 	MSG     msg;
 
@@ -1136,7 +1136,7 @@ BOOL CMainWindow::wait_awhile(int nHundSecs) {                      // Given tim
 
 	}                                   // spin yer wheels 'til nSecs pass
 
-	return TRUE;
+	return true;
 }//end wait_awhile()
 
 void CMainWindow::OnClose() {
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.h b/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
index d4c2add0c5c..3bef76fd2c1 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.h
@@ -181,7 +181,7 @@ namespace Garkfunkle {
 #define HARP_OFFSET_Y       0
 #define CLARINET_OFFSET_Y   4
 
-//BOOL wait_awhile(int);
+//bool wait_awhile(int);
 
 ///////////////////////////////////////////////////////////////////////////////////
 
@@ -191,14 +191,14 @@ namespace Garkfunkle {
 class CMainWindow : public CFrameWnd {
 public:
 	CMainWindow();
-	BOOL GetNewSequence(const char* pszFileName);
-	BOOL GetNewSequence(int nLength);
-	void ActivateButtons(unsigned int nNumActive, BOOL bState);
+	bool GetNewSequence(const char* pszFileName);
+	bool GetNewSequence(int nLength);
+	void ActivateButtons(unsigned int nNumActive, bool bState);
 	void PlayBackSeries(int nNumNotes);
 	void NewGame();
 	void StartAnimation();
 	void StopAnimation();
-	BOOL wait_awhile(int nHundSecs);
+	bool wait_awhile(int nHundSecs);
 
 //added data members:
 	virtual void SplashScreen();
@@ -210,7 +210,7 @@ private:
 	CRect rectMusic[MAX_BUTTONS];             // Musician locations
 
 protected:
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	void OnDestroy();
 
 	//{{AFX_MSG( CMainWindow )
@@ -225,7 +225,7 @@ protected:
 	afx_msg void OnLButtonUp(unsigned int nFlags, CPoint point);
 	afx_msg void OnRButtonDown(unsigned int nFlags, CPoint point);
 	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
-	afx_msg void OnActivate(unsigned int, CWnd*, BOOL) override;
+	afx_msg void OnActivate(unsigned int, CWnd*, bool) override;
 	afx_msg void OnClose();
 	afx_msg LRESULT OnMCINotify(WPARAM, LPARAM);
 	afx_msg LRESULT OnMMIONotify(WPARAM, LPARAM);
diff --git a/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp b/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
index 3405eb29bc9..7f5b03fbd07 100644
--- a/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
@@ -49,7 +49,7 @@ COptnDlg::COptnDlg(CWnd* pParent, CPalette* pPalette)
 	//{{AFX_DATA_INIT(COptnDlg)
 	m_nSpeed = MIN_SPEED;
 	m_nNumButtons = MAX_BUTTONS;
-	m_bPlayGame = TRUE;
+	m_bPlayGame = true;
 	pSubOptionsPalette = pPalette;
 	//}}AFX_DATA_INIT
 }
@@ -92,7 +92,7 @@ int COptnDlg::OnCreate(LPCREATESTRUCT lpCreateStruct) {
 	return 0;
 }
 
-BOOL COptnDlg::OnInitDialog() {
+bool COptnDlg::OnInitDialog() {
 	CBmpDialog::OnInitDialog();
 
 	CDC     *pDC;
@@ -119,7 +119,7 @@ BOOL COptnDlg::OnInitDialog() {
 	}
 
 	m_ScrollButtons.SetScrollRange(MIN_BUTTONS, MAX_BUTTONS, 0);
-	m_ScrollButtons.SetScrollPos(m_nNumButtons, TRUE);
+	m_ScrollButtons.SetScrollPos(m_nNumButtons, true);
 
 	statRect.SetRect(LEFT_SIDE, 65, LEFT_SIDE + 175, 80);
 	if ((m_pSpeedText = new CText()) != nullptr) {
@@ -127,7 +127,7 @@ BOOL COptnDlg::OnInitDialog() {
 	}
 
 	m_ScrollSpeed.SetScrollRange(MIN_SPEED, MAX_SPEED, 0);
-	m_ScrollSpeed.SetScrollPos(m_nSpeed, TRUE);
+	m_ScrollSpeed.SetScrollPos(m_nSpeed, true);
 
 	if ((pOKButton = new CColorButton) != nullptr) {                   // build a color QUIT button to let us exit
 		(*pOKButton).SetPalette(pSubOptionsPalette);                        // set the palette to use
@@ -153,7 +153,7 @@ BOOL COptnDlg::OnInitDialog() {
 
 	ReleaseDC(pDC);
 
-	return TRUE;  // return TRUE  unless you set the focus to a control
+	return true;  // return true  unless you set the focus to a control
 }
 
 void COptnDlg::OnDestroy(void) {
@@ -161,20 +161,20 @@ void COptnDlg::OnDestroy(void) {
 }
 
 
-BOOL COptnDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool COptnDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 	if (HIWORD(lParam) == BN_CLICKED) {
 
 		switch (wParam) {
 
 		case IDC_PLAYGAME:
-			m_bPlayGame = TRUE;
+			m_bPlayGame = true;
 			(*pGameButton).SetCheck(m_bPlayGame);
 			(*pMusicButton).SetCheck(!m_bPlayGame);
 			break;
 
 		case IDC_PLAYMUSIC:
-			m_bPlayGame = FALSE;
+			m_bPlayGame = false;
 			(*pGameButton).SetCheck(m_bPlayGame);
 			(*pMusicButton).SetCheck(!m_bPlayGame);
 			break;
@@ -194,13 +194,13 @@ BOOL COptnDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 		} // end switch
 	} // end if
 
-	return TRUE;
+	return true;
 
 } // end OnCommand
 
 
-BOOL COptnDlg::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;
+bool COptnDlg::OnEraseBkgnd(CDC *pDC) {
+	return true;
 }
 
 
@@ -241,7 +241,7 @@ void COptnDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pS
 	if (NewPos > pMax) NewPos = pMax;
 
 	if (NewPos != OldPos) {                              //To prevent "flicker"
-		(*pScrollBar).SetScrollPos(NewPos, TRUE);        //...only update when
+		(*pScrollBar).SetScrollPos(NewPos, true);        //...only update when
 	}                                                   //...changed
 
 	UpdateScrollbars();
diff --git a/engines/bagel/hodjnpodj/garfunkle/optndlg.h b/engines/bagel/hodjnpodj/garfunkle/optndlg.h
index 5e9de784e1e..5b7844ad7c1 100644
--- a/engines/bagel/hodjnpodj/garfunkle/optndlg.h
+++ b/engines/bagel/hodjnpodj/garfunkle/optndlg.h
@@ -50,7 +50,7 @@ public:
 	enum { IDD = IDD_SUBOPTIONS };
 	CScrollBar  m_ScrollButtons;
 	CScrollBar  m_ScrollSpeed;
-	BOOL        m_bPlayGame;
+	bool        m_bPlayGame;
 	int m_nNumButtons;
 	int m_nSpeed;
 	CString mSpeedTable [NUM_SPEEDS];
@@ -62,11 +62,11 @@ protected:
 
 	// Generated message map functions
 	//{{AFX_MSG(COptnDlg)
-	virtual BOOL OnInitDialog() override;
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override;
+	virtual bool OnInitDialog() override;
+	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg int  OnCreate(LPCREATESTRUCT lpCreateStruct);
-	afx_msg BOOL OnEraseBkgnd(CDC *pDC);
+	afx_msg bool OnEraseBkgnd(CDC *pDC);
 	virtual void OnOK() override;
 	virtual void OnCancel() override;
 	afx_msg void OnPaint();
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
index d00ec4f0181..dc851f6fadf 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
@@ -63,19 +63,19 @@ void CAudioCfgDlg::PutDlgData() {
 void CAudioCfgDlg::GetDlgData() {
 	m_nVolume   = m_pScrollBar1->GetScrollPos();
 
-	m_bMusic = FALSE;
+	m_bMusic = false;
 	if (m_pMusicButton->GetCheck() == 1) {
-		m_bMusic = TRUE;
+		m_bMusic = true;
 	}
 
-	m_bSound = FALSE;
+	m_bSound = false;
 	if (m_pSoundButton->GetCheck() == 1) {
-		m_bSound = TRUE;
+		m_bSound = true;
 	}
 }
 
 
-BOOL CAudioCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CAudioCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	/*
 	* respond to audio
 	*/
@@ -86,11 +86,11 @@ BOOL CAudioCfgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 		case IDOK:
 			SaveIniSettings();
 			PostMessage(WM_CLOSE, 0, 0);
-			return FALSE;
+			return false;
 
 		case IDCANCEL:
 			PostMessage(WM_CLOSE, 0, 0);
-			return FALSE;
+			return false;
 
 		case ID_MUSIC:
 			m_bMusic = !m_bMusic;
@@ -172,7 +172,7 @@ void CAudioCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 }
 
 
-BOOL CAudioCfgDlg::OnInitDialog(void) {
+bool CAudioCfgDlg::OnInitDialog(void) {
 	CRect tmpRect;
 	CDC *pDC;
 
@@ -188,7 +188,7 @@ BOOL CAudioCfgDlg::OnInitDialog(void) {
 		tmpRect.SetRect(54, 100, 168, 118);
 		if ((m_pScrollBar1 = new CScrollBar) != nullptr) {
 			m_pScrollBar1->Create(WS_VISIBLE | WS_CHILD | SBS_HORZ | SBS_BOTTOMALIGN, tmpRect, this, ID_SCROLL1);
-			m_pScrollBar1->SetScrollRange(LEVEL_MIN, LEVEL_MAX, TRUE);
+			m_pScrollBar1->SetScrollRange(LEVEL_MIN, LEVEL_MAX, true);
 		}
 
 		ReleaseDC(pDC);
@@ -208,14 +208,14 @@ BOOL CAudioCfgDlg::OnInitDialog(void) {
 		m_pMusicButton->SetPalette(m_pPalette);
 		m_pMusicButton->SetControl(ID_MUSIC, this);
 		if (!CSound::MidiAvailable())
-			m_pMusicButton->EnableWindow(FALSE);
+			m_pMusicButton->EnableWindow(false);
 	}
 
 	if ((m_pSoundButton = new CCheckButton) != nullptr) {
 		m_pSoundButton->SetPalette(m_pPalette);
 		m_pSoundButton->SetControl(ID_SOUND, this);
 		if (!CSound::SoundAvailable())
-			m_pSoundButton->EnableWindow(FALSE);
+			m_pSoundButton->EnableWindow(false);
 	}
 
 	LoadIniSettings();
@@ -223,9 +223,9 @@ BOOL CAudioCfgDlg::OnInitDialog(void) {
 	PutDlgData();
 
 	if (!CSound::SoundVolumeAvailable() && !CSound::MidiVolumeAvailable())
-		m_pScrollBar1->EnableWindow(FALSE);
+		m_pScrollBar1->EnableWindow(false);
 
-	return TRUE;
+	return true;
 }
 
 
@@ -253,8 +253,8 @@ void CAudioCfgDlg::UpdateOptions(void) {
 }
 
 
-BOOL CAudioCfgDlg::OnEraseBkgnd(CDC *) {
-	return TRUE;
+bool CAudioCfgDlg::OnEraseBkgnd(CDC *) {
+	return true;
 }
 
 
@@ -311,8 +311,8 @@ void CAudioCfgDlg::ClearDialogImage(void) {
 void CAudioCfgDlg::LoadIniSettings(void) {
 	int nMidiVolume, nWaveVolume;
 
-	m_bMusic = GetPrivateProfileInt("Meta", "Music", TRUE, "HODJPODJ.INI");
-	m_bSound = GetPrivateProfileInt("Meta", "SoundEffects", TRUE, "HODJPODJ.INI");
+	m_bMusic = GetPrivateProfileInt("Meta", "Music", true, "HODJPODJ.INI");
+	m_bSound = GetPrivateProfileInt("Meta", "SoundEffects", true, "HODJPODJ.INI");
 
 	nMidiVolume = GetPrivateProfileInt("Meta", "MidiVolume", LEVEL_DEF, "HODJPODJ.INI");
 	nWaveVolume = GetPrivateProfileInt("Meta", "WaveVolume", LEVEL_DEF, "HODJPODJ.INI");
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
index c3bc955b337..f8c06d2f1f3 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
@@ -43,8 +43,8 @@ public:
 protected:
 
 	virtual void DoDataExchange(CDataExchange *) override;
-	virtual BOOL OnCommand(WPARAM, LPARAM) override;
-	virtual BOOL OnInitDialog(void) override;
+	virtual bool OnCommand(WPARAM, LPARAM) override;
+	virtual bool OnInitDialog(void) override;
 	void PutDlgData(void);
 	void GetDlgData(void);
 	void LoadIniSettings(void);
@@ -52,7 +52,7 @@ protected:
 	void UpdateOptions(void);
 	void ClearDialogImage(void);
 
-	afx_msg BOOL OnEraseBkgnd(CDC *);
+	afx_msg bool OnEraseBkgnd(CDC *);
 	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnClose();
 	void OnDestroy();
@@ -66,8 +66,8 @@ protected:
 	CText        *m_pTxtVolume;
 
 	int          m_nVolume;
-	BOOL         m_bMusic;
-	BOOL         m_bSound;
+	bool         m_bMusic;
+	bool         m_bSound;
 };
 
 } // namespace HodjNPodj
diff --git a/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp b/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
index d75575a8a12..0c38ed50619 100644
--- a/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
@@ -27,7 +27,7 @@ namespace Bagel {
 namespace HodjNPodj {
 
 CBitmap *FetchScreenBitmap(CDC *pDC, CPalette *pPalette, const int x, const int y, const int dx, const int dy) {
-	BOOL        bSuccess = FALSE;
+	bool        bSuccess = false;
 	CDC         *pWorkDC = nullptr;
 	CPalette    *pPalOld = nullptr,
 	             *pPalOldWork = nullptr;
@@ -35,7 +35,7 @@ CBitmap *FetchScreenBitmap(CDC *pDC, CPalette *pPalette, const int x, const int
 	             *pWorkOld = nullptr;
 
 	if (pPalette != nullptr) {                                 // map in color palette to be used
-		pPalOld = (*pDC).SelectPalette(pPalette, FALSE);
+		pPalOld = (*pDC).SelectPalette(pPalette, false);
 		(void)(*pDC).RealizePalette();
 	}
 
@@ -47,7 +47,7 @@ CBitmap *FetchScreenBitmap(CDC *pDC, CPalette *pPalette, const int x, const int
 	        (*pWorkDC).CreateCompatibleDC(pDC) &&               // ... use as a return value to the caller
 	        (*pWork).CreateCompatibleBitmap(pDC, dx, dy)) {     // create a bitmap of the appropriate size
 		if (pPalette != nullptr) {                             // map the palette into the work area
-			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, FALSE);
+			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
 			(void)(*pWorkDC).RealizePalette();
 		}
 		pWorkOld = (*pWorkDC).SelectObject(pWork);          // now map in the work area's bitmap
@@ -56,11 +56,11 @@ CBitmap *FetchScreenBitmap(CDC *pDC, CPalette *pPalette, const int x, const int
 	}
 
 	if (pPalOld != nullptr)                                    // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 	if (pWorkOld != nullptr)
 		(void)(*pWorkDC).SelectObject(pWorkOld);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, FALSE);
+		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
 	if (!bSuccess &&                                        // release the bitmap result we built
 	        (pWork != nullptr)) {                                  // ... if something failed
 		(*pWork).DeleteObject();
@@ -166,7 +166,7 @@ CBitmap *FetchResourceBitmap(CDC *pDC, CPalette **pPalette, const int nResID) {
 }
 
 CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int x, const int y, const int dx, const int dy) {
-	BOOL        bSuccess = FALSE;
+	bool        bSuccess = false;
 	CDC         *pWorkDC = nullptr,
 	             *pBaseDC = nullptr;
 	CPalette    *pPalOld = nullptr,
@@ -177,7 +177,7 @@ CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int
 	              *pBaseOld = nullptr;
 
 	if (pPalette != nullptr) {                                 // map in color palette to be used
-		pPalOld = (*pDC).SelectPalette(pPalette, FALSE);
+		pPalOld = (*pDC).SelectPalette(pPalette, false);
 		(void)(*pDC).RealizePalette();
 	}
 
@@ -192,9 +192,9 @@ CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int
 	        (*pBaseDC).CreateCompatibleDC(pDC) &&
 	        (*pWork).CreateCompatibleBitmap(pDC, dx, dy)) {     // create a bitmap of the appropriate size
 		if (pPalette != nullptr) {                             // map the palette into the contexts
-			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, FALSE);
+			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
 			(void)(*pWorkDC).RealizePalette();
-			pPalOldBase = (*pBaseDC).SelectPalette(pPalette, FALSE);
+			pPalOldBase = (*pBaseDC).SelectPalette(pPalette, false);
 			(void)(*pBaseDC).RealizePalette();
 		}
 		pWorkOld = (*pWorkDC).SelectObject(pWork);          // now map in the work area's bitmap
@@ -205,15 +205,15 @@ CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int
 	}
 
 	if (pPalOld != nullptr)                                    // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 	if (pWorkOld != nullptr)
 		(void)(*pWorkDC).SelectObject(pWorkOld);
 	if (pBaseOld != nullptr)
 		(void)(*pBaseDC).SelectObject(pBaseOld);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, FALSE);
+		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
 	if (pPalOldBase != nullptr)
-		(void)(*pBaseDC).SelectPalette(pPalOldBase, FALSE);
+		(void)(*pBaseDC).SelectPalette(pPalOldBase, false);
 	if (!bSuccess &&                                        // release the bitmap result we built
 	        (pWork != nullptr)) {                                  // ... if something failed
 		(*pWork).DeleteObject();
@@ -246,21 +246,21 @@ CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int
  *  int nMode               blt mode for transfer
  *
  * Return Value:
- *  BOOL            success / failure return
+ *  bool            success / failure return
  *
  * Description:     paint a rectangular area of the screen from a CBitmap object.
  *
  ************************************************************************/
 
-BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, CRect *pDstRect, uint32 dwMode) {
-	BOOL        bSuccess = FALSE;
+bool BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, CRect *pDstRect, uint32 dwMode) {
+	bool        bSuccess = false;
 	CDC         *pWorkDC = nullptr;
 	CPalette    *pPalOld = nullptr,
 	             *pPalOldWork = nullptr;
 	CBitmap     *pWorkOld = nullptr;
 
 	if (pPalette != nullptr) {                                 // map in color palette to be used
-		pPalOld = (*pDC).SelectPalette(pPalette, FALSE);
+		pPalOld = (*pDC).SelectPalette(pPalette, false);
 		(void)(*pDC).RealizePalette();
 	}
 
@@ -270,7 +270,7 @@ BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect,
 	        (pBitmap != nullptr) &&
 	        (*pWorkDC).CreateCompatibleDC(pDC)) {               // create a context for our bitmap
 		if (pPalette != nullptr) {                             // map the palette into the context
-			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, FALSE);
+			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
 			(void)(*pWorkDC).RealizePalette();
 		}
 		pWorkOld = (*pWorkDC).SelectObject(pBitmap);        // now map in our bitmap
@@ -303,11 +303,11 @@ BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect,
 	}
 
 	if (pPalOld != nullptr)                                    // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 	if (pWorkOld != nullptr)
 		(void)(*pWorkDC).SelectObject(pWorkOld);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, FALSE);
+		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
 	if (pWorkDC != nullptr) {
 		(*pWorkDC).DeleteDC();
 		delete pWorkDC;
@@ -329,7 +329,7 @@ BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect,
  *  CRect *pSrcRect         source rectange in bitmap
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     "mask" paint a bitmap to the specified display context.  White
  *                  pixels are assumed to be transparent, allowing the background
@@ -337,7 +337,7 @@ BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect,
  *
  ************************************************************************/
 
-BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, const int x, const int y) {
+bool BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, const int x, const int y) {
 	CDC         *pImageDC = nullptr,                       // context for the bitmap image
 	             *pWorkDC = nullptr,                        // context for the bitmap work area
 	              *pMaskDC = nullptr;                        // context for the image's mask
@@ -349,14 +349,14 @@ BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 	                 *pMaskOld = nullptr;                       // bitmap previously mapped to mask context
 	CPalette    *pPalOldImage = nullptr,                   // palette previously mapped to image context
 	             *pPalOldWork = nullptr;                    // palette previously mapped to work context
-	BOOL        bSuccess = FALSE;
+	bool        bSuccess = false;
 	CPalette    *pPalOld = nullptr;
 	CSize       cSize;
 	int         dx, dy;
 	CRect       dstRect;
 
 	if (pPalette != nullptr) {
-		pPalOld = (*pDC).SelectPalette(pPalette, FALSE);
+		pPalOld = (*pDC).SelectPalette(pPalette, false);
 		(void)(*pDC).RealizePalette();
 	}
 
@@ -381,9 +381,9 @@ BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 		dy = (*pSrcRect).bottom - (*pSrcRect).top;
 
 		if (pPalette != nullptr) {                     // map in the color palette if specified
-			pPalOldImage = (*pImageDC).SelectPalette(pPalette, FALSE);
+			pPalOldImage = (*pImageDC).SelectPalette(pPalette, false);
 			(void)(*pImageDC).RealizePalette();
-			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, FALSE);
+			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
 			(void)(*pWorkDC).RealizePalette();
 		}
 
@@ -458,7 +458,7 @@ BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 
 	if (pImageOld != nullptr)                              // select out bitmaps out of their contexts
 		(void)(*pImageDC).SelectObject(pImageOld);
@@ -468,9 +468,9 @@ BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 		(void)(*pMaskDC).SelectObject(pMaskOld);
 
 	if (pPalOldImage != nullptr)                           // map out the palettes we used
-		(void)(*pImageDC).SelectPalette(pPalOldImage, FALSE);
+		(void)(*pImageDC).SelectPalette(pPalOldImage, false);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, FALSE);
+		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
 
 	if (pImage != nullptr) {                                // delete the bitmaps we created
 		(*pImage).DeleteObject();
@@ -514,14 +514,14 @@ BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
  *  int dx, dy              optional sizing info to force a stretch blt
  *
  * Return Value:
- *  BOOL            success / failure return
+ *  bool            success / failure return
  *
  * Description:     paint a rectangular area of the screen from a CBitmap object.
  *
  ************************************************************************/
 
-BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, const int y, const int dx, const int dy) {
-	BOOL        bSuccess = FALSE;
+bool PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, const int y, const int dx, const int dy) {
+	bool        bSuccess = false;
 	CDC         *pWorkDC = nullptr;
 	CPalette    *pPalOld = nullptr,
 	             *pPalOldWork = nullptr;
@@ -532,7 +532,7 @@ BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, co
 	(*pBitmap).GetObject(sizeof(BITMAP), &cBitmapData);
 
 	if (pPalette != nullptr) {                                 // map in color palette to be used
-		pPalOld = (*pDC).SelectPalette(pPalette, FALSE);
+		pPalOld = (*pDC).SelectPalette(pPalette, false);
 		(void)(*pDC).RealizePalette();
 	}
 
@@ -542,7 +542,7 @@ BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, co
 	        (pBitmap != nullptr) &&
 	        (*pWorkDC).CreateCompatibleDC(pDC)) {               // create a context for our bitmap
 		if (pPalette != nullptr) {                             // map the palette into the context
-			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, FALSE);
+			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
 			(void)(*pWorkDC).RealizePalette();
 		}
 		pWorkOld = (*pWorkDC).SelectObject(pBitmap);        // now map in our bitmap
@@ -559,11 +559,11 @@ BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, co
 	}
 
 	if (pPalOld != nullptr)                                    // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 	if (pWorkOld != nullptr)
 		(void)(*pWorkDC).SelectObject(pWorkOld);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, FALSE);
+		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
 	if (pWorkDC != nullptr) {
 		(*pWorkDC).DeleteDC();
 		delete pWorkDC;
@@ -585,26 +585,26 @@ BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, co
  *  int dx, dy              optional sizing info to force a stretch blt
  *
  * Return Value:
- *  BOOL            success / failure return
+ *  bool            success / failure return
  *
  * Description:     paint a rectangular area of the screen from a disk based DIB.
  *
  ************************************************************************/
 
-BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, const char *pszPathName, const int x, const int y, const int dx, const int dy) {
+bool PaintBitmap(CDC *pDC, CPalette *pPalette, const char *pszPathName, const int x, const int y, const int dx, const int dy) {
 	CDibDoc myDoc;
 	HDIB    hDIB;
 	CRect   rcDest;
 	CRect   rcDIB;
 	int     cxDIB;
 	int     cyDIB;
-	BOOL    bSuccess;
+	bool    bSuccess;
 
 	bSuccess = myDoc.OpenDocument(pszPathName);
 	if ((pDC != nullptr) && bSuccess) {
 		hDIB = myDoc.GetHDIB();
 		if (hDIB == nullptr)
-			bSuccess = FALSE;
+			bSuccess = false;
 		else {
 			cxDIB = (int) DIBWidth(hDIB);
 			cyDIB = (int) DIBHeight(hDIB);
@@ -636,7 +636,7 @@ BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, const char *pszPathName, const in
  *  int dx, dy              optional sizing info to force a stretch blt
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     Read in a DDB bitmap from disk and "mask" paint it to the
  *                  specified display context.  White pixels are assumed to be
@@ -644,8 +644,8 @@ BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, const char *pszPathName, const in
  *
  ************************************************************************/
 
-BOOL PaintMaskedDIB(CDC *pDC, CPalette *pPalette, const char *pszPathName, const int x, const int y, const int dx, const int dy) {
-	BOOL    bSuccess = FALSE;
+bool PaintMaskedDIB(CDC *pDC, CPalette *pPalette, const char *pszPathName, const int x, const int y, const int dx, const int dy) {
+	bool    bSuccess = false;
 	CDibDoc *pDIB = nullptr;                                   // pointer to our loaded DIB file
 
 	pDIB = new CDibDoc();                               // create an object for our DIB
@@ -673,7 +673,7 @@ BOOL PaintMaskedDIB(CDC *pDC, CPalette *pPalette, const char *pszPathName, const
  *  int dx, dy              optional sizing info to force a stretch blt
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     Read in a DDB bitmap resource and "mask" paint it to the
  *                  specified display context.  White pixels are assumed to be
@@ -681,8 +681,8 @@ BOOL PaintMaskedDIB(CDC *pDC, CPalette *pPalette, const char *pszPathName, const
  *
  ************************************************************************/
 
-BOOL PaintMaskedResource(CDC *pDC, CPalette *pPalette, const int nResID, const int x, const int y, const int dx, const int dy) {
-	BOOL    bSuccess = FALSE;
+bool PaintMaskedResource(CDC *pDC, CPalette *pPalette, const int nResID, const int x, const int y, const int dx, const int dy) {
+	bool    bSuccess = false;
 	CDibDoc *pDIB = nullptr;                                   // pointer to our loaded DIB file
 	char    chResName[16];
 
@@ -714,7 +714,7 @@ BOOL PaintMaskedResource(CDC *pDC, CPalette *pPalette, const int nResID, const i
  *  int dx, dy              optional sizing info to force a stretch blt
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     Read in a DDB bitmap resource and "mask" paint it to the
  *                  specified display context.  White pixels are assumed to be
@@ -722,8 +722,8 @@ BOOL PaintMaskedResource(CDC *pDC, CPalette *pPalette, const int nResID, const i
  *
  ************************************************************************/
 
-BOOL PaintMaskedResource(CDC *pDC, CPalette *pPalette, const char *pszName, const int x, const int y, const int dx, const int dy) {
-	BOOL    bSuccess = FALSE;
+bool PaintMaskedResource(CDC *pDC, CPalette *pPalette, const char *pszName, const int x, const int y, const int dx, const int dy) {
+	bool    bSuccess = false;
 	CDibDoc *pDIB = nullptr;                                   // pointer to our loaded DIB file
 
 	pDIB = new CDibDoc();                               // create an object for our DIB
@@ -751,7 +751,7 @@ BOOL PaintMaskedResource(CDC *pDC, CPalette *pPalette, const char *pszName, cons
  *  int dx, dy              optional sizing info to force a stretch blt
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     "mask" paint a DIB to the specified display context.  White
  *                  pixels are assumed to be transparent, allowing the background
@@ -759,8 +759,8 @@ BOOL PaintMaskedResource(CDC *pDC, CPalette *pPalette, const char *pszName, cons
  *
  ************************************************************************/
 
-BOOL PaintMaskedDIB(CDC *pDC, CPalette *pPalette, CDibDoc *pDIB, const int x, const int y, const int dx, const int dy) {
-	BOOL        bSuccess = FALSE;
+bool PaintMaskedDIB(CDC *pDC, CPalette *pPalette, CDibDoc *pDIB, const int x, const int y, const int dx, const int dy) {
+	bool        bSuccess = false;
 	CBitmap     *pBitmap = nullptr;
 	CPalette    *pMyPalette = nullptr;
 	HDIB        hDIB = nullptr;
@@ -795,7 +795,7 @@ BOOL PaintMaskedDIB(CDC *pDC, CPalette *pPalette, CDibDoc *pDIB, const int x, co
  *  int dx, dy              optional sizing info to force a stretch blt
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     "mask" paint a bitmap to the specified display context.  White
  *                  pixels are assumed to be transparent, allowing the background
@@ -803,7 +803,7 @@ BOOL PaintMaskedDIB(CDC *pDC, CPalette *pPalette, CDibDoc *pDIB, const int x, co
  *
  ************************************************************************/
 
-BOOL PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, const int y, const int dx, const int dy) {
+bool PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, const int y, const int dx, const int dy) {
 	BITMAP      myBitmap;                               // area for bitmap info
 	CDC         *pImageDC = nullptr,                       // context for the bitmap image
 	             *pWorkDC = nullptr,                        // context for the bitmap work area
@@ -816,12 +816,12 @@ BOOL PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 	                 *pMaskOld = nullptr;                       // bitmap previously mapped to mask context
 	CPalette    *pPalOldImage = nullptr,                   // palette previously mapped to image context
 	             *pPalOldWork = nullptr;                    // palette previously mapped to work context
-	BOOL        bSuccess = FALSE;
+	bool        bSuccess = false;
 	CPalette    *pPalOld = nullptr;
 	CSize       cSize;
 
 	if (pPalette != nullptr) {
-		pPalOld = (*pDC).SelectPalette(pPalette, FALSE);
+		pPalOld = (*pDC).SelectPalette(pPalette, false);
 		(void)(*pDC).RealizePalette();
 	}
 
@@ -853,9 +853,9 @@ BOOL PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 		}
 
 		if (pPalette != nullptr) {                     // map in the color palette if specified
-			pPalOldImage = (*pImageDC).SelectPalette(pPalette, FALSE);
+			pPalOldImage = (*pImageDC).SelectPalette(pPalette, false);
 			(void)(*pImageDC).RealizePalette();
-			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, FALSE);
+			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
 			(void)(*pWorkDC).RealizePalette();
 		}
 
@@ -929,7 +929,7 @@ BOOL PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 
 	if (pImageOld != nullptr)                              // select out bitmaps out of their contexts
 		(void)(*pImageDC).SelectObject(pImageOld);
@@ -939,9 +939,9 @@ BOOL PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 		(void)(*pMaskDC).SelectObject(pMaskOld);
 
 	if (pPalOldImage != nullptr)                           // map out the palettes we used
-		(void)(*pImageDC).SelectPalette(pPalOldImage, FALSE);
+		(void)(*pImageDC).SelectPalette(pPalOldImage, false);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, FALSE);
+		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
 
 	if (pImage != nullptr) {                                // delete the bitmaps we created
 		(*pImage).DeleteObject();
@@ -984,7 +984,7 @@ BOOL PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
  *  int nBlockSize          size of block to be painted at each step
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     randomly paint a DIB to the specified display context
  *                  a section/block at a time, without repeating any blocks;
@@ -1002,14 +1002,14 @@ BOOL PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 #define BLOCK   4
 
 
-BOOL PaintBlockEffect(CDC *pDC, CDibDoc *pDIB, CPalette* pPalette, int nBlockSize) {
+bool PaintBlockEffect(CDC *pDC, CDibDoc *pDIB, CPalette* pPalette, int nBlockSize) {
 	HDIB    hDIB = nullptr;
 	CBitmap *pBitmap = nullptr;
-	BOOL    bSuccess = FALSE;
+	bool    bSuccess = false;
 
 	if ((pDC == nullptr) ||
 	        (pDIB == nullptr))
-		return FALSE;
+		return false;
 
 	hDIB = (*pDIB).GetHDIB();
 	pBitmap = ConvertDIB(pDC, hDIB, pPalette);
@@ -1034,20 +1034,20 @@ BOOL PaintBlockEffect(CDC *pDC, CDibDoc *pDIB, CPalette* pPalette, int nBlockSiz
  *  int nBlockSize          size of block to be painted at each step
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     randomly paint a bitmap to the specified display context
  *                  a section/block at a time, without repeating blocks.
  *
  ************************************************************************/
 
-BOOL PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette* pPalette, int nBlockSize) {
+bool PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette* pPalette, int nBlockSize) {
 	CPalette *pOldPal = nullptr;
 	CPalette *pOldPal2 = nullptr;
 	CBitmap  *pBitmapOld = nullptr;
 	CDC      *pMemDC = nullptr;
 	BITMAP   myBitmap;
-	BOOL     bSuccess = FALSE;
+	bool     bSuccess = false;
 	unsigned long   seed;
 	unsigned long   value, maxvalue;
 	unsigned long   x, y;
@@ -1058,19 +1058,19 @@ BOOL PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette* pPalette, int nBlock
 
 	if ((pDC == nullptr) ||
 	        (pBitmap == nullptr))
-		return FALSE;
+		return false;
 
 	if (pPalette != nullptr) {
-		pOldPal = (*pDC).SelectPalette(pPalette, FALSE);
+		pOldPal = (*pDC).SelectPalette(pPalette, false);
 		(*pDC).RealizePalette();
 	}
 
 	pMemDC = new CDC();
 	if ((pMemDC == nullptr) ||
-	        ((*pMemDC).CreateCompatibleDC(pDC) == FALSE))
+	        ((*pMemDC).CreateCompatibleDC(pDC) == false))
 		goto clean_up;
 
-	pOldPal2 = (*pMemDC).SelectPalette(pPalette, FALSE);
+	pOldPal2 = (*pMemDC).SelectPalette(pPalette, false);
 	(*pMemDC).RealizePalette();
 	pBitmapOld = (*pMemDC).SelectObject(pBitmap);
 
@@ -1121,18 +1121,18 @@ BOOL PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette* pPalette, int nBlock
 	              0,
 	              SRCCOPY);
 
-	bSuccess = TRUE;
+	bSuccess = true;
 
 clean_up:
 	if (pBitmapOld != nullptr)
 		(*pMemDC).SelectObject(pBitmapOld);
 	if (pOldPal2 != nullptr)
-		(void)(*pMemDC).SelectPalette(pOldPal2, FALSE);
+		(void)(*pMemDC).SelectPalette(pOldPal2, false);
 	if (pMemDC != nullptr)
 		delete pMemDC;
 
 	if (pOldPal != nullptr)
-		(void)(*pDC).SelectPalette(pOldPal, FALSE);
+		(void)(*pDC).SelectPalette(pOldPal, false);
 
 	return bSuccess;
 }
@@ -1149,18 +1149,18 @@ clean_up:
  *  int nBlockSize          size of block to be painted at each step
  *
  * Return Value:
- *  BOOL                    success/failure condition
+ *  bool                    success/failure condition
  *
  * Description:     randomly paint a solid background color to the specified
  *                  display context a section/block at a time, without repeating blocks.
  *
  ************************************************************************/
 
-BOOL PaintBlockEffect(CDC *pDC, COLORREF rgbColor, CPalette* pPalette, int nBlockSize, int nX, int nY, int nWidth, int nHeight) {
+bool PaintBlockEffect(CDC *pDC, COLORREF rgbColor, CPalette* pPalette, int nBlockSize, int nX, int nY, int nWidth, int nHeight) {
 	CBrush   myBrush;
 	CRect    thisRect, fillRect;
 	CPalette *pOldPal = nullptr;
-	BOOL     bSuccess = FALSE;
+	bool     bSuccess = false;
 	unsigned long   seed;
 	unsigned long   value, maxvalue;
 	unsigned long   x, y;
@@ -1170,10 +1170,10 @@ BOOL PaintBlockEffect(CDC *pDC, COLORREF rgbColor, CPalette* pPalette, int nBloc
 	unsigned long   width, height;
 
 	if (pDC == nullptr)
-		return FALSE;
+		return false;
 
 	if (pPalette != nullptr) {
-		pOldPal = (*pDC).SelectPalette(pPalette, FALSE);
+		pOldPal = (*pDC).SelectPalette(pPalette, false);
 		(*pDC).RealizePalette();
 	}
 
@@ -1213,10 +1213,10 @@ BOOL PaintBlockEffect(CDC *pDC, COLORREF rgbColor, CPalette* pPalette, int nBloc
 	fillRect.SetRect(nX, nY, nX + nBlockSize, nY + nBlockSize);
 	(*pDC).FillRect(&fillRect, &myBrush);
 
-	bSuccess = TRUE;
+	bSuccess = true;
 
 	if (pOldPal != nullptr)
-		(void)(*pDC).SelectPalette(pOldPal, FALSE);
+		(void)(*pDC).SelectPalette(pOldPal, false);
 
 	return bSuccess;
 }
diff --git a/engines/bagel/hodjnpodj/hnplibs/bitmaps.h b/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
index f80679cff2f..da42a5a7002 100644
--- a/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
+++ b/engines/bagel/hodjnpodj/hnplibs/bitmaps.h
@@ -77,22 +77,22 @@ extern CBitmap *FetchResourceBitmap(CDC *pDC, CPalette **pPalette, const int nRe
  */
 extern CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int x, const int y, const int dx, const int dy);
 
-BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
-BOOL PaintBitmap(CDC *pDC, CPalette *pPalette, const char *pszName, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
+bool PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
+bool PaintBitmap(CDC *pDC, CPalette *pPalette, const char *pszName, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
 
-BOOL PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
+bool PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
 
-BOOL PaintMaskedDIB(CDC *pDC, CPalette *pPalette, const char *pszName, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
-BOOL PaintMaskedDIB(CDC *pDC, CPalette *pPalette, CDibDoc *pDIB, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
-BOOL PaintMaskedResource(CDC *pDC, CPalette *pPalette, const int resId, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
-BOOL PaintMaskedResource(CDC *pDC, CPalette *pPalette, const char *pszPathName, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
+bool PaintMaskedDIB(CDC *pDC, CPalette *pPalette, const char *pszName, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
+bool PaintMaskedDIB(CDC *pDC, CPalette *pPalette, CDibDoc *pDIB, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
+bool PaintMaskedResource(CDC *pDC, CPalette *pPalette, const int resId, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
+bool PaintMaskedResource(CDC *pDC, CPalette *pPalette, const char *pszPathName, const int x = 0, const int y = 0, const int dx = 0, const int dy = 0);
 
-BOOL PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, int nBlockSize);
-BOOL PaintBlockEffect(CDC *pDC, CDibDoc *pDIB, CPalette *pPalette, int nBlockSize);
-BOOL PaintBlockEffect(CDC *pDC, COLORREF rgbColor, CPalette *pPalette, int nBlockSize, int nX, int nY, int nWidth, int nHeight);
+bool PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, int nBlockSize);
+bool PaintBlockEffect(CDC *pDC, CDibDoc *pDIB, CPalette *pPalette, int nBlockSize);
+bool PaintBlockEffect(CDC *pDC, COLORREF rgbColor, CPalette *pPalette, int nBlockSize, int nX, int nY, int nWidth, int nHeight);
 
-BOOL BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, CRect *pDstRect, uint32 nMode);
-BOOL BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, const int x, const int y);
+bool BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, CRect *pDstRect, uint32 nMode);
+bool BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect, const int x, const int y);
 
 CSize GetBitmapSize(CBitmap *pBitmap);
 CPalette *GetPalette(CDC *pDC, const char *pszBmpName);
diff --git a/engines/bagel/hodjnpodj/hnplibs/button.cpp b/engines/bagel/hodjnpodj/hnplibs/button.cpp
index 4d4f51f6ed0..5ca12e2b822 100644
--- a/engines/bagel/hodjnpodj/hnplibs/button.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/button.cpp
@@ -87,8 +87,8 @@ CBmpButton::~CBmpButton() {
  *
  ************************************************************************/
 
-BOOL CBmpButton::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;                                      // do not automatically erase background to white
+bool CBmpButton::OnEraseBkgnd(CDC *pDC) {
+	return true;                                      // do not automatically erase background to white
 }
 
 
@@ -107,7 +107,7 @@ BOOL CBmpButton::OnEraseBkgnd(CDC *pDC) {
 void CBmpButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	CDC         *pDC;
 	CPalette    *pPalOld = nullptr;
-//BOOL      bActiveWindow = FALSE;
+//bool      bActiveWindow = false;
 //CWnd      *pActiveWindow;
 	CBitmap     *pBitmap;
 	CWnd        *pParentWnd;
@@ -121,13 +121,13 @@ void CBmpButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	    pActiveWindow = GetActiveWindow();              // get the active window and if it is
 	    if ((this == pActiveWindow) ||                  // ... us, then we will use the palette
 	        (pActiveWindow == nullptr))
-	        bActiveWindow = TRUE;                       // ... in a foreground mode
+	        bActiveWindow = true;                       // ... in a foreground mode
 	*/
 	pDC = new CDC;                                  // setup the device context given to us
 	(*pDC).Attach((*lpDrawItemStruct).hDC);         // ... as a pointer to a CDC object
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
-		pPalOld = (*pDC).SelectPalette(m_pPalette, TRUE);
+		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
 		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
@@ -144,7 +144,7 @@ void CBmpButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	PaintBitmap(pDC, nullptr, pBitmap, (*lpDrawItemStruct).rcItem.left, (*lpDrawItemStruct).rcItem.top);
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 
 	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
@@ -160,17 +160,17 @@ void CBmpButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     associate this button with a dialog control.
  *
  ************************************************************************/
 
-BOOL CBmpButton::SetControl(unsigned int nID, CWnd * pParent) {
+bool CBmpButton::SetControl(unsigned int nID, CWnd * pParent) {
 	if (!CBitmapButton::SubclassDlgItem(nID, pParent))      // attach the Button to the dialog control
-		return FALSE;
+		return false;
 
-	return TRUE;
+	return true;
 }
 
 
@@ -183,19 +183,19 @@ BOOL CBmpButton::SetControl(unsigned int nID, CWnd * pParent) {
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     associates this button with a dialog control and
  *                  automatically load bitmaps for a dialog button.
  *
  ************************************************************************/
 
-BOOL CBmpButton::AutoLoad(unsigned int nID, CWnd * pParent) {
+bool CBmpButton::AutoLoad(unsigned int nID, CWnd * pParent) {
 	CString buttonName;
-	BOOL    bSuccess;
+	bool    bSuccess;
 
 	if (!SetControl(nID, pParent))                          // attach the Button to the dialog control
-		return FALSE;
+		return false;
 
 	GetWindowText(buttonName);                              // get the button's title
 	ASSERT(!buttonName.IsEmpty());
@@ -221,17 +221,17 @@ BOOL CBmpButton::AutoLoad(unsigned int nID, CWnd * pParent) {
  *  CBitmap *pDisabled  bitmap for DISABLED state
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     Setup the CBitmaps for the four button states of a CBmpButton.
  *
  ************************************************************************/
 
-BOOL CBmpButton::LoadBitmaps(CPalette *pPalette, CBitmap *pBase, CBitmap *pSelected, CBitmap *pFocus, CBitmap *pDisabled) {
+bool CBmpButton::LoadBitmaps(CPalette *pPalette, CBitmap *pBase, CBitmap *pSelected, CBitmap *pFocus, CBitmap *pDisabled) {
 	HBITMAP     hBitmap = nullptr;
 
 	if (pBase == nullptr)
-		return FALSE;
+		return false;
 
 	if (pPalette == nullptr)
 		m_pPalette = nullptr;
@@ -269,7 +269,7 @@ BOOL CBmpButton::LoadBitmaps(CPalette *pPalette, CBitmap *pBase, CBitmap *pSelec
 
 	ensureSize();
 
-	return TRUE;
+	return true;
 }
 
 
@@ -284,17 +284,17 @@ BOOL CBmpButton::LoadBitmaps(CPalette *pPalette, CBitmap *pBase, CBitmap *pSelec
  *  const int nDisabled     resource number for DISABLED state
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     Read in the DDB bitmaps for the four button states of a CBmpButton.
  *
  ************************************************************************/
 
-BOOL CBmpButton::LoadBitmaps(const int nBase, const int nSelected, const int nFocus, const int nDisabled) {
+bool CBmpButton::LoadBitmaps(const int nBase, const int nSelected, const int nFocus, const int nDisabled) {
 	CDC         *pDC = nullptr;
 	CBitmap     *pBitmap = nullptr;
 	HBITMAP     hBitmap = nullptr;
-	BOOL        bSuccess = TRUE;
+	bool        bSuccess = true;
 
 	if (m_pPalette != nullptr) {                       // release any existing palette resource
 		(*m_pPalette).DeleteObject();
@@ -304,7 +304,7 @@ BOOL CBmpButton::LoadBitmaps(const int nBase, const int nSelected, const int nFo
 
 	pDC = GetDC();                                  // fetch a device context we can use
 	if (pDC == nullptr)
-		bSuccess = FALSE;
+		bSuccess = false;
 
 	if (bSuccess) {                                 // get a CBitmap for the UP button
 		pBitmap = FetchResourceBitmap(pDC, &m_pPalette, nBase);
@@ -316,7 +316,7 @@ BOOL CBmpButton::LoadBitmaps(const int nBase, const int nSelected, const int nFo
 			if (nSelected != 0) {               // get the SELECTED bitmap and plug it in
 				pBitmap = FetchResourceBitmap(pDC, nullptr, nSelected);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapSel.DeleteObject();     // release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -328,7 +328,7 @@ BOOL CBmpButton::LoadBitmaps(const int nBase, const int nSelected, const int nFo
 			        (nFocus != 0)) {
 				pBitmap = FetchResourceBitmap(pDC, nullptr, nFocus);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapFocus.DeleteObject();   // release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -340,7 +340,7 @@ BOOL CBmpButton::LoadBitmaps(const int nBase, const int nSelected, const int nFo
 			        (nDisabled != 0)) {
 				pBitmap = FetchResourceBitmap(pDC, nullptr, nDisabled);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapDisabled.DeleteObject();// release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -349,7 +349,7 @@ BOOL CBmpButton::LoadBitmaps(const int nBase, const int nSelected, const int nFo
 				}
 			}
 		} else
-			bSuccess = FALSE;
+			bSuccess = false;
 	}
 
 	if (pDC != nullptr)
@@ -373,17 +373,17 @@ BOOL CBmpButton::LoadBitmaps(const int nBase, const int nSelected, const int nFo
  *  const char *lpszDisabled     pointer to resource name string for DISABLED state
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     Read in the DDB bitmaps for the four button states of a CBmpButton.
  *
  ************************************************************************/
 
-BOOL CBmpButton::LoadBitmaps(const char *lpszBase, const char *lpszSelected, const char *lpszFocus, const char *lpszDisabled) {
+bool CBmpButton::LoadBitmaps(const char *lpszBase, const char *lpszSelected, const char *lpszFocus, const char *lpszDisabled) {
 	CDC         *pDC = nullptr;
 	CBitmap     *pBitmap = nullptr;
 	HBITMAP     hBitmap = nullptr;
-	BOOL        bSuccess = TRUE;
+	bool        bSuccess = true;
 
 	if (m_pPalette != nullptr) {                       // release any existing palette resource
 		(*m_pPalette).DeleteObject();
@@ -393,7 +393,7 @@ BOOL CBmpButton::LoadBitmaps(const char *lpszBase, const char *lpszSelected, con
 
 	pDC = GetDC();                                  // fetch a device context we can use
 	if (pDC == nullptr)
-		bSuccess = FALSE;
+		bSuccess = false;
 
 	if (bSuccess) {                                 // get a CBitmap for the UP button
 		pBitmap = FetchResourceBitmap(pDC, &m_pPalette, lpszBase);
@@ -405,7 +405,7 @@ BOOL CBmpButton::LoadBitmaps(const char *lpszBase, const char *lpszSelected, con
 			if (lpszSelected != nullptr) {             // get the SELECTED bitmap and plug it in
 				pBitmap = FetchResourceBitmap(pDC, nullptr, lpszSelected);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapSel.DeleteObject();     // release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -417,7 +417,7 @@ BOOL CBmpButton::LoadBitmaps(const char *lpszBase, const char *lpszSelected, con
 			        (lpszFocus != nullptr)) {
 				pBitmap = FetchResourceBitmap(pDC, nullptr, lpszFocus);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapFocus.DeleteObject();   // release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -429,7 +429,7 @@ BOOL CBmpButton::LoadBitmaps(const char *lpszBase, const char *lpszSelected, con
 			        (lpszDisabled != nullptr)) {
 				pBitmap = FetchResourceBitmap(pDC, nullptr, lpszDisabled);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapDisabled.DeleteObject();// release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -438,7 +438,7 @@ BOOL CBmpButton::LoadBitmaps(const char *lpszBase, const char *lpszSelected, con
 				}
 			}
 		} else
-			bSuccess = FALSE;
+			bSuccess = false;
 	}
 
 	if (pDC != nullptr)
@@ -462,17 +462,17 @@ BOOL CBmpButton::LoadBitmaps(const char *lpszBase, const char *lpszSelected, con
  *  const char *lpszDisabled     pointer to .BMP path string for DISABLED state
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     Read in the .BMP files for the four button states of a CBmpButton.
  *
  ************************************************************************/
 
-BOOL CBmpButton::LoadBmpBitmaps(const char *lpszBase, const char *lpszSelected, const char *lpszFocus, const char *lpszDisabled) {
+bool CBmpButton::LoadBmpBitmaps(const char *lpszBase, const char *lpszSelected, const char *lpszFocus, const char *lpszDisabled) {
 	CDC         *pDC = nullptr;
 	CBitmap     *pBitmap = nullptr;
 	HBITMAP     hBitmap = nullptr;
-	BOOL        bSuccess = TRUE;
+	bool        bSuccess = true;
 
 	if (m_pPalette != nullptr) {                       // release any existing palette resource
 		(*m_pPalette).DeleteObject();
@@ -482,7 +482,7 @@ BOOL CBmpButton::LoadBmpBitmaps(const char *lpszBase, const char *lpszSelected,
 
 	pDC = GetDC();                                  // fetch a device context we can use
 	if (pDC == nullptr)
-		bSuccess = FALSE;
+		bSuccess = false;
 
 	if (bSuccess) {                                 // get a CBitmap for the UP button
 		pBitmap = FetchBitmap(pDC, &m_pPalette, lpszBase);
@@ -494,7 +494,7 @@ BOOL CBmpButton::LoadBmpBitmaps(const char *lpszBase, const char *lpszSelected,
 			if (lpszSelected != nullptr) {             // get the SELECTED bitmap and plug it in
 				pBitmap = FetchBitmap(pDC, nullptr, lpszSelected);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapSel.DeleteObject();     // release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -506,7 +506,7 @@ BOOL CBmpButton::LoadBmpBitmaps(const char *lpszBase, const char *lpszSelected,
 			        (lpszFocus != nullptr)) {
 				pBitmap = FetchBitmap(pDC, nullptr, lpszFocus);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapFocus.DeleteObject();   // release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -518,7 +518,7 @@ BOOL CBmpButton::LoadBmpBitmaps(const char *lpszBase, const char *lpszSelected,
 			        (lpszDisabled != nullptr)) {
 				pBitmap = FetchBitmap(pDC, nullptr, lpszDisabled);
 				if (pBitmap == nullptr)
-					bSuccess = FALSE;
+					bSuccess = false;
 				else {
 					m_bitmapDisabled.DeleteObject();// release what ever was already there
 					hBitmap = (HBITMAP)(*pBitmap).Detach();
@@ -527,7 +527,7 @@ BOOL CBmpButton::LoadBmpBitmaps(const char *lpszBase, const char *lpszSelected,
 				}
 			}
 		} else
-			bSuccess = FALSE;
+			bSuccess = false;
 	}
 
 	if (pDC != nullptr)
@@ -633,8 +633,8 @@ CMaskedButton::~CMaskedButton() {
  *
  ************************************************************************/
 
-BOOL CMaskedButton::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;                                      // do not automatically erase background to white
+bool CMaskedButton::OnEraseBkgnd(CDC *pDC) {
+	return true;                                      // do not automatically erase background to white
 }
 
 
@@ -666,7 +666,7 @@ void CMaskedButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	(*pDC).Attach((*lpDrawItemStruct).hDC);         // ... as a pointer to a CDC object
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
-		pPalOld = (*pDC).SelectPalette(m_pPalette, TRUE);
+		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
 		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
@@ -694,7 +694,7 @@ void CMaskedButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	PaintMaskedBitmap(pDC, nullptr, pBitmap, (*lpDrawItemStruct).rcItem.left, (*lpDrawItemStruct).rcItem.top);
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 
 	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
@@ -777,8 +777,8 @@ CColorButton::~CColorButton() {
  *
  ************************************************************************/
 
-BOOL CColorButton::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;                                      // do not automatically erase background to white
+bool CColorButton::OnEraseBkgnd(CDC *pDC) {
+	return true;                                      // do not automatically erase background to white
 }
 
 
@@ -843,17 +843,17 @@ void CColorButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cHighl
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     associate this button with a dialog control.
  *
  ************************************************************************/
 
-BOOL CColorButton::SetControl(unsigned int nID, CWnd * pParent) {
+bool CColorButton::SetControl(unsigned int nID, CWnd * pParent) {
 	if (!CColorButton::SubclassDlgItem(nID, pParent))      // attach the Button to the dialog control
-		return FALSE;
+		return false;
 
-	return TRUE;
+	return true;
 }
 
 
@@ -910,7 +910,7 @@ void CColorButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	(*pDC).Attach((*lpDrawItemStruct).hDC);         // ... as a pointer to a CDC object
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
-		pPalOld = (*pDC).SelectPalette(m_pPalette, TRUE);
+		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
 		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
@@ -985,7 +985,7 @@ void CColorButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 
 	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
@@ -1023,7 +1023,7 @@ IMPLEMENT_DYNCREATE(CCheckButton, CButton)
  ************************************************************************/
 
 CCheckButton::CCheckButton() {
-	m_bCheckState = FALSE;
+	m_bCheckState = false;
 	m_pPalette = nullptr;
 	m_cButtonFace = RGB_CHECK_FACE;
 	m_cButtonControl = RGB_CHECK_CONTROL;
@@ -1067,8 +1067,8 @@ CCheckButton::~CCheckButton() {
  *
  ************************************************************************/
 
-BOOL CCheckButton::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;                                      // do not automatically erase background to white
+bool CCheckButton::OnEraseBkgnd(CDC *pDC) {
+	return true;                                      // do not automatically erase background to white
 }
 
 
@@ -1131,17 +1131,17 @@ void CCheckButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cContr
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     associate this button with a dialog control.
  *
  ************************************************************************/
 
-BOOL CCheckButton::SetControl(unsigned int nID, CWnd * pParent) {
+bool CCheckButton::SetControl(unsigned int nID, CWnd * pParent) {
 	if (!CCheckButton::SubclassDlgItem(nID, pParent))      // attach the Button to the dialog control
-		return FALSE;
+		return false;
 
-	return TRUE;
+	return true;
 }
 
 
@@ -1196,7 +1196,7 @@ void CCheckButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	(*pDC).Attach((*lpDrawItemStruct).hDC);         // ... as a pointer to a CDC object
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
-		pPalOld = (*pDC).SelectPalette(m_pPalette, TRUE);
+		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
 		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
@@ -1278,7 +1278,7 @@ void CCheckButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		(*pDC).FrameRect(&focusRect, &faceBrush);
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, FALSE);
+		(void)(*pDC).SelectPalette(pPalOld, false);
 
 	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
@@ -1290,7 +1290,7 @@ void CCheckButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
  * OnSetCheck()
  *
  * Parameters:
- *  WPARAM wParam   TRUE / FALSE for new check state
+ *  WPARAM wParam   true / false for new check state
  *  LPARAM lParam   0
  *
  * Return Value:    0
@@ -1309,7 +1309,7 @@ LRESULT CCheckButton::OnSetCheck(WPARAM wParam, LPARAM lParam) {
 	controlRect.top = ((controlRect.bottom - controlRect.top) - CHECK_BOX_SIZE) >> 1;
 	controlRect.right = CHECK_BOX_DX + CHECK_BOX_SIZE;
 	controlRect.bottom = controlRect.top + CHECK_BOX_SIZE;
-	InvalidateRect(&controlRect, FALSE);
+	InvalidateRect(&controlRect, false);
 	UpdateWindow();
 
 	return 0;
@@ -1324,7 +1324,7 @@ LRESULT CCheckButton::OnSetCheck(WPARAM wParam, LPARAM lParam) {
  *  WPARAM wParam   0
  *  LPARAM lParam   0
  *
- * Return Value:    TRUE / FALSE for current check state
+ * Return Value:    true / false for current check state
  *
  * Description:     get the current state of the check box.
  *
@@ -1368,7 +1368,7 @@ IMPLEMENT_DYNCREATE(CRadioButton, CButton)
  ************************************************************************/
 
 CRadioButton::CRadioButton() {
-	m_bCheckState = FALSE;
+	m_bCheckState = false;
 	m_pPalette = nullptr;
 	m_cButtonFace = RGB_RADIO_FACE;
 	m_cButtonControl = RGB_RADIO_CONTROL;
@@ -1412,8 +1412,8 @@ CRadioButton::~CRadioButton() {
  *
  ************************************************************************/
 
-BOOL CRadioButton::OnEraseBkgnd(CDC *pDC) {
-	return TRUE;                                      // do not automatically erase background to white
+bool CRadioButton::OnEraseBkgnd(CDC *pDC) {
+	return true;                                      // do not automatically erase background to white
 }
 
 
@@ -1476,18 +1476,18 @@ void CRadioButton::SetColors(CPalette *pPalette, COLORREF cFace, COLORREF cContr
  *  CWnd * pParent  pointer to parent window owning the button
  *
  * Return Value:
- *  BOOL            success / failure condition
+ *  bool            success / failure condition
  *
  * Description:     associate this button with a dialog control.
  *
  ************************************************************************/
 
-BOOL CRadioButton::SetControl(unsigned int nID, CWnd * pParent) {
+bool CRadioButton::SetControl(unsigned int nID, CWnd * pParent) {
 	if (!CRadioButton::SubclassDlgItem(nID, pParent))      // attach the Button to the dialog control
-		return FALSE;
-	SetButtonStyle(BS_OWNERDRAW, FALSE);
+		return false;
+	SetButtonStyle(BS_OWNERDRAW, false);
 
-	return TRUE;
+	return true;
 }
 
 
@@ -1542,7 +1542,7 @@ void CRadioButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	(*pDC).Attach((*lpDrawItemStruct).hDC);         // ... as a pointer to a CDC object


Commit: 782c9d0923517ae0557a0f08c6d1b10dc77cb54b
    https://github.com/scummvm/scummvm/commit/782c9d0923517ae0557a0f08c6d1b10dc77cb54b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T02:29:35+03:00

Commit Message:
BAGEL: Remove unused typedefs

Changed paths:
    engines/bagel/mfc/winnt.h


diff --git a/engines/bagel/mfc/winnt.h b/engines/bagel/mfc/winnt.h
index 6a24adc4df4..5d18320be6f 100644
--- a/engines/bagel/mfc/winnt.h
+++ b/engines/bagel/mfc/winnt.h
@@ -27,7 +27,6 @@
 namespace Bagel {
 namespace MFC {
 
-typedef uint16 TCHAR;
 typedef uint16 SHORT;
 
 typedef uint32 COLORREF;


Commit: 3accfdcea2947f3a5473e6368fb0cdfbfefe8039
    https://github.com/scummvm/scummvm/commit/3accfdcea2947f3a5473e6368fb0cdfbfefe8039
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T02:29:38+03:00

Commit Message:
BAGEL: Switch more types to the ScummVM ones

Changed paths:
    engines/bagel/hodjnpodj/fuge/fuge.cpp
    engines/bagel/hodjnpodj/fuge/fuge.h
    engines/bagel/hodjnpodj/hnplibs/stdinc.h
    engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
    engines/bagel/hodjnpodj/wordsearch/wordlist.cpp


diff --git a/engines/bagel/hodjnpodj/fuge/fuge.cpp b/engines/bagel/hodjnpodj/fuge/fuge.cpp
index 6e52612e4b8..2af4e726129 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.cpp
+++ b/engines/bagel/hodjnpodj/fuge/fuge.cpp
@@ -58,7 +58,7 @@ extern CWnd *ghParentWnd;
 #define PADDLE_START_X  285
 #define PADDLE_START_Y  205
 #define PADDLE_CEL_JUMP   1
-#define FACE_ANGLE      (DOUBLE)0.977322
+#define FACE_ANGLE      (double)0.977322
 #define PADDLE0_ANGLE   (PI/4)      // 45 degrees
 #define PADDLE1_ANGLE   (PI/3)      // 60 degrees
 #define PADDLE2_ANGLE   (PI/2)      // 90 degrees
@@ -148,7 +148,7 @@ STATIC const char *pszPaddles[N_PADDLE_SIZES] = {
 	".\\ART\\PADCEL90.BMP"
 };
 
-STATIC const DOUBLE fPaddleAngles[N_PADDLE_SIZES] = {
+STATIC const double fPaddleAngles[N_PADDLE_SIZES] = {
 	PADDLE0_ANGLE,
 	PADDLE1_ANGLE,
 	PADDLE2_ANGLE
@@ -1069,7 +1069,7 @@ CVector CFugeWindow::BallOnPaddle(void) {
 void CFugeWindow::PaintBall(void) {
 	CPoint ptLast;
 	CVector vBall, vGravity;
-	DOUBLE length;
+	double length;
 	CDC *pDC;
 
 	if (m_bGameActive && !m_bPause && !m_bBallOnPaddle) {
@@ -1154,7 +1154,7 @@ void CFugeWindow::PaintBall(void) {
 					// randomly rotate 1 or -1 degrees
 					m_vBallVector.Rotate(Deg2Rad((brand() & 1) ? 0.125 : 0));
 
-					m_fTurboBoost = (DOUBLE)12 - m_nBallSpeed;
+					m_fTurboBoost = (double)12 - m_nBallSpeed;
 
 					if (pGameParams->bSoundEffectsEnabled) {
 
@@ -1172,7 +1172,7 @@ void CFugeWindow::PaintBall(void) {
 					// randomly rotate 1 or -1 degrees
 					m_vBallVector.Rotate(Deg2Rad((brand() & 1) ? 0.125 : 0));
 
-					m_fTurboBoost = (DOUBLE)12 - m_nBallSpeed;
+					m_fTurboBoost = (double)12 - m_nBallSpeed;
 
 
 					if (pGameParams->bSoundEffectsEnabled) {
@@ -1190,7 +1190,7 @@ void CFugeWindow::PaintBall(void) {
 					// randomly rotate 1 or -1 degrees
 					m_vBallVector.Rotate(Deg2Rad((brand() & 1) ? 0.125 : 0));
 
-					m_fTurboBoost = (DOUBLE)12 - m_nBallSpeed;
+					m_fTurboBoost = (double)12 - m_nBallSpeed;
 
 
 					if (pGameParams->bSoundEffectsEnabled) {
@@ -1208,7 +1208,7 @@ void CFugeWindow::PaintBall(void) {
 					// randomly rotate 1 or -1 degrees
 					m_vBallVector.Rotate(Deg2Rad((brand() & 1) ? 0.125 : 0));
 
-					m_fTurboBoost = (DOUBLE)12 - m_nBallSpeed;
+					m_fTurboBoost = (double)12 - m_nBallSpeed;
 
 					if (pGameParams->bSoundEffectsEnabled) {
 						sndPlaySound(m_pWallSound, SND_MEMORY | SND_ASYNC | SND_NODEFAULT);
@@ -1257,8 +1257,8 @@ void CFugeWindow::PaintBall(void) {
 void CFugeWindow::BallvsPaddle(void) {
 	CVector vPoints[N_CRIT_POINTS];
 	CVector vTmp, vPaddle, vFace, vBallCenter, vBallEdge;
-	DOUBLE a1, a2;
-	DOUBLE fLen1, fLen2, fLen3, fLen4, fLen5, fLen6, fMin, length;
+	double a1, a2;
+	double fLen1, fLen2, fLen3, fLen4, fLen5, fLen6, fMin, length;
 	int i, j, k;
 	int nRollBack = 0;
 	bool bHit;
@@ -1518,15 +1518,15 @@ void CFugeWindow::BallvsPaddle(void) {
 #define MAX_BRICK_HITS 6
 
 
-void CFugeWindow::BallvsBrick(DOUBLE length) {
+void CFugeWindow::BallvsBrick(double length) {
 	char buf1[32], buf2[32];
 	CVector vPoints[N_BRICK_POINTS];
 	CVector vBrick, vBallCenter, vOrigin, vTmp;
 	CDC *pDC;
 	CRect rTmpRect, rBall, cRect;
 	CPoint ptTmp;
-	DOUBLE fMin, fLast, fLen[N_BRICK_POINTS];
-	DOUBLE angle;
+	double fMin, fLast, fLen[N_BRICK_POINTS];
+	double angle;
 	int i, j, nIndex, nLastIndex, nBrickIndex, nMaxHits;
 	int nBrick0, nBrick1, nRow0, nRow1, nRow2, nUse[MAX_BRICK_HITS];
 	bool bHit, bStillHit;
@@ -2141,7 +2141,7 @@ void CFugeWindow::PaintPaddle(bool bPaint) {
 					//
 					if (m_pPaddle->TestInterception(pDC, m_pBall)) {
 
-						DOUBLE angle;
+						double angle;
 
 						TRACE("Paddle Hit Ball\n");
 
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.h b/engines/bagel/hodjnpodj/fuge/fuge.h
index 33011fa9d73..1f10993606e 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.h
+++ b/engines/bagel/hodjnpodj/fuge/fuge.h
@@ -75,7 +75,7 @@ protected:
 	void        EraseBrick(CDC *, int);
 	void        LoseBall(void);
 	void        BallvsPaddle(void);
-	void        BallvsBrick(DOUBLE);
+	void        BallvsBrick(double);
 
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	long        OnJoyStick(unsigned int, long);
@@ -122,7 +122,7 @@ protected:
 	int         m_nInitPaddleSize;
 	int         m_nGForceFactor;
 
-	DOUBLE      m_fTurboBoost;
+	double      m_fTurboBoost;
 	long        m_lScore;
 	long        m_lExtraLifeScore;
 	long        m_nJoyOrgX;
diff --git a/engines/bagel/hodjnpodj/hnplibs/stdinc.h b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
index dc16a0073a6..e0b963d63cf 100644
--- a/engines/bagel/hodjnpodj/hnplibs/stdinc.h
+++ b/engines/bagel/hodjnpodj/hnplibs/stdinc.h
@@ -48,18 +48,10 @@ namespace HodjNPodj {
 /*
 * normal types
 */
-#define VIRTUAL virtual
-#define STATIC static
 #define CDECL
-#define INLINE inline
-//define ASM __asm
 #ifndef FAR
 	#define FAR
 #endif
-typedef unsigned char UCHAR;
-typedef short SHORT;
-#define DOUBLE double
-#define CONST const
 
 enum {
 	YES = 1,
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
index 3eaeb4628e2..3d1cf1f08d9 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
@@ -722,7 +722,7 @@ void CGtlData::LoadCharDirection(CBgbObject *pBgbSprite, CPoint ptOld, CPoint pt
 
 	#else
 	CVector vector, vOrigin(0, -1);
-	DOUBLE angle;
+	double angle;
 	char chOldChar, chNewChar;
 
 	// can't access null pointers
diff --git a/engines/bagel/hodjnpodj/wordsearch/wordlist.cpp b/engines/bagel/hodjnpodj/wordsearch/wordlist.cpp
index 294cba30387..18515668b98 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordlist.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/wordlist.cpp
@@ -144,7 +144,7 @@ char    acList[NUMBEROFLISTS][WORDSPERLIST][20] = {
 		{ "BUNT" },         //
 		{ "CATCHER" },      //
 		{ "DIAMOND" },      //
-		{ "DOUBLE" },       //
+		{ "double" },       //
 		{ "DUGOUT" },       //
 		{ "FOUL" },         //
 		{ "GLOVE" },        //


Commit: a1b6d4bfd454f394bbd748f8018c7835097f7b86
    https://github.com/scummvm/scummvm/commit/a1b6d4bfd454f394bbd748f8018c7835097f7b86
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-07T02:29:40+03:00

Commit Message:
BAGEL: Remove redundant C-style void params

Changed paths:
    engines/bagel/hodjnpodj/archeroids/main.cpp
    engines/bagel/hodjnpodj/archeroids/main.h
    engines/bagel/hodjnpodj/archeroids/usercfg.cpp
    engines/bagel/hodjnpodj/archeroids/usercfg.h
    engines/bagel/hodjnpodj/artparts/artparts.cpp
    engines/bagel/hodjnpodj/artparts/optndlg.cpp
    engines/bagel/hodjnpodj/artparts/optndlg.h
    engines/bagel/hodjnpodj/barbershop/main.cpp
    engines/bagel/hodjnpodj/barbershop/main.h
    engines/bagel/hodjnpodj/barbershop/usercfg.cpp
    engines/bagel/hodjnpodj/barbershop/usercfg.h
    engines/bagel/hodjnpodj/battlefish/bfish.cpp
    engines/bagel/hodjnpodj/battlefish/bfish.h
    engines/bagel/hodjnpodj/battlefish/usercfg.cpp
    engines/bagel/hodjnpodj/battlefish/usercfg.h
    engines/bagel/hodjnpodj/beacon/beacon.cpp
    engines/bagel/hodjnpodj/beacon/optndlg.cpp
    engines/bagel/hodjnpodj/beacon/optndlg.h
    engines/bagel/hodjnpodj/crypt/main.cpp
    engines/bagel/hodjnpodj/crypt/main.h
    engines/bagel/hodjnpodj/crypt/optn.cpp
    engines/bagel/hodjnpodj/crypt/optn.h
    engines/bagel/hodjnpodj/dfa/dfa.cpp
    engines/bagel/hodjnpodj/dfa/dfa.h
    engines/bagel/hodjnpodj/dfa/dialogs.h
    engines/bagel/hodjnpodj/dfa/msgdlg.cpp
    engines/bagel/hodjnpodj/dfa/optdlg.cpp
    engines/bagel/hodjnpodj/fuge/fuge.cpp
    engines/bagel/hodjnpodj/fuge/fuge.h
    engines/bagel/hodjnpodj/fuge/usercfg.cpp
    engines/bagel/hodjnpodj/fuge/usercfg.h
    engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
    engines/bagel/hodjnpodj/garfunkle/note.cpp
    engines/bagel/hodjnpodj/garfunkle/note.h
    engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
    engines/bagel/hodjnpodj/garfunkle/optndlg.h
    engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
    engines/bagel/hodjnpodj/hnplibs/audiocfg.h
    engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
    engines/bagel/hodjnpodj/hnplibs/button.cpp
    engines/bagel/hodjnpodj/hnplibs/cmessbox.h
    engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
    engines/bagel/hodjnpodj/hnplibs/dibdoc.h
    engines/bagel/hodjnpodj/hnplibs/rules.cpp
    engines/bagel/hodjnpodj/hnplibs/rules.h
    engines/bagel/hodjnpodj/hnplibs/sprite.cpp
    engines/bagel/hodjnpodj/hnplibs/sprite.h
    engines/bagel/hodjnpodj/hnplibs/text.cpp
    engines/bagel/hodjnpodj/hnplibs/text.h
    engines/bagel/hodjnpodj/life/grid.cpp
    engines/bagel/hodjnpodj/life/grid.h
    engines/bagel/hodjnpodj/life/usercfg.cpp
    engines/bagel/hodjnpodj/life/usercfg.h
    engines/bagel/hodjnpodj/mankala/mnk.cpp
    engines/bagel/hodjnpodj/mankala/mnk.h
    engines/bagel/hodjnpodj/mankala/mnklog.cpp
    engines/bagel/hodjnpodj/mankala/mnkopt.cpp
    engines/bagel/hodjnpodj/mankala/mnkopt.h
    engines/bagel/hodjnpodj/mankala/mnkui.cpp
    engines/bagel/hodjnpodj/mazedoom/mod.cpp
    engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
    engines/bagel/hodjnpodj/mazedoom/optndlg.h
    engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
    engines/bagel/hodjnpodj/metagame/bgen/backpack.h
    engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
    engines/bagel/hodjnpodj/metagame/bgen/bfc.h
    engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bgb.h
    engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
    engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
    engines/bagel/hodjnpodj/metagame/bgen/c1btndlg.h
    engines/bagel/hodjnpodj/metagame/bgen/c2btndlg.h
    engines/bagel/hodjnpodj/metagame/bgen/item.h
    engines/bagel/hodjnpodj/metagame/bgen/note.h
    engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
    engines/bagel/hodjnpodj/metagame/bgen/notebook.h
    engines/bagel/hodjnpodj/metagame/frame/dialogs.h
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
    engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
    engines/bagel/hodjnpodj/metagame/frame/msudlg.cpp
    engines/bagel/hodjnpodj/metagame/grand_tour/dialogs.h
    engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
    engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
    engines/bagel/hodjnpodj/metagame/gtl/citemdlg.h
    engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.h
    engines/bagel/hodjnpodj/metagame/gtl/cturndlg.cpp
    engines/bagel/hodjnpodj/metagame/gtl/cturndlg.h
    engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtl.h
    engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
    engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
    engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
    engines/bagel/hodjnpodj/metagame/gtl/gtllex.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
    engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
    engines/bagel/hodjnpodj/metagame/gtl/init.h
    engines/bagel/hodjnpodj/metagame/gtl/optdlg.cpp
    engines/bagel/hodjnpodj/metagame/gtl/optdlg.h
    engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
    engines/bagel/hodjnpodj/metagame/gtl/pawn.h
    engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
    engines/bagel/hodjnpodj/metagame/gtl/rules.h
    engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
    engines/bagel/hodjnpodj/metagame/gtl/spinner.h
    engines/bagel/hodjnpodj/metagame/gtl/store.cpp
    engines/bagel/hodjnpodj/metagame/gtl/store.h
    engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
    engines/bagel/hodjnpodj/metagame/saves/restdlg.h
    engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
    engines/bagel/hodjnpodj/metagame/saves/savedlg.h
    engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
    engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
    engines/bagel/hodjnpodj/novacancy/main.cpp
    engines/bagel/hodjnpodj/novacancy/main.h
    engines/bagel/hodjnpodj/packrat/dialogs.h
    engines/bagel/hodjnpodj/packrat/msgdlg.cpp
    engines/bagel/hodjnpodj/packrat/optdlg.cpp
    engines/bagel/hodjnpodj/packrat/packrat.cpp
    engines/bagel/hodjnpodj/packrat/packrat.h
    engines/bagel/hodjnpodj/pdq/game.cpp
    engines/bagel/hodjnpodj/pdq/game.h
    engines/bagel/hodjnpodj/pdq/guess.cpp
    engines/bagel/hodjnpodj/pdq/guess.h
    engines/bagel/hodjnpodj/pdq/main.cpp
    engines/bagel/hodjnpodj/pdq/main.h
    engines/bagel/hodjnpodj/pdq/usercfg.cpp
    engines/bagel/hodjnpodj/pdq/usercfg.h
    engines/bagel/hodjnpodj/peggle/game.cpp
    engines/bagel/hodjnpodj/peggle/game.h
    engines/bagel/hodjnpodj/peggle/gameinit.cpp
    engines/bagel/hodjnpodj/peggle/options.cpp
    engines/bagel/hodjnpodj/peggle/options.h
    engines/bagel/hodjnpodj/peggle/optndlg.cpp
    engines/bagel/hodjnpodj/peggle/optsub.cpp
    engines/bagel/hodjnpodj/poker/amtdlg.cpp
    engines/bagel/hodjnpodj/poker/c1btndlg.h
    engines/bagel/hodjnpodj/poker/dialogs.h
    engines/bagel/hodjnpodj/poker/optdlg.cpp
    engines/bagel/hodjnpodj/poker/poffsdlg.cpp
    engines/bagel/hodjnpodj/poker/poker.cpp
    engines/bagel/hodjnpodj/poker/poker.h
    engines/bagel/hodjnpodj/poker/uwondlg.cpp
    engines/bagel/hodjnpodj/riddles/riddles.cpp
    engines/bagel/hodjnpodj/riddles/riddles.h
    engines/bagel/hodjnpodj/riddles/usercfg.cpp
    engines/bagel/hodjnpodj/riddles/usercfg.h
    engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
    engines/bagel/hodjnpodj/wordsearch/clongdlg.h
    engines/bagel/hodjnpodj/wordsearch/dialogs.h
    engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
    engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
    engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
    engines/bagel/hodjnpodj/wordsearch/wordsearch.h
    engines/bagel/mfc/afxmsg.h
    engines/bagel/mfc/afxwin.h
    engines/bagel/spacebar/baglib/log_msg.cpp


diff --git a/engines/bagel/hodjnpodj/archeroids/main.cpp b/engines/bagel/hodjnpodj/archeroids/main.cpp
index c8c2e75ac7d..094711a7f97 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/main.cpp
@@ -443,7 +443,7 @@ CMainWindow::CMainWindow() {
 }
 
 
-void CMainWindow::InitializeJoystick(void) {
+void CMainWindow::InitializeJoystick() {
 	JOYINFO     joyInfo;
 
 	if (joySetCapture(m_hWnd, JOYSTICKID1, 10000, true) == JOYERR_NOERROR) {
@@ -461,7 +461,7 @@ void CMainWindow::InitializeJoystick(void) {
 }
 
 
-ERROR_CODE CMainWindow::LoadMasterSprites(void) {
+ERROR_CODE CMainWindow::LoadMasterSprites() {
 	CDC *pDC;
 	ERROR_CODE errCode;
 
@@ -746,7 +746,7 @@ ERROR_CODE CMainWindow::LoadMasterSprites(void) {
 	return errCode;
 }
 
-void CMainWindow::ReleaseMasterSprites(void) {
+void CMainWindow::ReleaseMasterSprites() {
 	//
 	// free all master sprite objects
 	//
@@ -803,7 +803,7 @@ void CMainWindow::ReleaseMasterSprites(void) {
 }
 
 
-ERROR_CODE CMainWindow::LoadMasterSounds(void) {
+ERROR_CODE CMainWindow::LoadMasterSounds() {
 	HANDLE hResInfo;
 	HINSTANCE hInst;
 	ERROR_CODE errCode;
@@ -909,7 +909,7 @@ ERROR_CODE CMainWindow::LoadMasterSounds(void) {
 }
 
 
-void CMainWindow::ReleaseMasterSounds(void) {
+void CMainWindow::ReleaseMasterSounds() {
 	if (m_hExtraLifeRes != nullptr) {
 		FreeResource(m_hExtraLifeRes);
 		m_hExtraLifeRes = nullptr;
@@ -1444,7 +1444,7 @@ ERROR_CODE CMainWindow::CreateBadArrow(CSprite *pBadGuy) {
 }
 
 
-POINT CMainWindow::GetLeftMostBadGuy(void) {
+POINT CMainWindow::GetLeftMostBadGuy() {
 	POINT ptTmp, ptBest;
 	CLList *pList;
 
@@ -1684,7 +1684,7 @@ ERROR_CODE CMainWindow::CreateBadGuys() {
 *  RETURNS:  nothing
 *
 *****************************************************************************/
-void CMainWindow::PlayGame(void) {
+void CMainWindow::PlayGame() {
 	ERROR_CODE errCode;
 
 	errCode = ERR_NONE;                                 // assume no error
@@ -1724,7 +1724,7 @@ void CMainWindow::PlayGame(void) {
 	HandleError(errCode);
 }
 
-void CMainWindow::PlayNextWave(void) {
+void CMainWindow::PlayNextWave() {
 	ERROR_CODE errCode;
 
 	// assume no error
@@ -1745,7 +1745,7 @@ void CMainWindow::PlayNextWave(void) {
 	HandleError(errCode);
 }
 
-void CMainWindow::WaveReset(void) {
+void CMainWindow::WaveReset() {
 	CDC *pDC;
 	int i;
 
@@ -1876,7 +1876,7 @@ void CMainWindow::GameReset() {
 	m_nWave = 0;                                    // reset to Wave 1
 }
 
-void CMainWindow::KillAnimation(void) {
+void CMainWindow::KillAnimation() {
 	CLList *pList;
 
 	// delete the Special FX list
@@ -2248,7 +2248,7 @@ bool CMainWindow::MoveArrows(CDC *pDC) {
 	return false;
 }
 
-bool CMainWindow::CheckMessages(void) {
+bool CMainWindow::CheckMessages() {
 	JOYINFO joyInfo;
 	MSG msg;
 	bool bEndTask = false;
@@ -3195,7 +3195,7 @@ long CMainWindow::OnJoyStick(unsigned int wParam, long lParam) {
 	return 0;
 }
 
-void CMainWindow::GamePause(void) {
+void CMainWindow::GamePause() {
 	m_bPause = true;
 	if (m_bMoveMode) {
 		m_bMoveMode = false;
@@ -3204,7 +3204,7 @@ void CMainWindow::GamePause(void) {
 };
 
 
-void CMainWindow::GameResume(void) {
+void CMainWindow::GameResume() {
 	m_bPause = false;
 
 	if (m_bMoveMode)
@@ -3293,7 +3293,7 @@ void CMainWindow::OnSoundNotify(CSound *) {
 	//
 }
 
-void CMainWindow::FlushInputEvents(void) {
+void CMainWindow::FlushInputEvents() {
 	MSG msg;
 
 	// find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/archeroids/main.h b/engines/bagel/hodjnpodj/archeroids/main.h
index b35025c951f..4bec2e234ed 100644
--- a/engines/bagel/hodjnpodj/archeroids/main.h
+++ b/engines/bagel/hodjnpodj/archeroids/main.h
@@ -38,38 +38,38 @@ namespace Archeroids {
 class CMainWindow : public CFrameWnd {
 public:
 	CMainWindow();
-	void        PlayGame(void);
-	void        PlayNextWave(void);
-	void        PaintScreen(void);
+	void        PlayGame();
+	void        PlayNextWave();
+	void        PaintScreen();
 	ERROR_CODE  RepaintSpriteList(CDC *);
-	void        LoadIniSettings(void);
-	bool        MainLoop(void);
+	void        LoadIniSettings();
+	bool        MainLoop();
 
 protected:
-	void        FlushInputEvents(void);
-	bool        CheckMessages(void);
-	ERROR_CODE  LoadMasterSprites(void);
-	void        ReleaseMasterSprites(void);
-	ERROR_CODE  LoadMasterSounds(void);
-	void        ReleaseMasterSounds(void);
-	void        InitializeJoystick(void);
-	void        GameReset(void);
-	void        WaveReset(void);
+	void        FlushInputEvents();
+	bool        CheckMessages();
+	ERROR_CODE  LoadMasterSprites();
+	void        ReleaseMasterSprites();
+	ERROR_CODE  LoadMasterSounds();
+	void        ReleaseMasterSounds();
+	void        InitializeJoystick();
+	void        GameReset();
+	void        WaveReset();
 	CSprite    *NewLife(int);
-	ERROR_CODE  CreateLives(void);
-	ERROR_CODE  CreateGoodGuy(void);
-	ERROR_CODE  CreateBadGuys(void);
-	ERROR_CODE  CreateHay(void);
+	ERROR_CODE  CreateLives();
+	ERROR_CODE  CreateGoodGuy();
+	ERROR_CODE  CreateBadGuys();
+	ERROR_CODE  CreateHay();
 	ERROR_CODE  CreateBurningHay(CPoint);
-	ERROR_CODE  CreateGoodArrow(void);
+	ERROR_CODE  CreateGoodArrow();
 	ERROR_CODE  CreateBadArrow(CSprite *);
-	void        GamePause(void);
-	void        GameResume(void);
+	void        GamePause();
+	void        GameResume();
 
 	void        DestroyGoodArrow(CLList *);
 	void        DestroyBadArrow(CLList *);
 	void        DestroyBadGuy(CLList *, CDC *);
-	void        PruneDeadBadGuys(void);
+	void        PruneDeadBadGuys();
 	void        DestroyHay(CLList *, CRect, CDC *, bool);
 	void        DeleteSprite(CSprite *);
 	bool        MoveArrows(CDC *);
@@ -77,17 +77,17 @@ protected:
 	void        MoveHodj(int);
 	void        LoseLife(CDC *, bool);
 	void        HandleError(ERROR_CODE);
-	void        KillAnimation(void);
+	void        KillAnimation();
 	void        OnSoundNotify(CSound *pSound);
-	POINT       GetLeftMostBadGuy(void);
+	POINT       GetLeftMostBadGuy();
 
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	void OnPaint(void);
+	void OnPaint();
 	void OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	void OnKeyDown(unsigned int, unsigned int, unsigned int);
 	void OnSysChar(unsigned int, unsigned int, unsigned int);
 	void OnTimer(uintptr);
-	void OnClose(void);
+	void OnClose();
 	long OnJoyStick(unsigned int, long);
 	void OnActivate(unsigned int, CWnd *, bool) override;
 	void OnLButtonDown(unsigned int, CPoint);
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
index de26b5319b6..1d63adec193 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.cpp
@@ -280,7 +280,7 @@ void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 }
 
 
-bool CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog() {
 	CRect tmpRect;
 	CDC *pDC;
 	int nVal;
@@ -359,7 +359,7 @@ bool CUserCfgDlg::OnInitDialog(void) {
 	return true;
 }
 
-void CUserCfgDlg::OnPaint(void) {
+void CUserCfgDlg::OnPaint() {
 	CDC *pDC;
 
 	CBmpDialog::OnPaint();
@@ -408,7 +408,7 @@ void CUserCfgDlg::OnDestroy() {
 	CBmpDialog::OnDestroy();
 }
 
-void CUserCfgDlg::ClearDialogImage(void) {
+void CUserCfgDlg::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
diff --git a/engines/bagel/hodjnpodj/archeroids/usercfg.h b/engines/bagel/hodjnpodj/archeroids/usercfg.h
index f802896a822..1037345f146 100644
--- a/engines/bagel/hodjnpodj/archeroids/usercfg.h
+++ b/engines/bagel/hodjnpodj/archeroids/usercfg.h
@@ -56,9 +56,9 @@ public:
 protected:
 
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual bool OnInitDialog(void) override;
-	void PutDlgData(void);
-	void ClearDialogImage(void);
+	virtual bool OnInitDialog() override;
+	void PutDlgData();
+	void ClearDialogImage();
 
 	void OnDestroy();
 	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
diff --git a/engines/bagel/hodjnpodj/artparts/artparts.cpp b/engines/bagel/hodjnpodj/artparts/artparts.cpp
index 75b3ee23683..80fe459c013 100644
--- a/engines/bagel/hodjnpodj/artparts/artparts.cpp
+++ b/engines/bagel/hodjnpodj/artparts/artparts.cpp
@@ -440,7 +440,7 @@ bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			m_bIgnoreScrollClick = true;
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
-			(void) RulesDlg.DoModal();
+			RulesDlg.DoModal();
 			m_bIgnoreScrollClick = false;
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
 			break;
diff --git a/engines/bagel/hodjnpodj/artparts/optndlg.cpp b/engines/bagel/hodjnpodj/artparts/optndlg.cpp
index c51539fa76b..0fb664c1de5 100644
--- a/engines/bagel/hodjnpodj/artparts/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/artparts/optndlg.cpp
@@ -188,7 +188,7 @@ bool COptnDlg::OnEraseBkgnd(CDC *pDC) {
 	return true;
 }
 
-void COptnDlg::OnDestroy(void) {
+void COptnDlg::OnDestroy() {
 	CBmpDialog::OnDestroy();
 }
 
@@ -354,7 +354,7 @@ void COptnDlg::OnPaint() {
 
 }
 
-void COptnDlg::ClearDialogImage(void) {
+void COptnDlg::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
diff --git a/engines/bagel/hodjnpodj/artparts/optndlg.h b/engines/bagel/hodjnpodj/artparts/optndlg.h
index 5a6e570eb1c..41366e904cb 100644
--- a/engines/bagel/hodjnpodj/artparts/optndlg.h
+++ b/engines/bagel/hodjnpodj/artparts/optndlg.h
@@ -41,7 +41,7 @@ public:
 	COptnDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr);  // standard constructor
 	~COptnDlg();        // destructor
 	void UpdateScrollbars();
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	int m_nTime;
 	int m_nRows;
diff --git a/engines/bagel/hodjnpodj/barbershop/main.cpp b/engines/bagel/hodjnpodj/barbershop/main.cpp
index a21404a46f1..4e0e7e01a88 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/main.cpp
@@ -78,7 +78,7 @@ int         g_nCardBack;
 extern HWND ghParentWnd;
 
 
-CMainWindow::CMainWindow(void) {
+CMainWindow::CMainWindow() {
 	CString  WndClass;
 	CRect    tmpRect;
 	CDC     *pDC = nullptr;
@@ -432,11 +432,11 @@ bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CMainWindow::GamePause(void) {
+void CMainWindow::GamePause() {
 	m_bPause = true;
 }
 
-void CMainWindow::GameResume(void) {
+void CMainWindow::GameResume() {
 	m_bPause = false;
 }
 
@@ -480,14 +480,14 @@ void CMainWindow::PlayGame() {
 	HandleError(errCode);
 }
 
-void CMainWindow::LoadIniSettings(void) {
+void CMainWindow::LoadIniSettings() {
 }
 
-void CMainWindow::SaveIniSettings(void) {
+void CMainWindow::SaveIniSettings() {
 }
 
 
-void CMainWindow::GameReset(void) {
+void CMainWindow::GameReset() {
 	//sndPlaySound(nullptr, SND_SYNC);               // stop all sounds
 }
 
@@ -827,7 +827,7 @@ void CMainWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned i
 	}
 }
 
-void CMainWindow::FlushInputEvents(void) {
+void CMainWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/barbershop/main.h b/engines/bagel/hodjnpodj/barbershop/main.h
index 08edbf5dcc2..ec2b40aacbb 100644
--- a/engines/bagel/hodjnpodj/barbershop/main.h
+++ b/engines/bagel/hodjnpodj/barbershop/main.h
@@ -44,24 +44,24 @@ private:
 	bool         m_bMIDIPlaying;
 
 public:
-	CMainWindow(void);
-	void        PlayGame(void);
-	void        PaintScreen(void);
-	void        LoadIniSettings(void);
-	void        SaveIniSettings(void);
+	CMainWindow();
+	void        PlayGame();
+	void        PaintScreen();
+	void        LoadIniSettings();
+	void        SaveIniSettings();
 	void        FlushInputEvents();
 	LRESULT     OnMCINotify(WPARAM, LPARAM);
 	LRESULT     OnMMIONotify(WPARAM, LPARAM);
 
 protected:
-	void        GameReset(void);
-	void        GamePause(void);
-	void        GameResume(void);
+	void        GameReset();
+	void        GamePause();
+	void        GameResume();
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	void        HandleError(ERROR_CODE);
 	void        DeleteSprite(CSprite *);
 
-	void        OnPaint(void);
+	void        OnPaint();
 	void        OnTimer(uintptr);
 	void        OnMouseMove(unsigned int, CPoint);
 	void        OnLButtonDown(unsigned int, CPoint);
@@ -71,7 +71,7 @@ protected:
 	void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	void        OnKeyDown(unsigned int, unsigned int, unsigned int);
 	void        OnActivate(unsigned int, CWnd *, bool) override;
-	void        OnClose(void);
+	void        OnClose();
 	void        OnLButtonUp(unsigned int, CPoint);
 
 	DECLARE_MESSAGE_MAP()
diff --git a/engines/bagel/hodjnpodj/barbershop/usercfg.cpp b/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
index 3889c57a14a..15eaaa318f5 100644
--- a/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/barbershop/usercfg.cpp
@@ -57,7 +57,7 @@ void CUserCfgDlg::DoDataExchange(CDataExchange *pDX) {
 	CDialog::DoDataExchange(pDX);
 }
 
-bool CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog() {
 	CDC     *pDC = GetDC();
 	CRect   tmpRect;
 
@@ -81,7 +81,7 @@ bool CUserCfgDlg::OnInitDialog(void) {
 	return true;
 }
 
-void CUserCfgDlg::OnPaint(void) {
+void CUserCfgDlg::OnPaint() {
 	CDC     *pDC = nullptr;
 	char    msg[64];
 	bool    bAssertCheck;
diff --git a/engines/bagel/hodjnpodj/barbershop/usercfg.h b/engines/bagel/hodjnpodj/barbershop/usercfg.h
index 4ec16220766..a36dec21bc2 100644
--- a/engines/bagel/hodjnpodj/barbershop/usercfg.h
+++ b/engines/bagel/hodjnpodj/barbershop/usercfg.h
@@ -67,7 +67,7 @@ public:
 protected:
 
 	virtual void DoDataExchange(CDataExchange *) override;
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 
 	void OnClose();
 	void OnPaint();
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.cpp b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
index dc4086e2666..8a2cf44d5ff 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.cpp
@@ -284,7 +284,7 @@ POINT gRightGrid[GRID_ROWS][GRID_COLS] = {
 *       None
 *
 ****************************************************************/
-CBFishWindow::CBFishWindow(void) {
+CBFishWindow::CBFishWindow() {
 	CString  WndClass;
 	CRect    tmpRect;
 	CDC     *pDC;
@@ -471,7 +471,7 @@ void CBFishWindow::HandleError(ERROR_CODE errCode) {
 	}
 }
 
-ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
+ERROR_CODE CBFishWindow::LoadMasterSprites() {
 	CDC *pDC;
 	int i;
 	ERROR_CODE errCode;
@@ -649,7 +649,7 @@ ERROR_CODE CBFishWindow::LoadMasterSprites(void) {
 }
 
 
-void CBFishWindow::ReleaseMasterSprites(void) {
+void CBFishWindow::ReleaseMasterSprites() {
 	int i;
 
 	// free the hooked fish, and the users fish
@@ -1028,7 +1028,7 @@ bool CBFishWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return false;
 }
 
-void CBFishWindow::PlaceTurnHarpoons(void) {
+void CBFishWindow::PlaceTurnHarpoons() {
 	CSprite *pSprite;
 	CDC *pDC;
 	int i;
@@ -1062,7 +1062,7 @@ void CBFishWindow::PlaceTurnHarpoons(void) {
 	HandleError(errCode);
 }
 
-void CBFishWindow::RemoveTurnHarpoon(void) {
+void CBFishWindow::RemoveTurnHarpoon() {
 	assert(m_nTurns >= 0 && m_nTurns < MAX_TURNS);
 	assert(m_pHarpoons[m_nTurns] != nullptr);
 
@@ -1088,7 +1088,7 @@ void CBFishWindow::RemoveTurnHarpoon(void) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::GamePause(void) {
+void CBFishWindow::GamePause() {
 	m_bPause = true;
 };
 
@@ -1110,7 +1110,7 @@ void CBFishWindow::GamePause(void) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::GameResume(void) {
+void CBFishWindow::GameResume() {
 	m_bPause = false;
 };
 
@@ -1132,7 +1132,7 @@ void CBFishWindow::GameResume(void) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::PlayGame(void) {
+void CBFishWindow::PlayGame() {
 	CRect rTmpRect;
 	CDC *pDC;
 	int i;
@@ -1193,7 +1193,7 @@ void CBFishWindow::PlayGame(void) {
 }
 
 
-void CBFishWindow::PlaceUserFish(void) {
+void CBFishWindow::PlaceUserFish() {
 	//
 	// Initiate User-Edit-Mode (Allow user to drag and drop fish to grid)
 	//
@@ -1201,7 +1201,7 @@ void CBFishWindow::PlaceUserFish(void) {
 }
 
 
-void CBFishWindow::PlaceEnemyFish(void) {
+void CBFishWindow::PlaceEnemyFish() {
 	int i, j, k;
 	int row, col, rowTmp, colTmp;
 	bool bFound;
@@ -1308,7 +1308,7 @@ void CBFishWindow::PlaceEnemyFish(void) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::LoadIniSettings(void) {
+void CBFishWindow::LoadIniSettings() {
 	int nVal;
 
 	if (pGameParams->bPlayingMetagame) {
@@ -1369,7 +1369,7 @@ void CBFishWindow::LoadIniSettings(void) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::SaveIniSettings(void) {
+void CBFishWindow::SaveIniSettings() {
 }
 
 
@@ -1390,7 +1390,7 @@ void CBFishWindow::SaveIniSettings(void) {
 *       None
 *
 ****************************************************************/
-void CBFishWindow::GameReset(void) {
+void CBFishWindow::GameReset() {
 	CDC *pDC;
 	int i;
 
@@ -2370,7 +2370,7 @@ void CBFishWindow::SinkEnemyFish(int nFishIndex) {
 }
 
 
-void CBFishWindow::ComputersTurn(void) {
+void CBFishWindow::ComputersTurn() {
 	STATIC int nLastRow, nLastCol;
 	//CSound *pSound;
 	int nRow, nCol, nFishIndex, nGridIndex;
@@ -2509,7 +2509,7 @@ void CBFishWindow::SinkUserFish(int nFishIndex) {
 }
 
 
-int CBFishWindow::SelectRandomTarget(void) {
+int CBFishWindow::SelectRandomTarget() {
 	int  n;
 	int nRow, nCol;
 
@@ -2536,7 +2536,7 @@ int CBFishWindow::SelectRandomTarget(void) {
 }
 
 
-int CBFishWindow::SelectBurningTarget(void) {
+int CBFishWindow::SelectBurningTarget() {
 	int i, nGridIndex, nRow, nCol;
 	bool bFound;
 
@@ -2565,7 +2565,7 @@ int CBFishWindow::SelectBurningTarget(void) {
 	return nGridIndex;
 }
 
-int CBFishWindow::SelectBestFitTarget(void) {
+int CBFishWindow::SelectBestFitTarget() {
 	int nRow, nCol, nFishIndex, nGridIndex;
 	int counter, i;
 
@@ -3567,7 +3567,7 @@ void CBFishWindow::OnActivate(unsigned int nState, CWnd *, bool bMinimized) {
 	}
 }
 
-void CBFishWindow::FlushInputEvents(void) {
+void CBFishWindow::FlushInputEvents() {
 	MSG msg;
 
 	// find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/battlefish/bfish.h b/engines/bagel/hodjnpodj/battlefish/bfish.h
index f31a85f4531..f9f1f99ece1 100644
--- a/engines/bagel/hodjnpodj/battlefish/bfish.h
+++ b/engines/bagel/hodjnpodj/battlefish/bfish.h
@@ -47,24 +47,24 @@ typedef struct {
 
 class CBFishWindow : public CFrameWnd {
 public:
-	CBFishWindow(void);
-	void        PlayGame(void);
-	void        PaintScreen(void);
-	void        LoadIniSettings(void);
-	void        SaveIniSettings(void);
+	CBFishWindow();
+	void        PlayGame();
+	void        PaintScreen();
+	void        LoadIniSettings();
+	void        SaveIniSettings();
 
 protected:
-	void        FlushInputEvents(void);
-	void        GameReset(void);
-	void        GamePause(void);
-	void        GameResume(void);
+	void        FlushInputEvents();
+	void        GameReset();
+	void        GamePause();
+	void        GameResume();
 	void        HandleError(ERROR_CODE);
 	void        DeleteSprite(CSprite *);
 	ERROR_CODE  RepaintSpriteList(CDC *);
-	ERROR_CODE  LoadMasterSprites(void);
-	void        ReleaseMasterSprites(void);
-	void        PlaceUserFish(void);
-	void        PlaceEnemyFish(void);
+	ERROR_CODE  LoadMasterSprites();
+	void        ReleaseMasterSprites();
+	void        PlaceUserFish();
+	void        PlaceEnemyFish();
 	void        RotateFish(int);
 	void        AssignFishToGrid(int);
 	int         GetEnemyGridIndex(CPoint);
@@ -76,10 +76,10 @@ protected:
 	int         IdToIndex(int);
 	CPoint      SnapToGrid(CPoint);
 	void        UsersTurn(int);
-	void        ComputersTurn(void);
-	int         SelectRandomTarget(void);
-	int         SelectBurningTarget(void);
-	int         SelectBestFitTarget(void);
+	void        ComputersTurn();
+	int         SelectRandomTarget();
+	int         SelectBurningTarget();
+	int         SelectBestFitTarget();
 	int         FindNeighborTarget(int, int);
 	int         FindTarget(int, int);
 	int         FindMatch(int, int);
@@ -89,14 +89,14 @@ protected:
 	void        CreateHarpoon(CPoint);
 	void        SinkUserFish(int);
 	void        SinkEnemyFish(int);
-	void        PlaceTurnHarpoons(void);
-	void        RemoveTurnHarpoon(void);
+	void        PlaceTurnHarpoons();
+	void        RemoveTurnHarpoon();
 
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	LRESULT     OnMCINotify(WPARAM, LPARAM);
 	LRESULT     OnMMIONotify(WPARAM, LPARAM);
 	void        OnSoundNotify(CSound *);
-	void        OnPaint(void);
+	void        OnPaint();
 	void        OnMouseMove(unsigned int, CPoint);
 	void        OnRButtonDown(unsigned int, CPoint);
 	void        OnLButtonDown(unsigned int, CPoint);
@@ -105,7 +105,7 @@ protected:
 	void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	void        OnKeyDown(unsigned int, unsigned int, unsigned int);
 	void        OnActivate(unsigned int, CWnd *, bool) override;
-	void        OnClose(void);
+	void        OnClose();
 
 	DECLARE_MESSAGE_MAP()
 
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
index 6432e037e44..7c29ccd5141 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.cpp
@@ -57,7 +57,7 @@ CUserCfgDlg::CUserCfgDlg(CWnd *pParent, CPalette *pPalette, unsigned int nID)
 	DoModal();
 }
 
-bool CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog() {
 	CRect tmpRect;
 	CDC *pDC;
 
@@ -264,7 +264,7 @@ void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 *       None
 *
 ****************************************************************/
-void CUserCfgDlg::LoadIniSettings(void) {
+void CUserCfgDlg::LoadIniSettings() {
 	int nVal;
 
 	// Get the Difficulty level  (0..2)
@@ -292,7 +292,7 @@ void CUserCfgDlg::SaveIniSettings() {
 	                          INI_FILENAME);
 }
 
-void CUserCfgDlg::OnPaint(void) {
+void CUserCfgDlg::OnPaint() {
 	CDC *pDC;
 
 	CBmpDialog::OnPaint();
@@ -352,7 +352,7 @@ void CUserCfgDlg::OnDestroy() {
 }
 
 
-void CUserCfgDlg::ClearDialogImage(void) {
+void CUserCfgDlg::ClearDialogImage() {
 	if (m_bSave) {
 		GetDlgData();
 		SaveIniSettings();
@@ -386,7 +386,7 @@ void CUserCfgDlg::ClearDialogImage(void) {
 	ValidateRect(nullptr);
 }
 
-void CUserCfgDlg::DispLimit(void) {
+void CUserCfgDlg::DispLimit() {
 	CDC *pDC;
 
 	if ((pDC = GetDC()) != nullptr) {
diff --git a/engines/bagel/hodjnpodj/battlefish/usercfg.h b/engines/bagel/hodjnpodj/battlefish/usercfg.h
index e5e06f6108d..e64cd9cb74d 100644
--- a/engines/bagel/hodjnpodj/battlefish/usercfg.h
+++ b/engines/bagel/hodjnpodj/battlefish/usercfg.h
@@ -46,17 +46,17 @@ public:
 protected:
 
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual bool OnInitDialog(void) override;
-	void PutDlgData(void);
-	void GetDlgData(void);
-	void DispLimit(void);
-	void LoadIniSettings(void);
-	void SaveIniSettings(void);
+	virtual bool OnInitDialog() override;
+	void PutDlgData();
+	void GetDlgData();
+	void DispLimit();
+	void LoadIniSettings();
+	void SaveIniSettings();
 
 	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
 	void OnDestroy();
 	void OnPaint();
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 	DECLARE_MESSAGE_MAP()
 
 	CColorButton *m_pOKButton;              // OKAY button on scroll
diff --git a/engines/bagel/hodjnpodj/beacon/beacon.cpp b/engines/bagel/hodjnpodj/beacon/beacon.cpp
index 9490734b8a3..a7d7a7db09e 100644
--- a/engines/bagel/hodjnpodj/beacon/beacon.cpp
+++ b/engines/bagel/hodjnpodj/beacon/beacon.cpp
@@ -464,7 +464,7 @@ bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			m_bIgnoreScrollClick = true;
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
-			(void) RulesDlg.DoModal();
+			RulesDlg.DoModal();
 			m_bIgnoreScrollClick = false;
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
 
diff --git a/engines/bagel/hodjnpodj/beacon/optndlg.cpp b/engines/bagel/hodjnpodj/beacon/optndlg.cpp
index efb8d80c8d1..6eb0639783c 100644
--- a/engines/bagel/hodjnpodj/beacon/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/beacon/optndlg.cpp
@@ -174,7 +174,7 @@ bool COptnDlg::OnEraseBkgnd(CDC *pDC) {
 }
 
 
-void COptnDlg::OnDestroy(void) {
+void COptnDlg::OnDestroy() {
 	CBmpDialog::OnDestroy();
 }
 
@@ -358,7 +358,7 @@ void COptnDlg::OnPaint() {
 
 }
 
-void COptnDlg::ClearDialogImage(void) {
+void COptnDlg::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
diff --git a/engines/bagel/hodjnpodj/beacon/optndlg.h b/engines/bagel/hodjnpodj/beacon/optndlg.h
index aee0ca96b37..a285b992960 100644
--- a/engines/bagel/hodjnpodj/beacon/optndlg.h
+++ b/engines/bagel/hodjnpodj/beacon/optndlg.h
@@ -43,7 +43,7 @@ public:
 	COptnDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr);  // standard constructor
 	~COptnDlg();        // destructor
 	void UpdateScrollbars();
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 // Dialog Data
 	//{{AFX_DATA(COptnDlg)
diff --git a/engines/bagel/hodjnpodj/crypt/main.cpp b/engines/bagel/hodjnpodj/crypt/main.cpp
index f6828b04dfe..4a159e52874 100644
--- a/engines/bagel/hodjnpodj/crypt/main.cpp
+++ b/engines/bagel/hodjnpodj/crypt/main.cpp
@@ -507,7 +507,7 @@ bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
 			CSound::waitWaveSounds();
-			(void) RulesDlg.DoModal();
+			RulesDlg.DoModal();
 			m_bPause = false;
 
 			break;
@@ -1178,7 +1178,7 @@ void CMainWindow::OnDestroy() {
  *      n/a
  *
  ****************************************************************/
-void CMainWindow::FlushInputEvents(void) {
+void CMainWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/crypt/main.h b/engines/bagel/hodjnpodj/crypt/main.h
index 8aaf6911d11..216b3328c3c 100644
--- a/engines/bagel/hodjnpodj/crypt/main.h
+++ b/engines/bagel/hodjnpodj/crypt/main.h
@@ -149,7 +149,7 @@ public:
 	~CMainWindow();
 
 	void        SplashScreen();
-	static void FlushInputEvents(void);
+	static void FlushInputEvents();
 	void        DisplayStats(CDC*);
 	void        RefreshStats();
 	void        GameWin();
diff --git a/engines/bagel/hodjnpodj/crypt/optn.cpp b/engines/bagel/hodjnpodj/crypt/optn.cpp
index 71b12dac32b..670c1403a8c 100644
--- a/engines/bagel/hodjnpodj/crypt/optn.cpp
+++ b/engines/bagel/hodjnpodj/crypt/optn.cpp
@@ -204,7 +204,7 @@ bool COptn::OnInitDialog() {
 	return true;  // return true  unless you set the focus to a control
 }
 
-void COptn::OnDestroy(void) {
+void COptn::OnDestroy() {
 	CBmpDialog::OnDestroy();
 }
 
@@ -343,7 +343,7 @@ void COptn::OnCancel() {
 	EndDialog(0);
 }
 
-void COptn::ClearDialogImage(void) {
+void COptn::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
diff --git a/engines/bagel/hodjnpodj/crypt/optn.h b/engines/bagel/hodjnpodj/crypt/optn.h
index e68d154b322..3c73ede8fbb 100644
--- a/engines/bagel/hodjnpodj/crypt/optn.h
+++ b/engines/bagel/hodjnpodj/crypt/optn.h
@@ -62,7 +62,7 @@ private:
 public:
 	COptn(CWnd* pParent = nullptr, CPalette *pGamePalette = nullptr, int nLttrsSolvd = false, int nTime = false); // standard constructor
 	~COptn();
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	int         m_nLttrsSlvd, m_nTime;
 // Dialog Data
diff --git a/engines/bagel/hodjnpodj/dfa/dfa.cpp b/engines/bagel/hodjnpodj/dfa/dfa.cpp
index b2961cc2659..92e8e03986f 100644
--- a/engines/bagel/hodjnpodj/dfa/dfa.cpp
+++ b/engines/bagel/hodjnpodj/dfa/dfa.cpp
@@ -837,7 +837,7 @@ void CMainDFAWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigne
 		KillTimer(GAMETIMER);                                        // stop the beavers for now
 		CSound::waitWaveSounds();
 		pOptionButton->ShowWindow(SW_HIDE);                          // hide furled scroll
-		(void) dlgRules.DoModal();                                  // invoke the help dialog box
+		dlgRules.DoModal();                                  // invoke the help dialog box
 		pOptionButton->ShowWindow(SW_SHOWNORMAL);                    // show furled scroll
 		SetFocus();
 		if (m_nTimeForGame > 0) {
@@ -1105,7 +1105,7 @@ void CMainDFAWindow::OnDestroy() {
  *
  ****************************************************************/
 
-void CMainDFAWindow::ReleaseResources(void) {
+void CMainDFAWindow::ReleaseResources() {
 	int x;
 
 	if (pGameSound != nullptr) {
@@ -1166,7 +1166,7 @@ void CMainDFAWindow::ReleaseResources(void) {
  *
  ****************************************************************/
 
-void CMainDFAWindow::FlushInputEvents(void) {
+void CMainDFAWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
@@ -1208,7 +1208,7 @@ void CMainDFAWindow::OnSoundNotify(CSound *pSound) {
 	//
 }
 
-bool CMainDFAWindow::LoadBeaverSounds(void) {
+bool CMainDFAWindow::LoadBeaverSounds() {
 	HANDLE      hResInfo;
 	HINSTANCE   hInst;
 	bool        bSuccess;
diff --git a/engines/bagel/hodjnpodj/dfa/dfa.h b/engines/bagel/hodjnpodj/dfa/dfa.h
index 54bf5b3c39c..5baf4437ec3 100644
--- a/engines/bagel/hodjnpodj/dfa/dfa.h
+++ b/engines/bagel/hodjnpodj/dfa/dfa.h
@@ -150,8 +150,8 @@ public:
 
 	void SplashScreen();
 
-	static  void ReleaseResources(void);
-	static  void FlushInputEvents(void);
+	static  void ReleaseResources();
+	static  void FlushInputEvents();
 	void MainLoop();
 	void ResetGame();
 	void ClearGrid();
@@ -164,7 +164,7 @@ private:
 protected:
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	bool LoadBeaverSounds();
-	void ReleaseBeaverSounds(void);
+	void ReleaseBeaverSounds();
 	//
 	// Sound as resource dudes:
 	//
diff --git a/engines/bagel/hodjnpodj/dfa/dialogs.h b/engines/bagel/hodjnpodj/dfa/dialogs.h
index 040319ad9cf..560d75bb080 100644
--- a/engines/bagel/hodjnpodj/dfa/dialogs.h
+++ b/engines/bagel/hodjnpodj/dfa/dialogs.h
@@ -47,8 +47,8 @@ public:
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnCancel(void) override;
-	virtual void OnOK(void) override;
+	virtual void OnCancel() override;
+	virtual void OnOK() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg bool OnEraseBkgnd(CDC *pDC);
 	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
@@ -74,8 +74,8 @@ public:
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnCancel(void) override;
-	virtual void OnOK(void) override;
+	virtual void OnCancel() override;
+	virtual void OnOK() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/dfa/msgdlg.cpp b/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
index 8bad235b8e6..5d0cd150920 100644
--- a/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/msgdlg.cpp
@@ -109,19 +109,19 @@ bool CMsgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CDialog::OnCommand(wParam, lParam);
 }
 
-void CMsgDlg::OnCancel(void) {
+void CMsgDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CMsgDlg::OnOK(void) {
+void CMsgDlg::OnOK() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CMsgDlg::ClearDialogImage(void) {
+void CMsgDlg::ClearDialogImage() {
 
 	if (pMsgOKButton != nullptr) {
 		delete pMsgOKButton;
@@ -211,7 +211,7 @@ bool CMsgDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CMsgDlg::OnPaint(void) {
+void CMsgDlg::OnPaint() {
 //      call CBmpDialog onpaint, to paint the background
 	CBmpDialog::OnPaint();
 
diff --git a/engines/bagel/hodjnpodj/dfa/optdlg.cpp b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
index 0fad7c9113f..1eef0e1c0e0 100644
--- a/engines/bagel/hodjnpodj/dfa/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/dfa/optdlg.cpp
@@ -132,13 +132,13 @@ bool CDFAOptDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CDialog::OnCommand(wParam, lParam);
 }
 
-void CDFAOptDlg::OnCancel(void) {
+void CDFAOptDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(-1);
 	return;
 }
 
-void CDFAOptDlg::OnOK(void) {
+void CDFAOptDlg::OnOK() {
 	if (pDFAOKButton->GetState()  & 0x0008)
 		SendMessage(WM_COMMAND, IDC_MINI_OK, BN_CLICKED);
 	else
@@ -146,7 +146,7 @@ void CDFAOptDlg::OnOK(void) {
 	return;
 }
 
-void CDFAOptDlg::ClearDialogImage(void) {
+void CDFAOptDlg::ClearDialogImage() {
 
 	if (pDFAOKButton != nullptr) {
 		delete pDFAOKButton;
@@ -247,7 +247,7 @@ bool CDFAOptDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CDFAOptDlg::OnPaint(void) {
+void CDFAOptDlg::OnPaint() {
 	CDC             *pDC;
 	CString         strBTime = "Beaver Time (Secs) :";
 	CString         strGTime = "Game Time (Secs) :";
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.cpp b/engines/bagel/hodjnpodj/fuge/fuge.cpp
index 2af4e726129..ed75223b9f4 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.cpp
+++ b/engines/bagel/hodjnpodj/fuge/fuge.cpp
@@ -545,7 +545,7 @@ void CFugeWindow::initStatics() {
 		&vBrickCritPoints[0][0]);
 }
 
-void CFugeWindow::InitializeJoystick(void) {
+void CFugeWindow::InitializeJoystick() {
 	JOYINFO     joyInfo;
 
 	if (joySetCapture(m_hWnd, JOYSTICKID1, 10000, true) == JOYERR_NOERROR) {
@@ -564,7 +564,7 @@ void CFugeWindow::InitializeJoystick(void) {
 }
 
 
-void CFugeWindow::RealignVectors(void) {
+void CFugeWindow::RealignVectors() {
 	CVector vTmp;
 	int i, j;
 
@@ -579,7 +579,7 @@ void CFugeWindow::RealignVectors(void) {
 }
 
 
-ERROR_CODE CFugeWindow::LoadMasterSprites(void) {
+ERROR_CODE CFugeWindow::LoadMasterSprites() {
 	CDC *pDC;
 	ERROR_CODE errCode;
 
@@ -627,7 +627,7 @@ ERROR_CODE CFugeWindow::LoadMasterSprites(void) {
 	return errCode;
 }
 
-void CFugeWindow::ReleaseMasterSprites(void) {
+void CFugeWindow::ReleaseMasterSprites() {
 	assert(m_pBall != nullptr);
 	if (m_pBall != nullptr) {
 		delete m_pBall;
@@ -809,18 +809,18 @@ bool CFugeWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CFugeWindow::GamePause(void) {
+void CFugeWindow::GamePause() {
 	m_bPause = true;
 };
 
 
-void CFugeWindow::GameResume(void) {
+void CFugeWindow::GameResume() {
 	if (!m_bBallOnPaddle && m_bMovingPaddle)
 		m_bPause = false;
 };
 
 
-void CFugeWindow::PlayGame(void) {
+void CFugeWindow::PlayGame() {
 	ERROR_CODE errCode;
 
 	// assume no error
@@ -911,7 +911,7 @@ ERROR_CODE CFugeWindow::LoadNewPaddle(int nNewSize) {
 }
 
 
-ERROR_CODE CFugeWindow::LoadMasterSounds(void) {
+ERROR_CODE CFugeWindow::LoadMasterSounds() {
 	HANDLE hResInfo;
 	HINSTANCE hInst;
 	ERROR_CODE errCode;
@@ -999,7 +999,7 @@ ERROR_CODE CFugeWindow::LoadMasterSounds(void) {
 }
 
 
-void CFugeWindow::ReleaseMasterSounds(void) {
+void CFugeWindow::ReleaseMasterSounds() {
 	if (m_hExtraLifeRes != nullptr) {
 		FreeResource(m_hExtraLifeRes);
 		m_hExtraLifeRes = nullptr;
@@ -1019,7 +1019,7 @@ void CFugeWindow::ReleaseMasterSounds(void) {
 }
 
 
-void CFugeWindow::EndBall(void) {
+void CFugeWindow::EndBall() {
 	CDC *pDC;
 	assert(m_pBall != nullptr);
 
@@ -1033,7 +1033,7 @@ void CFugeWindow::EndBall(void) {
 }
 
 
-void CFugeWindow::StartBall(void) {
+void CFugeWindow::StartBall() {
 	CDC *pDC;
 
 	assert(m_pBall != nullptr);
@@ -1051,7 +1051,7 @@ void CFugeWindow::StartBall(void) {
 }
 
 
-CVector CFugeWindow::BallOnPaddle(void) {
+CVector CFugeWindow::BallOnPaddle() {
 	CVector vBall(0, -(PADDLE_RADIUS + BALL_RADIUS));
 
 	vBall.Rotate(fPaddleAngles[m_nInitPaddleSize] / 2);
@@ -1066,7 +1066,7 @@ CVector CFugeWindow::BallOnPaddle(void) {
 }
 
 
-void CFugeWindow::PaintBall(void) {
+void CFugeWindow::PaintBall() {
 	CPoint ptLast;
 	CVector vBall, vGravity;
 	double length;
@@ -1254,7 +1254,7 @@ void CFugeWindow::PaintBall(void) {
 
 #define N_CRIT_POINTS 7
 
-void CFugeWindow::BallvsPaddle(void) {
+void CFugeWindow::BallvsPaddle() {
 	CVector vPoints[N_CRIT_POINTS];
 	CVector vTmp, vPaddle, vFace, vBallCenter, vBallEdge;
 	double a1, a2;
@@ -1909,7 +1909,7 @@ void CFugeWindow::EraseBrick(CDC *pDC, int nBrickIndex) {
 }
 
 
-void CFugeWindow::LoseBall(void) {
+void CFugeWindow::LoseBall() {
 	char buf1[32], buf2[32];
 	CDC *pDC;
 	ERROR_CODE errCode;
@@ -2032,7 +2032,7 @@ void CFugeWindow::LoseBall(void) {
 }
 
 
-void CFugeWindow::StartPaddle(void) {
+void CFugeWindow::StartPaddle() {
 	assert(m_pPaddle != nullptr);
 
 	if (m_pPaddle != nullptr)
@@ -2044,7 +2044,7 @@ void CFugeWindow::StartPaddle(void) {
 }
 
 
-void CFugeWindow::EndPaddle(void) {
+void CFugeWindow::EndPaddle() {
 	CDC *pDC;
 
 	assert(m_pPaddle != nullptr);
@@ -2058,7 +2058,7 @@ void CFugeWindow::EndPaddle(void) {
 	}
 }
 
-void CFugeWindow::LaunchBall(void) {
+void CFugeWindow::LaunchBall() {
 	assert(m_bGameActive);
 	assert(m_bBallOnPaddle);
 
@@ -2175,7 +2175,7 @@ void CFugeWindow::PaintPaddle(bool bPaint) {
 }
 
 
-void CFugeWindow::StartBricks(void) {
+void CFugeWindow::StartBricks() {
 	CDC *pDC;
 	int i, nBricks;
 
@@ -2283,13 +2283,13 @@ void CFugeWindow::PaintBricks(CDC *pDC) {
 }
 
 
-void CFugeWindow::EndBricks(void) {
+void CFugeWindow::EndBricks() {
 	memset(m_bBrickVisible, 0, sizeof(bool) * N_BRICKS);
 }
 
 
 
-void CFugeWindow::LoadIniSettings(void) {
+void CFugeWindow::LoadIniSettings() {
 	if (pGameParams->bPlayingMetagame) {
 
 		m_bOutterWall = false;
@@ -2343,7 +2343,7 @@ void CFugeWindow::LoadIniSettings(void) {
 }
 
 
-void CFugeWindow::GameReset(void) {
+void CFugeWindow::GameReset() {
 	KillTimer(TIMER_ID);                        // stop the timer
 
 	if (pGameParams->bSoundEffectsEnabled) {
diff --git a/engines/bagel/hodjnpodj/fuge/fuge.h b/engines/bagel/hodjnpodj/fuge/fuge.h
index 1f10993606e..d1d5496cb9e 100644
--- a/engines/bagel/hodjnpodj/fuge/fuge.h
+++ b/engines/bagel/hodjnpodj/fuge/fuge.h
@@ -41,45 +41,45 @@ namespace Fuge {
 
 class CFugeWindow : public CFrameWnd {
 public:
-	CFugeWindow(void);
-	void        PlayGame(void);
-	void        PaintScreen(void);
-	void        LoadIniSettings(void);
+	CFugeWindow();
+	void        PlayGame();
+	void        PaintScreen();
+	void        LoadIniSettings();
 
 protected:
 	void initMembers();
 	void initStatics();
-	void        GameReset(void);
-	void        GamePause(void);
-	void        GameResume(void);
+	void        GameReset();
+	void        GamePause();
+	void        GameResume();
 	void        HandleError(ERROR_CODE);
-	void        RealignVectors(void);
-	ERROR_CODE  LoadMasterSprites(void);
-	void        ReleaseMasterSprites(void);
-	ERROR_CODE  LoadMasterSounds(void);
-	void        ReleaseMasterSounds(void);
+	void        RealignVectors();
+	ERROR_CODE  LoadMasterSprites();
+	void        ReleaseMasterSprites();
+	ERROR_CODE  LoadMasterSounds();
+	void        ReleaseMasterSounds();
 	ERROR_CODE  LoadNewPaddle(int);
-	void        InitializeJoystick(void);
+	void        InitializeJoystick();
 	void        RepaintSpriteList(CDC *);
 	void        PaintBricks(CDC *);
-	void        StartBall(void);
-	void        EndBall(void);
-	void        PaintBall(void);
-	void        LaunchBall(void);
-	void        StartPaddle(void);
-	void        EndPaddle(void);
+	void        StartBall();
+	void        EndBall();
+	void        PaintBall();
+	void        LaunchBall();
+	void        StartPaddle();
+	void        EndPaddle();
 	void        PaintPaddle(bool);
-	CVector     BallOnPaddle(void);
-	void        StartBricks(void);
-	void        EndBricks(void);
+	CVector     BallOnPaddle();
+	void        StartBricks();
+	void        EndBricks();
 	void        EraseBrick(CDC *, int);
-	void        LoseBall(void);
-	void        BallvsPaddle(void);
+	void        LoseBall();
+	void        BallvsPaddle();
 	void        BallvsBrick(double);
 
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	long        OnJoyStick(unsigned int, long);
-	void        OnPaint(void);
+	void        OnPaint();
 	void        OnTimer(uintptr);
 	void        OnMouseMove(unsigned int, CPoint);
 	void        OnRButtonUp(unsigned int, CPoint);
@@ -91,7 +91,7 @@ protected:
 	LRESULT     OnMCINotify(WPARAM, LPARAM);
 	LRESULT     OnMMIONotify(WPARAM, LPARAM);
 	void        OnSoundNotify(CSound *);
-	void        OnClose(void);
+	void        OnClose();
 
 	DECLARE_MESSAGE_MAP()
 
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.cpp b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
index af342091581..603f9eeb187 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.cpp
@@ -259,7 +259,7 @@ void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 }
 
 
-bool CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog() {
 	CRect tmpRect;
 	CDC *pDC;
 
@@ -343,13 +343,13 @@ bool CUserCfgDlg::OnInitDialog(void) {
 	return true;
 }
 
-void CUserCfgDlg::OnPaint(void) {
+void CUserCfgDlg::OnPaint() {
 	CBmpDialog::OnPaint();
 
 	UpdateOptions();
 }
 
-void CUserCfgDlg::UpdateOptions(void) {
+void CUserCfgDlg::UpdateOptions() {
 	char buf[40];
 	CDC *pDC;
 
@@ -462,7 +462,7 @@ void CUserCfgDlg::OnClose() {
 	EndDialog(0);
 }
 
-void CUserCfgDlg::ClearDialogImage(void) {
+void CUserCfgDlg::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
@@ -482,7 +482,7 @@ void CUserCfgDlg::ClearDialogImage(void) {
 }
 
 
-void CUserCfgDlg::LoadIniSettings(void) {
+void CUserCfgDlg::LoadIniSettings() {
 	m_nNumBalls = GetPrivateProfileInt(INI_SECTION, "NumberOfBalls", BALLS_DEF, INI_FILENAME);
 	if ((m_nNumBalls < BALLS_MIN) || (m_nNumBalls > BALLS_MAX))
 		m_nNumBalls = BALLS_DEF;
@@ -504,7 +504,7 @@ void CUserCfgDlg::LoadIniSettings(void) {
 		m_bOutterWall = true;
 }
 
-void CUserCfgDlg::SaveIniSettings(void) {
+void CUserCfgDlg::SaveIniSettings() {
 	WritePrivateProfileString(INI_SECTION, "NumberOfBalls", Common::String::format("%d", m_nNumBalls).c_str(), INI_FILENAME);
 	WritePrivateProfileString(INI_SECTION, "StartingLevel", Common::String::format("%d", m_nStartLevel).c_str(), INI_FILENAME);
 	WritePrivateProfileString(INI_SECTION, "BallSpeed", Common::String::format("%d", m_nBallSpeed).c_str(), INI_FILENAME);
diff --git a/engines/bagel/hodjnpodj/fuge/usercfg.h b/engines/bagel/hodjnpodj/fuge/usercfg.h
index d97b3a61f7b..1eaed5e8488 100644
--- a/engines/bagel/hodjnpodj/fuge/usercfg.h
+++ b/engines/bagel/hodjnpodj/fuge/usercfg.h
@@ -60,13 +60,13 @@ protected:
 
 	virtual void DoDataExchange(CDataExchange *) override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual bool OnInitDialog(void) override;
-	void PutDlgData(void);
-	void GetDlgData(void);
-	void LoadIniSettings(void);
-	void SaveIniSettings(void);
-	void UpdateOptions(void);
-	void ClearDialogImage(void);
+	virtual bool OnInitDialog() override;
+	void PutDlgData();
+	void GetDlgData();
+	void LoadIniSettings();
+	void SaveIniSettings();
+	void UpdateOptions();
+	void ClearDialogImage();
 
 	afx_msg bool OnEraseBkgnd(CDC *);
 	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
index 16c5ffc6f3a..13bb46397aa 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
@@ -496,7 +496,7 @@ bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
 			CSound::waitWaveSounds();
-			(void) RulesDlg.DoModal();
+			RulesDlg.DoModal();
 			m_bIgnoreScrollClick = false;
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
 			break;
diff --git a/engines/bagel/hodjnpodj/garfunkle/note.cpp b/engines/bagel/hodjnpodj/garfunkle/note.cpp
index fa717cc67cd..3fc3758953e 100644
--- a/engines/bagel/hodjnpodj/garfunkle/note.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/note.cpp
@@ -96,7 +96,7 @@ void CNote::SetValue(int nValue) {
  *
  ************************************************************************/
 
-void CNote::LinkNote(void) {
+void CNote::LinkNote() {
 	m_pNext = nullptr;                 // link note onto tail of list
 	m_pPrev = m_pNoteTail;          //... by pointing it back at the current
 	//... tail, making it the tail, and
@@ -120,7 +120,7 @@ void CNote::LinkNote(void) {
  *
  ************************************************************************/
 
-void CNote::UnLinkNote(void) {
+void CNote::UnLinkNote() {
 	if (m_pPrev)                            // disconnect us from the note chain
 		(*m_pPrev).m_pNext = m_pNext;       // ... by pointing the one before us, and
 	else                                    // ... the one after us, at each other
@@ -147,7 +147,7 @@ void CNote::UnLinkNote(void) {
  *
  ************************************************************************/
 
-void CNote::FlushNoteList(void) {
+void CNote::FlushNoteList() {
 	CNote   *pNote;
 
 	while ((pNote = CNote::GetNoteHead())) {
diff --git a/engines/bagel/hodjnpodj/garfunkle/note.h b/engines/bagel/hodjnpodj/garfunkle/note.h
index a5b5354e415..cf77860c1de 100644
--- a/engines/bagel/hodjnpodj/garfunkle/note.h
+++ b/engines/bagel/hodjnpodj/garfunkle/note.h
@@ -42,22 +42,22 @@ public:
 // Implementation
 public:
 	void    SetValue(int nValue);
-	int GetValue(void) const {
+	int GetValue() const {
 		return m_nValue;
 	}
-	void LinkNote(void);
-	void UnLinkNote(void);
-	CNote *GetNextNote(void) const {
+	void LinkNote();
+	void UnLinkNote();
+	CNote *GetNextNote() const {
 		return m_pNext;
 	}
-	CNote *GetPrevNote(void) const {
+	CNote *GetPrevNote() const {
 		return m_pPrev;
 	}
 
-	static CNote *GetNoteHead(void) {
+	static CNote *GetNoteHead() {
 		return m_pNoteHead;
 	}
-	static void FlushNoteList(void);
+	static void FlushNoteList();
 
 private:
 	int         m_nValue;
diff --git a/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp b/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
index 7f5b03fbd07..da6587a1bb6 100644
--- a/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/optndlg.cpp
@@ -156,7 +156,7 @@ bool COptnDlg::OnInitDialog() {
 	return true;  // return true  unless you set the focus to a control
 }
 
-void COptnDlg::OnDestroy(void) {
+void COptnDlg::OnDestroy() {
 	CBmpDialog::OnDestroy();
 }
 
@@ -330,7 +330,7 @@ void COptnDlg::OnPaint() {
 
 }
 
-void COptnDlg::ClearDialogImage(void) {
+void COptnDlg::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
diff --git a/engines/bagel/hodjnpodj/garfunkle/optndlg.h b/engines/bagel/hodjnpodj/garfunkle/optndlg.h
index 5b7844ad7c1..2bf2fa4a01d 100644
--- a/engines/bagel/hodjnpodj/garfunkle/optndlg.h
+++ b/engines/bagel/hodjnpodj/garfunkle/optndlg.h
@@ -43,7 +43,7 @@ public:
 	COptnDlg(CWnd* pParent = nullptr, CPalette *pPalette = nullptr);  // standard constructor
 	~COptnDlg();        // destructor
 	void UpdateScrollbars();
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 // Dialog Data
 	//{{AFX_DATA(COptnDlg)
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
index dc851f6fadf..82348a0f394 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.cpp
@@ -172,7 +172,7 @@ void CAudioCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 }
 
 
-bool CAudioCfgDlg::OnInitDialog(void) {
+bool CAudioCfgDlg::OnInitDialog() {
 	CRect tmpRect;
 	CDC *pDC;
 
@@ -229,14 +229,14 @@ bool CAudioCfgDlg::OnInitDialog(void) {
 }
 
 
-void CAudioCfgDlg::OnPaint(void) {
+void CAudioCfgDlg::OnPaint() {
 	CBmpDialog::OnPaint();
 
 	UpdateOptions();
 }
 
 
-void CAudioCfgDlg::UpdateOptions(void) {
+void CAudioCfgDlg::UpdateOptions() {
 	char buf[40];
 	CDC *pDC;
 
@@ -293,7 +293,7 @@ void CAudioCfgDlg::OnClose() {
 	EndDialog(0);
 }
 
-void CAudioCfgDlg::ClearDialogImage(void) {
+void CAudioCfgDlg::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
@@ -308,7 +308,7 @@ void CAudioCfgDlg::ClearDialogImage(void) {
 }
 
 
-void CAudioCfgDlg::LoadIniSettings(void) {
+void CAudioCfgDlg::LoadIniSettings() {
 	int nMidiVolume, nWaveVolume;
 
 	m_bMusic = GetPrivateProfileInt("Meta", "Music", true, "HODJPODJ.INI");
diff --git a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
index f8c06d2f1f3..ee2acda47eb 100644
--- a/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
+++ b/engines/bagel/hodjnpodj/hnplibs/audiocfg.h
@@ -44,13 +44,13 @@ protected:
 
 	virtual void DoDataExchange(CDataExchange *) override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual bool OnInitDialog(void) override;
-	void PutDlgData(void);
-	void GetDlgData(void);
-	void LoadIniSettings(void);
-	void SaveIniSettings(void);
-	void UpdateOptions(void);
-	void ClearDialogImage(void);
+	virtual bool OnInitDialog() override;
+	void PutDlgData();
+	void GetDlgData();
+	void LoadIniSettings();
+	void SaveIniSettings();
+	void UpdateOptions();
+	void ClearDialogImage();
 
 	afx_msg bool OnEraseBkgnd(CDC *);
 	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
diff --git a/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp b/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
index 0c38ed50619..827c54ddf0b 100644
--- a/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/bitmaps.cpp
@@ -36,7 +36,7 @@ CBitmap *FetchScreenBitmap(CDC *pDC, CPalette *pPalette, const int x, const int
 
 	if (pPalette != nullptr) {                                 // map in color palette to be used
 		pPalOld = (*pDC).SelectPalette(pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	pWorkDC = new CDC();                                    // create the context and bitmap objects
@@ -48,7 +48,7 @@ CBitmap *FetchScreenBitmap(CDC *pDC, CPalette *pPalette, const int x, const int
 	        (*pWork).CreateCompatibleBitmap(pDC, dx, dy)) {     // create a bitmap of the appropriate size
 		if (pPalette != nullptr) {                             // map the palette into the work area
 			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
-			(void)(*pWorkDC).RealizePalette();
+			(*pWorkDC).RealizePalette();
 		}
 		pWorkOld = (*pWorkDC).SelectObject(pWork);          // now map in the work area's bitmap
 		if (pWorkOld != nullptr)                               // capture the desired pixels
@@ -56,11 +56,11 @@ CBitmap *FetchScreenBitmap(CDC *pDC, CPalette *pPalette, const int x, const int
 	}
 
 	if (pPalOld != nullptr)                                    // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 	if (pWorkOld != nullptr)
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
+		(*pWorkDC).SelectPalette(pPalOldWork, false);
 	if (!bSuccess &&                                        // release the bitmap result we built
 	        (pWork != nullptr)) {                                  // ... if something failed
 		(*pWork).DeleteObject();
@@ -178,7 +178,7 @@ CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int
 
 	if (pPalette != nullptr) {                                 // map in color palette to be used
 		pPalOld = (*pDC).SelectPalette(pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	pWorkDC = new CDC();                                    // create the context and bitmap objects
@@ -193,9 +193,9 @@ CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int
 	        (*pWork).CreateCompatibleBitmap(pDC, dx, dy)) {     // create a bitmap of the appropriate size
 		if (pPalette != nullptr) {                             // map the palette into the contexts
 			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
-			(void)(*pWorkDC).RealizePalette();
+			(*pWorkDC).RealizePalette();
 			pPalOldBase = (*pBaseDC).SelectPalette(pPalette, false);
-			(void)(*pBaseDC).RealizePalette();
+			(*pBaseDC).RealizePalette();
 		}
 		pWorkOld = (*pWorkDC).SelectObject(pWork);          // now map in the work area's bitmap
 		pBaseOld = (*pBaseDC).SelectObject(pBitmap);        // ... as well as the source bitmap
@@ -205,15 +205,15 @@ CBitmap *ExtractBitmap(CDC *pDC, CBitmap *pBitmap, CPalette *pPalette, const int
 	}
 
 	if (pPalOld != nullptr)                                    // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 	if (pWorkOld != nullptr)
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 	if (pBaseOld != nullptr)
-		(void)(*pBaseDC).SelectObject(pBaseOld);
+		(*pBaseDC).SelectObject(pBaseOld);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
+		(*pWorkDC).SelectPalette(pPalOldWork, false);
 	if (pPalOldBase != nullptr)
-		(void)(*pBaseDC).SelectPalette(pPalOldBase, false);
+		(*pBaseDC).SelectPalette(pPalOldBase, false);
 	if (!bSuccess &&                                        // release the bitmap result we built
 	        (pWork != nullptr)) {                                  // ... if something failed
 		(*pWork).DeleteObject();
@@ -261,7 +261,7 @@ bool BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect,
 
 	if (pPalette != nullptr) {                                 // map in color palette to be used
 		pPalOld = (*pDC).SelectPalette(pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	pWorkDC = new CDC();                                    // create the context and bitmap objects
@@ -271,7 +271,7 @@ bool BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect,
 	        (*pWorkDC).CreateCompatibleDC(pDC)) {               // create a context for our bitmap
 		if (pPalette != nullptr) {                             // map the palette into the context
 			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
-			(void)(*pWorkDC).RealizePalette();
+			(*pWorkDC).RealizePalette();
 		}
 		pWorkOld = (*pWorkDC).SelectObject(pBitmap);        // now map in our bitmap
 		if (pWorkOld != nullptr) {                             // paint back the saved pixels
@@ -303,11 +303,11 @@ bool BltBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrcRect,
 	}
 
 	if (pPalOld != nullptr)                                    // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 	if (pWorkOld != nullptr)
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
+		(*pWorkDC).SelectPalette(pPalOldWork, false);
 	if (pWorkDC != nullptr) {
 		(*pWorkDC).DeleteDC();
 		delete pWorkDC;
@@ -357,7 +357,7 @@ bool BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 
 	if (pPalette != nullptr) {
 		pPalOld = (*pDC).SelectPalette(pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	pImageDC = new CDC();                               // create the necessary objects
@@ -382,9 +382,9 @@ bool BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 
 		if (pPalette != nullptr) {                     // map in the color palette if specified
 			pPalOldImage = (*pImageDC).SelectPalette(pPalette, false);
-			(void)(*pImageDC).RealizePalette();
+			(*pImageDC).RealizePalette();
 			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
-			(void)(*pWorkDC).RealizePalette();
+			(*pWorkDC).RealizePalette();
 		}
 
 		if ((*pImage).CreateCompatibleBitmap(pDC, dx, dy) &&
@@ -400,7 +400,7 @@ bool BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 
 			if ((pMaskOld != nullptr) &&                   // verify so far so good
 			        (pWorkOld != nullptr)) {
-				(void)(*pWorkDC).BitBlt(     // grab what the background looks like
+				(*pWorkDC).BitBlt(     // grab what the background looks like
 				    0,                              // ... putting it in the work area
 				    0,
 				    dx,
@@ -409,35 +409,35 @@ bool BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 				    x,
 				    y,
 				    SRCCOPY);
-				(void)(*pMaskDC).BitBlt(     // create the mask by inverting the image
+				(*pMaskDC).BitBlt(     // create the mask by inverting the image
 				    0, 0,                           // ... i.e. the pixels occupied by the image
 				    dx,
 				    dy,
 				    pImageDC,
 				    0, 0,
 				    NOTSRCCOPY);
-				(void)(*pImageDC).BitBlt(     // remove the image's "transparent" white area
+				(*pImageDC).BitBlt(     // remove the image's "transparent" white area
 				    0, 0,                           // ... i.e. its background becomes black
 				    dx,
 				    dy,
 				    pMaskDC,
 				    0, 0,
 				    SRCAND);
-				(void)(*pMaskDC).BitBlt(     // invert the mask
+				(*pMaskDC).BitBlt(     // invert the mask
 				    0, 0,
 				    dx,
 				    dy,
 				    pMaskDC,
 				    0, 0,
 				    DSTINVERT);
-				(void)(*pWorkDC).BitBlt(     // remove the image's space from the work area
+				(*pWorkDC).BitBlt(     // remove the image's space from the work area
 				    0, 0,                           // ... i.e. the pixels where the image will go
 				    dx,
 				    dy,
 				    pMaskDC,
 				    0, 0
 				    , SRCAND);
-				(void)(*pWorkDC).BitBlt(     // paint the image into the cleared (black) space
+				(*pWorkDC).BitBlt(     // paint the image into the cleared (black) space
 				    0, 0,                           // ... we made in the work area
 				    dx,
 				    dy,
@@ -458,19 +458,19 @@ bool BltMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, CRect *pSrc
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	if (pImageOld != nullptr)                              // select out bitmaps out of their contexts
-		(void)(*pImageDC).SelectObject(pImageOld);
+		(*pImageDC).SelectObject(pImageOld);
 	if (pWorkOld != nullptr)
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 	if (pMaskOld != nullptr)
-		(void)(*pMaskDC).SelectObject(pMaskOld);
+		(*pMaskDC).SelectObject(pMaskOld);
 
 	if (pPalOldImage != nullptr)                           // map out the palettes we used
-		(void)(*pImageDC).SelectPalette(pPalOldImage, false);
+		(*pImageDC).SelectPalette(pPalOldImage, false);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
+		(*pWorkDC).SelectPalette(pPalOldWork, false);
 
 	if (pImage != nullptr) {                                // delete the bitmaps we created
 		(*pImage).DeleteObject();
@@ -533,7 +533,7 @@ bool PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, co
 
 	if (pPalette != nullptr) {                                 // map in color palette to be used
 		pPalOld = (*pDC).SelectPalette(pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	pWorkDC = new CDC();                                    // create the context and bitmap objects
@@ -543,7 +543,7 @@ bool PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, co
 	        (*pWorkDC).CreateCompatibleDC(pDC)) {               // create a context for our bitmap
 		if (pPalette != nullptr) {                             // map the palette into the context
 			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
-			(void)(*pWorkDC).RealizePalette();
+			(*pWorkDC).RealizePalette();
 		}
 		pWorkOld = (*pWorkDC).SelectObject(pBitmap);        // now map in our bitmap
 		if (pWorkOld != nullptr) {                             // paint back the saved pixels
@@ -559,11 +559,11 @@ bool PaintBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int x, co
 	}
 
 	if (pPalOld != nullptr)                                    // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 	if (pWorkOld != nullptr)
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
+		(*pWorkDC).SelectPalette(pPalOldWork, false);
 	if (pWorkDC != nullptr) {
 		(*pWorkDC).DeleteDC();
 		delete pWorkDC;
@@ -822,7 +822,7 @@ bool PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 
 	if (pPalette != nullptr) {
 		pPalOld = (*pDC).SelectPalette(pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	pImageDC = new CDC();                               // create the necessary objects
@@ -842,7 +842,7 @@ bool PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 	        (*pMaskDC).CreateCompatibleDC(pDC) &&               // ... that we need to hold our bitmaps
 	        (*pWorkDC).CreateCompatibleDC(pDC)) {
 
-		(void)(*pBitmap).GetObject(sizeof(BITMAP), &myBitmap);  // get the image's sizing info
+		(*pBitmap).GetObject(sizeof(BITMAP), &myBitmap);  // get the image's sizing info
 		cSize.cx = myBitmap.bmWidth;
 		cSize.cy = myBitmap.bmHeight;
 
@@ -854,9 +854,9 @@ bool PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 
 		if (pPalette != nullptr) {                     // map in the color palette if specified
 			pPalOldImage = (*pImageDC).SelectPalette(pPalette, false);
-			(void)(*pImageDC).RealizePalette();
+			(*pImageDC).RealizePalette();
 			pPalOldWork = (*pWorkDC).SelectPalette(pPalette, false);
-			(void)(*pWorkDC).RealizePalette();
+			(*pWorkDC).RealizePalette();
 		}
 
 		if ((*pImage).CreateCompatibleBitmap(pDC, cSize.cx, cSize.cy) &&
@@ -871,7 +871,7 @@ bool PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 
 			if ((pMaskOld != nullptr) &&                   // verify so far so good
 			        (pWorkOld != nullptr)) {
-				(void)(*pWorkDC).BitBlt(     // grab what the background looks like
+				(*pWorkDC).BitBlt(     // grab what the background looks like
 				    0,                              // ... putting it in the work area
 				    0,
 				    cSize.cx,
@@ -880,35 +880,35 @@ bool PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 				    x,
 				    y,
 				    SRCCOPY);
-				(void)(*pMaskDC).BitBlt(     // create the mask by inverting the image
+				(*pMaskDC).BitBlt(     // create the mask by inverting the image
 				    0, 0,                           // ... i.e. the pixels occupied by the image
 				    cSize.cx,
 				    cSize.cy,
 				    pImageDC,
 				    0, 0,
 				    NOTSRCCOPY);
-				(void)(*pImageDC).BitBlt(     // remove the image's "transparent" white area
+				(*pImageDC).BitBlt(     // remove the image's "transparent" white area
 				    0, 0,                           // ... i.e. its background becomes black
 				    cSize.cx,
 				    cSize.cy,
 				    pMaskDC,
 				    0, 0,
 				    SRCAND);
-				(void)(*pMaskDC).BitBlt(     // invert the mask
+				(*pMaskDC).BitBlt(     // invert the mask
 				    0, 0,
 				    cSize.cx,
 				    cSize.cy,
 				    pMaskDC,
 				    0, 0,
 				    DSTINVERT);
-				(void)(*pWorkDC).BitBlt(     // remove the image's space from the work area
+				(*pWorkDC).BitBlt(     // remove the image's space from the work area
 				    0, 0,                           // ... i.e. the pixels where the image will go
 				    cSize.cx,
 				    cSize.cy,
 				    pMaskDC,
 				    0, 0
 				    , SRCAND);
-				(void)(*pWorkDC).BitBlt(     // paint the image into the cleared (black) space
+				(*pWorkDC).BitBlt(     // paint the image into the cleared (black) space
 				    0, 0,                           // ... we made in the work area
 				    cSize.cx,
 				    cSize.cy,
@@ -929,19 +929,19 @@ bool PaintMaskedBitmap(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap, const int
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	if (pImageOld != nullptr)                              // select out bitmaps out of their contexts
-		(void)(*pImageDC).SelectObject(pImageOld);
+		(*pImageDC).SelectObject(pImageOld);
 	if (pWorkOld != nullptr)
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 	if (pMaskOld != nullptr)
-		(void)(*pMaskDC).SelectObject(pMaskOld);
+		(*pMaskDC).SelectObject(pMaskOld);
 
 	if (pPalOldImage != nullptr)                           // map out the palettes we used
-		(void)(*pImageDC).SelectPalette(pPalOldImage, false);
+		(*pImageDC).SelectPalette(pPalOldImage, false);
 	if (pPalOldWork != nullptr)
-		(void)(*pWorkDC).SelectPalette(pPalOldWork, false);
+		(*pWorkDC).SelectPalette(pPalOldWork, false);
 
 	if (pImage != nullptr) {                                // delete the bitmaps we created
 		(*pImage).DeleteObject();
@@ -1074,7 +1074,7 @@ bool PaintBlockEffect(CDC *pDC, CBitmap *pBitmap, CPalette* pPalette, int nBlock
 	(*pMemDC).RealizePalette();
 	pBitmapOld = (*pMemDC).SelectObject(pBitmap);
 
-	(void)(*pBitmap).GetObject(sizeof(BITMAP), &myBitmap);
+	(*pBitmap).GetObject(sizeof(BITMAP), &myBitmap);
 	width = myBitmap.bmWidth / nBlockSize;
 	height = myBitmap.bmHeight;
 
@@ -1127,12 +1127,12 @@ clean_up:
 	if (pBitmapOld != nullptr)
 		(*pMemDC).SelectObject(pBitmapOld);
 	if (pOldPal2 != nullptr)
-		(void)(*pMemDC).SelectPalette(pOldPal2, false);
+		(*pMemDC).SelectPalette(pOldPal2, false);
 	if (pMemDC != nullptr)
 		delete pMemDC;
 
 	if (pOldPal != nullptr)
-		(void)(*pDC).SelectPalette(pOldPal, false);
+		(*pDC).SelectPalette(pOldPal, false);
 
 	return bSuccess;
 }
@@ -1216,7 +1216,7 @@ bool PaintBlockEffect(CDC *pDC, COLORREF rgbColor, CPalette* pPalette, int nBloc
 	bSuccess = true;
 
 	if (pOldPal != nullptr)
-		(void)(*pDC).SelectPalette(pOldPal, false);
+		(*pDC).SelectPalette(pOldPal, false);
 
 	return bSuccess;
 }
diff --git a/engines/bagel/hodjnpodj/hnplibs/button.cpp b/engines/bagel/hodjnpodj/hnplibs/button.cpp
index 5ca12e2b822..445f38eabfb 100644
--- a/engines/bagel/hodjnpodj/hnplibs/button.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/button.cpp
@@ -128,7 +128,7 @@ void CBmpButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
 		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
-		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
+		(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
 	if (((*lpDrawItemStruct).itemState & ODS_GRAYED) || // display the correct bitmap based on state
@@ -144,9 +144,9 @@ void CBmpButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	PaintBitmap(pDC, nullptr, pBitmap, (*lpDrawItemStruct).rcItem.left, (*lpDrawItemStruct).rcItem.top);
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
-	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
+	(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
 }
 
@@ -667,7 +667,7 @@ void CMaskedButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
 		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
-		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
+		(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
 	if (m_pBackground == nullptr)
@@ -694,9 +694,9 @@ void CMaskedButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	PaintMaskedBitmap(pDC, nullptr, pBitmap, (*lpDrawItemStruct).rcItem.left, (*lpDrawItemStruct).rcItem.top);
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
-	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
+	(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
 }
 
@@ -911,7 +911,7 @@ void CColorButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
 		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
-		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
+		(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
 	if (((*lpDrawItemStruct).itemState & ODS_GRAYED) ||
@@ -937,7 +937,7 @@ void CColorButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	pOldPen = (*pDC).SelectObject(&myPen);                  // select in the pens and brushes
 	pOldBrush = (*pDC).SelectObject(&myBrush);
 	(*pDC).Rectangle(&(*lpDrawItemStruct).rcItem);
-	(void)(*pDC).SelectObject(pOldPen);
+	(*pDC).SelectObject(pOldPen);
 	pOldPen = (*pDC).SelectObject(&myInversePen);
 
 	for (i = 1; i <= BUTTON_EDGE_WIDTH; i++) {              // draw the button edges
@@ -946,8 +946,8 @@ void CColorButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		(*pDC).LineTo((*lpDrawItemStruct).rcItem.right - i, (*lpDrawItemStruct).rcItem.top + i - 1);
 	}
 
-	(void)(*pDC).SelectObject(pOldPen);
-	(void)(*pDC).SelectObject(pOldBrush);
+	(*pDC).SelectObject(pOldPen);
+	(*pDC).SelectObject(pOldBrush);
 
 	myFrame.CreateSolidBrush(m_cButtonOutline);             // outline the button
 	(*pDC).FrameRect(&(*lpDrawItemStruct).rcItem, &myFrame);
@@ -973,7 +973,7 @@ void CColorButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		(*pDC).TextOut(dx, y, (const char *) "_", 1);
 	}
 
-	(void)(*pDC).SetTextColor(oldTextColor);                // set the color of the text
+	(*pDC).SetTextColor(oldTextColor);                // set the color of the text
 
 	if ((*lpDrawItemStruct).itemState & ODS_FOCUS) {
 		focusRect.SetRect(x - FOCUS_RECT_DX,
@@ -985,9 +985,9 @@ void CColorButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
-	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
+	(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
 }
 
@@ -1197,7 +1197,7 @@ void CCheckButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
 		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
-		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
+		(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
 	if (((*lpDrawItemStruct).itemState & ODS_GRAYED) || // setup text color based on enable/disable state
@@ -1227,8 +1227,8 @@ void CCheckButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		pOldPen = (*pDC).SelectObject(&controlPen); // fill in just the box
 		(*pDC).Rectangle(&controlRect);
 	}
-	(void)(*pDC).SelectObject(pOldPen);
-	(void)(*pDC).SelectObject(pOldBrush);
+	(*pDC).SelectObject(pOldPen);
+	(*pDC).SelectObject(pOldBrush);
 
 	(*pDC).FrameRect(&controlRect, &frameBrush);    // paint the box and indicate selection
 
@@ -1238,7 +1238,7 @@ void CCheckButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		(*pDC).LineTo(controlRect.right - 1, controlRect.bottom - 1);
 		(*pDC).MoveTo(controlRect.left, controlRect.bottom - 1);
 		(*pDC).LineTo(controlRect.right - 1, controlRect.top);
-		(void)(*pDC).SelectObject(pOldPen);
+		(*pDC).SelectObject(pOldPen);
 	}
 
 	if ((*lpDrawItemStruct).itemState & ODS_SELECTED) {
@@ -1265,7 +1265,7 @@ void CCheckButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		(*pDC).TextOut(dx, y, (const char *) "_", 1);
 	}
 
-	(void)(*pDC).SetTextColor(oldTextColor);
+	(*pDC).SetTextColor(oldTextColor);
 
 	focusRect.SetRect(x - FOCUS_RECT_DX,           // set the focus rectangle
 	                  y - FOCUS_RECT_DY,             // ... then paint it or clear it
@@ -1278,9 +1278,9 @@ void CCheckButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		(*pDC).FrameRect(&focusRect, &faceBrush);
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
-	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
+	(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
 }
 
@@ -1543,7 +1543,7 @@ void CRadioButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 
 	if (m_pPalette != nullptr) {                       // map the palette into the context
 		pPalOld = (*pDC).SelectPalette(m_pPalette, true);
-		(void)(*pDC).RealizePalette();              // ... and tell the system to use it
+		(*pDC).RealizePalette();              // ... and tell the system to use it
 	}
 
 	if (((*lpDrawItemStruct).itemState & ODS_GRAYED) || // setup text color based on enable/disable state
@@ -1575,7 +1575,7 @@ void CRadioButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		pOldPen = (*pDC).SelectObject(&controlPen); // fill in just the box
 		(*pDC).Ellipse(&controlRect);
 	}
-	(void)(*pDC).SelectObject(pOldPen);
+	(*pDC).SelectObject(pOldPen);
 
 	pOldPen = (*pDC).SelectObject(&framePen);
 	(*pDC).Ellipse(&controlRect);       // paint the box and indicate selection
@@ -1583,16 +1583,16 @@ void CRadioButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		controlRect.InflateRect(-1, -1);
 		(*pDC).Ellipse(&controlRect);
 	}
-	(void)(*pDC).SelectObject(pOldPen);
-	(void)(*pDC).SelectObject(pOldBrush);
+	(*pDC).SelectObject(pOldPen);
+	(*pDC).SelectObject(pOldBrush);
 
 	if (m_bCheckState) {                            // indicate that the box is checked
 		selectRect.InflateRect(-2, -2);
 		pOldPen = (*pDC).SelectObject(&controlPen);
 		pOldBrush = (*pDC).SelectObject(&controlBrush);
 		(*pDC).Ellipse(&selectRect);
-		(void)(*pDC).SelectObject(pOldBrush);
-		(void)(*pDC).SelectObject(pOldPen);
+		(*pDC).SelectObject(pOldBrush);
+		(*pDC).SelectObject(pOldPen);
 	}
 
 	(*pDC).GetTextMetrics(&fontMetrics);                    // get some info about the font
@@ -1614,7 +1614,7 @@ void CRadioButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 		(*pDC).TextOut(dx, y, (const char *) "_", 1);
 	}
 
-	(void)(*pDC).SetTextColor(oldTextColor);
+	(*pDC).SetTextColor(oldTextColor);
 
 	focusRect.SetRect(x - FOCUS_RECT_DX,                            // set the focus rectangle
 	                  y - FOCUS_RECT_DY,              // ... then paint it or clear it
@@ -1628,9 +1628,9 @@ void CRadioButton::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) {
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
-	(void)(*pDC).Detach();                          // dismantle the temporary CDC we built
+	(*pDC).Detach();                          // dismantle the temporary CDC we built
 	delete pDC;
 }
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/cmessbox.h b/engines/bagel/hodjnpodj/hnplibs/cmessbox.h
index 3715ea6b352..e4c020332e9 100644
--- a/engines/bagel/hodjnpodj/hnplibs/cmessbox.h
+++ b/engines/bagel/hodjnpodj/hnplibs/cmessbox.h
@@ -51,7 +51,7 @@ public:
 	// standard constructor
 	CMessageBox(CWnd *pParent, CPalette *pPalette, const char *msg1, const char *msg2 = nullptr, const int dx = -1, const int dy = -1);
 
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Dialog Data
 	//{{AFX_DATA(CMessageBox)
diff --git a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
index fe2a13b02a1..64ef932ef75 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
@@ -117,7 +117,7 @@ bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
 
 		// Select as foreground and realize it
 		hOldPal = SelectPalette(hDC, hPal, false);
-		(void)RealizePalette(hDC);
+		RealizePalette(hDC);
 	}
 
 	nDevCaps = GetDeviceCaps(hDC, RASTERCAPS);
@@ -127,7 +127,7 @@ bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
 			hdcMem = CreateCompatibleDC(hDC);
 			if (hdcMem) {
 				hOldPal2 = SelectPalette(hdcMem, hPal, false);
-				(void)RealizePalette(hdcMem);
+				RealizePalette(hdcMem);
 				hBitmapOld = SelectBitmap(hdcMem, hBitmap);
 				if ((RECTWIDTH(lpDCRect) == RECTWIDTH(lpDIBRect)) &&
 					(RECTHEIGHT(lpDCRect) == RECTHEIGHT(lpDIBRect)))
@@ -141,8 +141,8 @@ bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
 						SRCCOPY);
 				else
 					bSuccess = false;
-				(void)SelectBitmap(hdcMem, hBitmapOld);
-				(void)SelectPalette(hdcMem, hOldPal2, false);
+				SelectBitmap(hdcMem, hBitmapOld);
+				SelectPalette(hdcMem, hOldPal2, false);
 				DeleteDC(hdcMem);
 			}
 		}
@@ -303,7 +303,7 @@ CBitmap *ConvertDIB(CDC *pDC, HDIB hDIB, CPalette *pPal) {
 
 		// Select as foreground and realize it
 		hOldPal = SelectPalette(hDC, hPal, false);
-		(void) RealizePalette(hDC);
+		RealizePalette(hDC);
 	}
 
 	// Convert the bit buffer to a bitmap
diff --git a/engines/bagel/hodjnpodj/hnplibs/dibdoc.h b/engines/bagel/hodjnpodj/hnplibs/dibdoc.h
index c38f0b88419..4ca2c853cbe 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibdoc.h
+++ b/engines/bagel/hodjnpodj/hnplibs/dibdoc.h
@@ -38,10 +38,10 @@ public:
 	HDIB GetHDIB() const {
 		return m_hDIB;
 	}
-	CPalette *GetDocPalette(void) const {
+	CPalette *GetDocPalette() const {
 		return m_palDIB;
 	}
-	CPalette *DetachPalette(void);
+	CPalette *DetachPalette();
 	CSize GetDocSize() const {
 		return m_sizeDoc;
 	}
diff --git a/engines/bagel/hodjnpodj/hnplibs/rules.cpp b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
index f015b999ab9..8952b9a257a 100644
--- a/engines/bagel/hodjnpodj/hnplibs/rules.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
@@ -147,7 +147,7 @@ BEGIN_MESSAGE_MAP(CRules, CDialog)
 END_MESSAGE_MAP()
 
 
-bool CRules::SetupKeyboardHook(void) {
+bool CRules::SetupKeyboardHook() {
 	HINSTANCE   hInst;
 
 	pRulesDialog = this;                            // retain pointer to our dialog box
@@ -163,7 +163,7 @@ bool CRules::SetupKeyboardHook(void) {
 }
 
 
-void CRules::RemoveKeyboardHook(void) {
+void CRules::RemoveKeyboardHook() {
 	if (m_bKeyboardHook) {
 		UnhookWindowsHookEx(hKbdHook);                  // unhook our keyboard procedure
 		FreeProcInstance(pKbdHook);                     // release our procedure pointer
@@ -242,7 +242,7 @@ void CRules::OnOK() {
 }
 
 
-void CRules::OnCancel(void) {
+void CRules::OnCancel() {
 	ClearDialogImage();
 	CDialog::OnCancel();
 }
@@ -363,7 +363,7 @@ void CRules::OnPaint() {
 
 	if (pScrollPalette != nullptr) {                   // map in our palette
 		pPalOld = dc.SelectPalette(pScrollPalette, false);
-		(void) dc.RealizePalette();                 // .. and make the system use it
+		dc.RealizePalette();                 // .. and make the system use it
 	}
 
 	if (first_time) {                               // unfurl scroll visually
@@ -386,7 +386,7 @@ void CRules::OnPaint() {
 		WritePage(&dc, nHelpPage);
 		UpdateMore(&dc);                            // update the "more" indicator
 	} else
-		(void) dc.BitBlt(        // update the screen with just the
+		dc.BitBlt(        // update the screen with just the
 		    0, 0,                           // ... current page of text
 		    ScrollRect.right,
 		    ScrollRect.bottom,
@@ -395,7 +395,7 @@ void CRules::OnPaint() {
 		    SRCCOPY);
 
 	if (pScrollPalette != nullptr)                     // map out our palette
-		(void) dc.SelectPalette(pPalOld, false);
+		dc.SelectPalette(pPalOld, false);
 
 	DoArrowCursor();                                // return to an arrow cursor
 }
@@ -406,7 +406,7 @@ bool CRules::OnEraseBkgnd(CDC *pDC) {
 }
 
 
-void CRules::ClearDialogImage(void) {
+void CRules::ClearDialogImage() {
 	delete pOKButton;
 	pOKButton = nullptr;
 	if (pBackgroundBitmap != nullptr)
@@ -415,7 +415,7 @@ void CRules::ClearDialogImage(void) {
 }
 
 
-void CRules::RefreshBackground(void) {
+void CRules::RefreshBackground() {
 	CDC         *pDC;
 	CPalette    *pPalOld = nullptr;
 
@@ -426,10 +426,10 @@ void CRules::RefreshBackground(void) {
 
 	if (pScrollPalette != nullptr) {                   // map in our palette
 		pPalOld = (*pDC).SelectPalette(pScrollPalette, false);
-		(void)(*pDC).RealizePalette();              // .. and make the system use it
+		(*pDC).RealizePalette();              // .. and make the system use it
 	}
 
-	(void)(*pDC).BitBlt(        // repaint the background as it was
+	(*pDC).BitBlt(        // repaint the background as it was
 	    0,
 	    0,
 	    ScrollRect.right,
@@ -440,7 +440,7 @@ void CRules::RefreshBackground(void) {
 	    SRCCOPY);
 
 	if (pScrollPalette != nullptr)                     // map out our palette
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ReleaseDC(pDC);                                 // release the context
 }
@@ -474,7 +474,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		return;
 	}
 
-	(void)(*pBackgroundDC).BitBlt(      // save the entire background
+	(*pBackgroundDC).BitBlt(      // save the entire background
 	    0, 0,
 	    ScrollRect.right,
 	    ScrollRect.bottom,
@@ -482,7 +482,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCCOPY);
 
-	(void)(*pScrollDC).BitBlt(       // copy background to scroll context
+	(*pScrollDC).BitBlt(       // copy background to scroll context
 	    0, 0,                           // ... so we can construct the scroll
 	    ScrollRect.right,               // ... on top of it in a masked manner
 	    ScrollRect.bottom,
@@ -494,7 +494,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 
 	ScrollTopCurlRect = ScrollTopRect;              // record where we're putting the top curl
 
-	(void)(*pScrollDC).BitBlt(       // mask out where the top curl goes
+	(*pScrollDC).BitBlt(       // mask out where the top curl goes
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -502,7 +502,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollTopMaskDC).BitBlt(     // invert the top curl mask
+	(*pScrollTopMaskDC).BitBlt(     // invert the top curl mask
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -510,7 +510,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollTopDC).BitBlt(      // remove transparent area from top curl
+	(*pScrollTopDC).BitBlt(      // remove transparent area from top curl
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -518,7 +518,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollTopMaskDC).BitBlt(     // restore top curl mask
+	(*pScrollTopMaskDC).BitBlt(     // restore top curl mask
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -526,7 +526,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollDC).BitBlt(       // paint top curl into the scroll
+	(*pScrollDC).BitBlt(       // paint top curl into the scroll
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -540,7 +540,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	dstRect.top += ScrollTopRect.bottom;            // ... mid section strip of the scroll
 	dstRect.bottom += ScrollTopRect.bottom;
 
-	(void)(*pScrollMidMaskDC).BitBlt(     // invert the mid section mask
+	(*pScrollMidMaskDC).BitBlt(     // invert the mid section mask
 	    0, 0,
 	    ScrollMidRect.right,
 	    ScrollMidRect.bottom,
@@ -548,7 +548,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollMidDC).BitBlt(      // mask out transparent part of mid section
+	(*pScrollMidDC).BitBlt(      // mask out transparent part of mid section
 	    0, 0,
 	    ScrollMidRect.right,
 	    ScrollMidRect.bottom,
@@ -556,7 +556,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollMidMaskDC).BitBlt(     // reset the mid section mask
+	(*pScrollMidMaskDC).BitBlt(     // reset the mid section mask
 	    0, 0,
 	    ScrollMidRect.right,
 	    ScrollMidRect.bottom,
@@ -565,7 +565,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    DSTINVERT);
 
 	for (i = 0; i < SCROLL_PIECES; i++) {           // build the scroll's mid section srip-wise
-		(void)(*pScrollDC).BitBlt(
+		(*pScrollDC).BitBlt(
 		    dstRect.left,               // mask out where the image will go
 		    dstRect.top + ScrollMidRect.bottom * i,
 		    ScrollMidRect.right,
@@ -574,7 +574,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    0, 0,
 		    SRCAND);
 
-		(void)(*pScrollDC).BitBlt(      // paint in the mid section image
+		(*pScrollDC).BitBlt(      // paint in the mid section image
 		    dstRect.left,
 		    dstRect.top + ScrollMidRect.bottom * i,
 		    ScrollMidRect.right,
@@ -590,7 +590,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	dstRect.bottom = dstRect.top + ScrollBotRect.bottom;
 	ScrollBotCurlRect = dstRect;
 
-	(void)(*pScrollDC).BitBlt(       // mask out where the bottom curl image goes
+	(*pScrollDC).BitBlt(       // mask out where the bottom curl image goes
 	    dstRect.left,
 	    dstRect.top,
 	    ScrollBotRect.right,
@@ -599,7 +599,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollBotMaskDC).BitBlt(     // invert the bottom curl mask
+	(*pScrollBotMaskDC).BitBlt(     // invert the bottom curl mask
 	    0, 0,
 	    ScrollBotRect.right,
 	    ScrollBotRect.bottom,
@@ -607,7 +607,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollBotDC).BitBlt(      // mask out transparent part of curl
+	(*pScrollBotDC).BitBlt(      // mask out transparent part of curl
 	    0, 0,
 	    ScrollBotRect.right,
 	    ScrollBotRect.bottom,
@@ -615,7 +615,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollBotMaskDC).BitBlt(     // reset the mask
+	(*pScrollBotMaskDC).BitBlt(     // reset the mask
 	    0, 0,
 	    ScrollBotRect.right,
 	    ScrollBotRect.bottom,
@@ -623,7 +623,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollDC).BitBlt(       // paint in the bottom curl
+	(*pScrollDC).BitBlt(       // paint in the bottom curl
 	    dstRect.left,
 	    dstRect.top,
 	    ScrollBotRect.right,
@@ -657,7 +657,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 
 		dst2Rect = dstRect;
 
-		(void)(*pWorkDC).BitBlt(      // splat in the background for top curl
+		(*pWorkDC).BitBlt(      // splat in the background for top curl
 		    0, 0,
 		    ScrollTopRect.right,
 		    ScrollTopRect.bottom,
@@ -666,7 +666,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    dst2Rect.top,
 		    SRCCOPY);
 
-		(void)(*pWorkDC).BitBlt(      // mask out where the top curl goes
+		(*pWorkDC).BitBlt(      // mask out where the top curl goes
 		    0, 0,
 		    ScrollTopRect.right,
 		    ScrollTopRect.bottom,
@@ -674,7 +674,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    0, 0,
 		    SRCAND);
 
-		(void)(*pWorkDC).BitBlt(      // insert the top curl background
+		(*pWorkDC).BitBlt(      // insert the top curl background
 		    0, 0,
 		    ScrollTopRect.right,
 		    ScrollTopRect.bottom,
@@ -683,7 +683,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    SRCPAINT);
 
 		if (i == 0) {                               // if first time, just paint curl to display
-			(void)(*pDC).BitBlt(
+			(*pDC).BitBlt(
 			    dst2Rect.left,
 			    dst2Rect.top,
 			    ScrollTopRect.right,
@@ -692,7 +692,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 			    0, 0,
 			    SRCCOPY);
 		} else {
-			(void)(*pWorkDC).BitBlt(     // ... otherwise paint in a new piece of
+			(*pWorkDC).BitBlt(     // ... otherwise paint in a new piece of
 			    dst2Rect.left,          // ... the middle section
 			    ScrollTopRect.bottom,
 			    dst2Rect.right,
@@ -701,7 +701,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 			    dst2Rect.left,
 			    dst2Rect.top + ScrollTopRect.bottom,
 			    SRCCOPY);
-			(void)(*pDC).BitBlt(      // ... then paint it and the curl, thus
+			(*pDC).BitBlt(      // ... then paint it and the curl, thus
 			    dst2Rect.left,          // ... causing the top to seemingly unfurl
 			    dst2Rect.top,           // ... by one more strip
 			    ScrollTopRect.right,
@@ -715,7 +715,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		dst2Rect.bottom = dstRect.bottom;
 
 		if ((i == 0) || ((i == 1) && (h == 1))) {   // if first time or doing last iteration
-			(void)(*pWorkDC).BitBlt(                // ... just paint in the bottom curl
+			(*pWorkDC).BitBlt(                // ... just paint in the bottom curl
 			    0, 0,
 			    dst2Rect.right,
 			    scroll_delta,
@@ -724,7 +724,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 			    dst2Rect.top,
 			    SRCCOPY);
 		} else {                                    //
-			(void)(*pWorkDC).BitBlt(
+			(*pWorkDC).BitBlt(
 			    0, 0,
 			    dst2Rect.right,
 			    scroll_delta,
@@ -734,7 +734,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 			    SRCCOPY);
 		}
 
-		(void)(*pWorkDC).BitBlt(
+		(*pWorkDC).BitBlt(
 		    0,
 		    scroll_delta,
 		    ScrollBotRect.right,
@@ -744,7 +744,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    dst2Rect.top + scroll_delta,
 		    SRCCOPY);
 
-		(void)(*pWorkDC).BitBlt(
+		(*pWorkDC).BitBlt(
 		    0,
 		    scroll_delta,
 		    ScrollBotRect.right,
@@ -753,7 +753,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    0, 0,
 		    SRCAND);
 
-		(void)(*pWorkDC).BitBlt(
+		(*pWorkDC).BitBlt(
 		    0,
 		    scroll_delta,
 		    ScrollBotRect.right,
@@ -762,7 +762,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    0, 0,
 		    SRCPAINT);
 
-		(void)(*pDC).BitBlt(
+		(*pDC).BitBlt(
 		    ScrollBotRect.left,
 		    dst2Rect.top,
 		    ScrollBotRect.right,
@@ -807,7 +807,7 @@ void CRules::UpdateScroll(int nPage) {
 
 	if (pScrollPalette != nullptr) {                   // map in our palette
 		pPalOld = (*pDC).SelectPalette(pScrollPalette, false);
-		(void)(*pDC).RealizePalette();              // .. and make the system use it
+		(*pDC).RealizePalette();              // .. and make the system use it
 	}
 
 	dstRect = ScrollMidRect;                        // setup initial destination for blts
@@ -815,7 +815,7 @@ void CRules::UpdateScroll(int nPage) {
 	dstRect.bottom += ScrollTopRect.bottom;
 
 	for (i = 0; i < SCROLL_PIECES; i++) {           // repaint the scroll midsection artwork
-		(void)(*pScrollDC).BitBlt(      // ... mask out where artwork goes
+		(*pScrollDC).BitBlt(      // ... mask out where artwork goes
 		    dstRect.left,
 		    dstRect.top + ScrollMidRect.bottom * i,
 		    ScrollMidRect.right,
@@ -824,7 +824,7 @@ void CRules::UpdateScroll(int nPage) {
 		    0, 0,
 		    SRCAND);
 
-		(void)(*pScrollDC).BitBlt(      // ... paint in the scroll artwork
+		(*pScrollDC).BitBlt(      // ... paint in the scroll artwork
 		    dstRect.left,
 		    dstRect.top + ScrollMidRect.bottom * i,
 		    ScrollMidRect.right,
@@ -836,7 +836,7 @@ void CRules::UpdateScroll(int nPage) {
 
 	WritePage(pScrollDC, nPage);                    // construct the new page of text
 
-	(void)(*pDC).BitBlt(        // paint the result to the sceen
+	(*pDC).BitBlt(        // paint the result to the sceen
 	    TEXT_LEFT_MARGIN,
 	    ScrollTopRect.bottom + TEXT_TOP_MARGIN,
 	    TEXT_WIDTH,
@@ -849,7 +849,7 @@ void CRules::UpdateScroll(int nPage) {
 	UpdateMore(pDC);                                // update the "more" indicator
 
 	if (pScrollPalette != nullptr)                     // map out our palette
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ReleaseDC(pDC);
 }
@@ -987,7 +987,7 @@ crop_byte:
 			break;
 	}
 
-	(void)(*pDC).SelectObject(pFontOld);
+	(*pDC).SelectObject(pFontOld);
 
 	dwHelpPagePosition[nPage + 1] += i + nCropped;
 	dwHelpPageEOL[nPage + 1] = bEOL;
@@ -1016,7 +1016,7 @@ crop_byte:
 	if (bEOF && (i >= (int) nCount))
 		bHelpEOF = true;
 
-	(void)(*pDC).SelectObject(pFontOld);
+	(*pDC).SelectObject(pFontOld);
 
 }
 
@@ -1041,7 +1041,7 @@ void CRules::UpdateMore(CDC *pDC) {
 	dy = fontMetrics.tmHeight;
 
 	if (nHelpPage == 0)
-		(void)(*pDC).BitBlt(
+		(*pDC).BitBlt(
 		    x,
 		    y,
 		    dx,
@@ -1059,7 +1059,7 @@ void CRules::UpdateMore(CDC *pDC) {
 	    TEXT_MORE_DY;
 
 	if (bHelpEOF)
-		(void)(*pDC).BitBlt(
+		(*pDC).BitBlt(
 		    x,
 		    y,
 		    dx,
@@ -1071,7 +1071,7 @@ void CRules::UpdateMore(CDC *pDC) {
 	else
 		(*pDC).TextOut(x, y, MORE_TEXT_BLURB, MORE_TEXT_LENGTH);
 
-	(void)(*pDC).SelectObject(pFontOld);
+	(*pDC).SelectObject(pFontOld);
 }
 
 
@@ -1243,7 +1243,7 @@ CDC *CRules::SetupMask(CDC *pDC, CDC *pBitmapDC, CBitmap *pMask, CBitmap * &pMas
 	        (*pNewDC).CreateCompatibleDC(pDC)) {
 		pMaskOld = (*pNewDC).SelectObject(pMask);
 		if (pMaskOld != nullptr) {
-			(void)(*pNewDC).BitBlt(
+			(*pNewDC).BitBlt(
 			    0, 0,
 			    (*pRect).right,
 			    (*pRect).bottom,
@@ -1271,7 +1271,7 @@ CDC *CRules::SetupCompatibleContext(CDC *pDC, CBitmap *pBitmap,
 			pPalOld = (*pNewDC).SelectPalette(pPalette, false);
 		else
 			pPalOld = nullptr;
-		(void)(*pNewDC).RealizePalette();
+		(*pNewDC).RealizePalette();
 		pBitmapOld = (*pNewDC).SelectObject(pBitmap);
 		if (pBitmapOld != nullptr)
 			return (pNewDC);
@@ -1283,12 +1283,12 @@ CDC *CRules::SetupCompatibleContext(CDC *pDC, CBitmap *pBitmap,
 
 void CRules::ReleaseCompatibleContext(CDC *&pDC, CBitmap * &pBitmap, CBitmap *pBitmapOld, CPalette *pPalOld) {
 	if (pBitmapOld != nullptr) {
-		(void)(*pDC).SelectObject(pBitmapOld);
+		(*pDC).SelectObject(pBitmapOld);
 		pBitmapOld = nullptr;
 	}
 
 	if (pPalOld != nullptr) {
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 		pPalOld = nullptr;
 	}
 
@@ -1421,21 +1421,21 @@ bool CRules::OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message
 }
 
 
-void CRules::DoWaitCursor(void) {
+void CRules::DoWaitCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).BeginWaitCursor();
+	(*pMyApp).BeginWaitCursor();
 }
 
 
-void CRules::DoArrowCursor(void) {
+void CRules::DoArrowCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).EndWaitCursor();
+	(*pMyApp).EndWaitCursor();
 }
 
 } // namespace HodjNPodj
diff --git a/engines/bagel/hodjnpodj/hnplibs/rules.h b/engines/bagel/hodjnpodj/hnplibs/rules.h
index 8580c0fa477..4d2831c422b 100644
--- a/engines/bagel/hodjnpodj/hnplibs/rules.h
+++ b/engines/bagel/hodjnpodj/hnplibs/rules.h
@@ -42,13 +42,13 @@ public:
 	       CPalette *pPalette = nullptr, const char *pszSoundPath = nullptr);
 
 	void UpdateScroll(int nPage);
-	void ClearDialogImage(void);
-	void RefreshBackground(void);
+	void ClearDialogImage();
+	void RefreshBackground();
 
 private:
 
-	bool SetupKeyboardHook(void);
-	void RemoveKeyboardHook(void);
+	bool SetupKeyboardHook();
+	void RemoveKeyboardHook();
 
 	static  CDibDoc *LoadScrollDIB(const char *pSpec, CRect *pRect);
 	static  bool PaintScrollDIB(CDC *pDC, CDibDoc *pDibDoc);
@@ -61,11 +61,11 @@ private:
 	void UnfurlScroll(CDC *pDC);
 	void UpdateMore(CDC *pDC);
 	void WritePage(CDC *pDC, int nPage);
-	void DoWaitCursor(void);
+	void DoWaitCursor();
 	void DoWaitCursor(int nCode) override {
 		CDialog::DoWaitCursor(nCode);
 	}
-	void DoArrowCursor(void);
+	void DoArrowCursor();
 	void Sleep(clock_t wait);
 
 private:
@@ -92,12 +92,12 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(CRules)
 	afx_msg int  OnCreate(LPCREATESTRUCT lpCreateStruct);
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 	afx_msg bool OnEraseBkgnd(CDC *pDC);
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
-	afx_msg void OnDestroy(void);
-	afx_msg void OnPaint(void);
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
+	afx_msg void OnDestroy();
+	afx_msg void OnPaint();
 	afx_msg void OnShowWindow(bool bShow, unsigned int nStatus);
 	afx_msg void OnSize(unsigned int nType, int cx, int cy);
 	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
diff --git a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
index 7161a9fd203..e7fd5e7df48 100644
--- a/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/sprite.cpp
@@ -142,7 +142,7 @@ CSprite::~CSprite() {
  *
  ************************************************************************/
 
-void CSprite::LinkSprite(void) {
+void CSprite::LinkSprite() {
 	m_bLinked = true;                                   // set for linked into chain
 
 	if ((m_pPrev != nullptr) ||                            // punt if already in chain
@@ -170,7 +170,7 @@ void CSprite::LinkSprite(void) {
  *
  ************************************************************************/
 
-void CSprite::UnlinkSprite(void) {
+void CSprite::UnlinkSprite() {
 	m_bLinked = false;                                  // set for not linked into chain
 
 	if ((m_pPrev == nullptr) &&                            // punt if not in chain
@@ -203,7 +203,7 @@ void CSprite::UnlinkSprite(void) {
  *
  ************************************************************************/
 
-void CSprite::FlushSpriteChain(void) {
+void CSprite::FlushSpriteChain() {
 	CSprite *pSprite = nullptr;
 
 	while ((pSprite = CSprite::GetSpriteChain()) != nullptr) { // cycle getting head of chain
@@ -257,7 +257,7 @@ bool CSprite::SetBackdrop(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap) {
  *
  ************************************************************************/
 
-void CSprite::ClearBackdrop(void) {
+void CSprite::ClearBackdrop() {
 	ReleaseBackdropDC();                                // unmap any resources
 
 	if (m_pBackdrop != nullptr) {                          // delete the backdrop bitmap
@@ -303,13 +303,13 @@ bool CSprite::RefreshBackdrop(CDC *pDC, CPalette *pPalette) {
 
 	if (pPalette != nullptr) {                         // map in our palette
 		pPalOld = (*pDC).SelectPalette(pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 	// zap it to the screen
 	bSuccess = (*pDC).BitBlt(0, 0, GAME_WIDTH, GAME_HEIGHT, m_pBackdropDC, 0, 0, SRCCOPY);
 
 	if (pPalOld != nullptr)                            // map out the palette
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ReleaseBackdropDC();                            // release backdrop context resources
 
@@ -376,7 +376,7 @@ bool CSprite::DuplicateSprite(CDC *pDC, CSprite *pSprite) {
 
 	if (m_pPalette) {
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	if (pSprite != nullptr) {                                  // only duplicate visible sprites                                   // ... unable to create that object
@@ -384,7 +384,7 @@ bool CSprite::DuplicateSprite(CDC *pDC, CSprite *pSprite) {
 			if (m_bRetainContexts) {
 				if (!SetupImage(pDC))
 					return false;
-				(void) SetupMask(pDC);
+				SetupMask(pDC);
 				(*pSprite).m_pImageDC = m_pImageDC;
 				(*pSprite).m_pImageOld = m_pImageOld;
 				(*pSprite).m_pMaskDC = m_pMaskDC;
@@ -424,7 +424,7 @@ bool CSprite::DuplicateSprite(CDC *pDC, CSprite *pSprite) {
 			if (!m_bMasked || CreateMask(pDC)) {                // create an image mask if needed
 				(*pSprite).m_pMask = m_pMask;
 				if (m_pPalette)
-					(void)(*pDC).SelectPalette(pPalOld, false);
+					(*pDC).SelectPalette(pPalOld, false);
 				return true;
 			}
 		} else
@@ -432,7 +432,7 @@ bool CSprite::DuplicateSprite(CDC *pDC, CSprite *pSprite) {
 	}
 
 	if (m_pPalette)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return false;
 }
@@ -484,7 +484,7 @@ bool CSprite::LoadSprite(CDC *pDC, const char *pszPathName) {
 			m_pPalette = (*myDib).DetachPalette();      // ... detach the DIB's palette for our use
 		if (m_pPalette != nullptr) {
 			pPalOld = (*pDC).SelectPalette(m_pPalette, false);
-			(void)(*pDC).RealizePalette();
+			(*pDC).RealizePalette();
 			hPalette = (HPALETTE)(*m_pPalette).m_hObject;
 		}
 		if (CreateImageContext(pDC)) {
@@ -497,7 +497,7 @@ bool CSprite::LoadSprite(CDC *pDC, const char *pszPathName) {
 
 			if ((*m_pImage).m_hObject != nullptr) {        // verify the conversion was successful
 				if (pPalOld != nullptr)
-					(void)(*pDC).SelectPalette(pPalOld, false);
+					(*pDC).SelectPalette(pPalOld, false);
 				if (!m_bRetainContexts)                  // release the context if not optimizing
 					ReleaseImageContext();
 				m_cSize = (*myDib).GetDocSize();        // ... size related variables
@@ -514,7 +514,7 @@ bool CSprite::LoadSprite(CDC *pDC, const char *pszPathName) {
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ClearImage();
 
@@ -655,7 +655,7 @@ bool CSprite::LoadResourceSprite(CDC *pDC, const char *pszName) {
 			m_pPalette = (*myDib).DetachPalette();      // ... detach the DIB's palette for our use
 		if (m_pPalette != nullptr) {
 			pPalOld = (*pDC).SelectPalette(m_pPalette, false);
-			(void)(*pDC).RealizePalette();
+			(*pDC).RealizePalette();
 			hPalette = (HPALETTE)(*m_pPalette).m_hObject;
 		}
 		if (CreateImageContext(pDC)) {
@@ -666,7 +666,7 @@ bool CSprite::LoadResourceSprite(CDC *pDC, const char *pszName) {
 			    hDib);   // ... and store it in the sprite
 			if ((*m_pImage).m_hObject != nullptr) {        // verify the conversion was sucessfull
 				if (pPalOld != nullptr)
-					(void)(*pDC).SelectPalette(pPalOld, false);
+					(*pDC).SelectPalette(pPalOld, false);
 				if (!m_bRetainContexts)                  // release the context if not optimizing
 					ReleaseImageContext();
 				m_cSize = (*myDib).GetDocSize();        // ... size related variables
@@ -683,7 +683,7 @@ bool CSprite::LoadResourceSprite(CDC *pDC, const char *pszName) {
 	}
 
 	if (pPalOld != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ClearImage();
 
@@ -884,16 +884,16 @@ bool CSprite::SetupCels(const int nCels) {
 bool CSprite::SetPalette(CPalette *pPalette) {
 	if (m_pImageDC != nullptr) {                               // if we already have a palette we must
 		if (m_pImage != nullptr)                               // ... first map out any existing image
-			(void)(*m_pImageDC).SelectObject(m_pImageOld);  // ... then map out the old palette
+			(*m_pImageDC).SelectObject(m_pImageOld);  // ... then map out the old palette
 		if (m_pPalette != nullptr)
-			(void)(*m_pImageDC).SelectPalette(m_pPalImageOld, false);
+			(*m_pImageDC).SelectPalette(m_pPalImageOld, false);
 	}
 
 	if (m_pBackgroundDC != nullptr) {                          // similarly we need to map out our background
 		if (m_pBackground != nullptr)                          // ... bitmap as well
-			(void)(*m_pBackgroundDC).SelectObject(m_pBackgroundOld);
+			(*m_pBackgroundDC).SelectObject(m_pBackgroundOld);
 		if (m_pPalette != nullptr)                             // .. then map out the palette
-			(void)(*m_pBackgroundDC).SelectPalette(m_pPalBackOld, false);
+			(*m_pBackgroundDC).SelectPalette(m_pPalBackOld, false);
 	}
 
 	ClearPalette();                                         // release existing palette
@@ -903,7 +903,7 @@ bool CSprite::SetPalette(CPalette *pPalette) {
 		return true;
 
 	m_pPalImageOld = (*m_pImageDC).SelectPalette(m_pPalette, false); // map in the new palette and then
-	(void)(*m_pImageDC).RealizePalette();                           // ... tell the system to use it
+	(*m_pImageDC).RealizePalette();                           // ... tell the system to use it
 
 	if (m_pImage != nullptr) {
 		m_pImageOld = (*m_pImageDC).SelectObject(m_pImage);     // map in our image bitmap if it exists
@@ -915,7 +915,7 @@ bool CSprite::SetPalette(CPalette *pPalette) {
 		return true;
 
 	m_pPalBackOld = (*m_pBackgroundDC).SelectPalette(m_pPalette, false); // map in the new palette and then
-	(void)(*m_pBackgroundDC).RealizePalette();                          // ... tell the system to use it
+	(*m_pBackgroundDC).RealizePalette();                          // ... tell the system to use it
 
 	if (m_pBackground != nullptr) {
 		m_pBackgroundOld = (*m_pBackgroundDC).SelectObject(m_pBackground);      // map in our background
@@ -1107,7 +1107,7 @@ bool CSprite::UpdateSprite(CDC *pDC) {
 
 	if (m_pPalette != nullptr) {
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);  // map in a palette if present
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}                    // ... and tell the system we did that
 
 	if (m_bMasked)                                          // if masked, then paint the sprite, masking out
@@ -1129,7 +1129,7 @@ bool CSprite::UpdateSprite(CDC *pDC) {
 	}
 
 	if (m_pPalette != nullptr)                                 // map back the previous palette if needed
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return bSuccess;
 }
@@ -1179,7 +1179,7 @@ bool CSprite::DoSpritePainting(CDC * pDC, CPoint cPoint) {
 		        (*pDC2).CreateCompatibleDC(pDC)) {
 			if (m_pPalette != nullptr) {                   // map in a palette if available
 				pPal2Old = (*pDC2).SelectPalette(m_pPalette, false); // ... and for the background work area
-				(void)(*pDC2).RealizePalette();
+				(*pDC2).RealizePalette();
 			}                   // ... make it real too
 			if ((*pBitmap2).CreateCompatibleBitmap(pDC, m_cSize.cx, m_cSize.cy)) {
 				pBitmap2Old = (*pDC2).SelectObject(pBitmap2);
@@ -1187,12 +1187,12 @@ bool CSprite::DoSpritePainting(CDC * pDC, CPoint cPoint) {
 					if (m_bHaveBackdrop) {              // get background image, either from
 						if (GetBackdropDC(pDC) == nullptr) // .. the backdrop or the sprite itselt
 							goto punt;
-						(void)(*pDC2).BitBlt(0, 0, m_cSize.cx, m_cSize.cy, m_pBackdropDC, cPoint.x, cPoint.y, SRCCOPY);
+						(*pDC2).BitBlt(0, 0, m_cSize.cx, m_cSize.cy, m_pBackdropDC, cPoint.x, cPoint.y, SRCCOPY);
 						ReleaseBackdropDC();
 					} else
-						(void)(*pDC2).BitBlt(0, 0, m_cSize.cx, m_cSize.cy, pDC, cPoint.x, cPoint.y, SRCCOPY); // get the sprite's background image
-					(void)(*pDC2).BitBlt(0, 0, m_cSize.cx, m_cSize.cy, m_pMaskDC, m_cImageRect.left, m_cImageRect.top, SRCAND); // ... mask out where sprite will go
-					(void)(*pDC2).BitBlt(0, 0, m_cSize.cx, m_cSize.cy, m_pImageDC, m_cImageRect.left, m_cImageRect.top, SRCPAINT); // combine image with background
+						(*pDC2).BitBlt(0, 0, m_cSize.cx, m_cSize.cy, pDC, cPoint.x, cPoint.y, SRCCOPY); // get the sprite's background image
+					(*pDC2).BitBlt(0, 0, m_cSize.cx, m_cSize.cy, m_pMaskDC, m_cImageRect.left, m_cImageRect.top, SRCAND); // ... mask out where sprite will go
+					(*pDC2).BitBlt(0, 0, m_cSize.cx, m_cSize.cy, m_pImageDC, m_cImageRect.left, m_cImageRect.top, SRCPAINT); // combine image with background
 					bSuccess = (*pDC).BitBlt(cPoint.x, cPoint.y, m_cSize.cx, m_cSize.cy, pDC2, 0, 0, SRCCOPY); // paint result to the screen
 				}
 			}
@@ -1200,7 +1200,7 @@ bool CSprite::DoSpritePainting(CDC * pDC, CPoint cPoint) {
 
 punt:
 		if (pBitmap2Old != nullptr)                        // now release the temporary resources we used
-			(void)(*pDC2).SelectObject(pBitmap2Old);
+			(*pDC2).SelectObject(pBitmap2Old);
 
 		if (pBitmap2 != nullptr) {
 			(*pBitmap2).DeleteObject();
@@ -1208,7 +1208,7 @@ punt:
 		}
 
 		if (pPal2Old != nullptr)
-			(void)(*pDC2).SelectPalette(pPal2Old, false);
+			(*pDC2).SelectPalette(pPal2Old, false);
 
 		if (pDC2 != nullptr) {
 			(*pDC2).DeleteDC();
@@ -1265,7 +1265,7 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 
 	if (m_pPalette != nullptr) {                               // if there is a palette
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);  // ... select it into the context
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}                    // ... and tell the system about it
 
 	unionRect = m_cRect;                                // the work area is defined by our sprite
@@ -1285,7 +1285,7 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 	if (workDC.CreateCompatibleDC(pDC)) {               // setup the work area context
 		if (m_pPalette != nullptr) {                       // if we have a palette, map it into the work context
 			pPalOldWork = workDC.SelectPalette(m_pPalette, false);
-			(void) workDC.RealizePalette();
+			workDC.RealizePalette();
 		}                // ... and tell the system to use it
 		pBitmapOldWork = workDC.SelectObject(pBitmap);      // now map in the bitmap into that context
 		if (pBitmapOldWork != nullptr) {                       // next copy the image enclosed by the rectangle
@@ -1304,9 +1304,9 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 				if (!bSuccess)
 					goto punt;
 			} else {
-				(void) workDC.BitBlt(0, 0, dx, dy, pDC, unionRect.left, unionRect.top, SRCCOPY); // ... into the bitmap
+				workDC.BitBlt(0, 0, dx, dy, pDC, unionRect.left, unionRect.top, SRCCOPY); // ... into the bitmap
 				if (SetupBackground(pDC)) {
-					(void) workDC.BitBlt(m_cPosition.x - unionRect.left,    // restore the background where the sprite was
+					workDC.BitBlt(m_cPosition.x - unionRect.left,    // restore the background where the sprite was
 					                     m_cPosition.y - unionRect.top,
 					                     m_cSize.cx,
 					                     m_cSize.cy,
@@ -1314,7 +1314,7 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 					                     0,
 					                     0,
 					                     SRCCOPY);
-					(void)(*m_pBackgroundDC).BitBlt(0,      // save the background where the sprite will be
+					(*m_pBackgroundDC).BitBlt(0,      // save the background where the sprite will be
 					                                0,
 					                                m_cSize.cx,
 					                                m_cSize.cy,
@@ -1334,7 +1334,7 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 			            SetupImage(pDC));
 			if (bSuccess) {
 				if (m_bMasked) {                            // need to do a masked copy ...
-					(void) workDC.BitBlt(cPoint.x,          // ... mask out where sprite goes
+					workDC.BitBlt(cPoint.x,          // ... mask out where sprite goes
 					                     cPoint.y,
 					                     m_cSize.cx,
 					                     m_cSize.cy,
@@ -1342,7 +1342,7 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 					                     m_cImageRect.left,
 					                     m_cImageRect.top,
 					                     SRCAND);
-					(void) workDC.BitBlt(cPoint.x,          // ... paint in the sprite
+					workDC.BitBlt(cPoint.x,          // ... paint in the sprite
 					                     cPoint.y,
 					                     m_cSize.cx,
 					                     m_cSize.cy,
@@ -1351,7 +1351,7 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 					                     m_cImageRect.top,
 					                     SRCPAINT);
 				} else                                      // just paint in the sprite
-					(void) workDC.BitBlt(cPoint.x,
+					workDC.BitBlt(cPoint.x,
 					                     cPoint.y,
 					                     m_cSize.cx,
 					                     m_cSize.cy,
@@ -1367,7 +1367,7 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 			}
 
 			if (bSuccess) {
-				(void)(*pDC).BitBlt(unionRect.left,
+				(*pDC).BitBlt(unionRect.left,
 				                    unionRect.top,
 				                    dx,
 				                    dy,
@@ -1375,10 +1375,10 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 				                    0,
 				                    0,
 				                    SRCCOPY);
-				(void) workDC.SelectObject(pBitmapOldWork);     // tear down the work area's bitmap, palette
+				workDC.SelectObject(pBitmapOldWork);     // tear down the work area's bitmap, palette
 				if (m_pPalette != nullptr) {                           // ... and device context, as well as the
-					(void) workDC.SelectPalette(pPalOldWork, false); // ... destination's palette
-					(void)(*pDC).SelectPalette(pPalOld, false);
+					workDC.SelectPalette(pPalOldWork, false); // ... destination's palette
+					(*pDC).SelectPalette(pPalOld, false);
 				}
 				workDC.DeleteDC();
 				(*pBitmap).DeleteObject();
@@ -1391,9 +1391,9 @@ bool CSprite::DoOptimizedPainting(CDC *pDC, CRect *pDstRect) {
 punt:
 
 	if (pBitmapOldWork != nullptr)                             // we failed, so tear down the resources used
-		(void) workDC.SelectObject(pBitmapOldWork);         // ... map out the bitmap
+		workDC.SelectObject(pBitmapOldWork);         // ... map out the bitmap
 	if (pPalOldWork != nullptr)                                // ... map out the palette
-		(void) workDC.SelectPalette(pPalOldWork, false);
+		workDC.SelectPalette(pPalOldWork, false);
 	if (workDC.m_hDC != nullptr)                               // ... release the context
 		workDC.DeleteDC();
 
@@ -1401,7 +1401,7 @@ punt:
 	delete pBitmap;
 
 	if (pPalOld != nullptr)                                    // map out the palette from the output context
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return false;
 }
@@ -1436,13 +1436,13 @@ bool CSprite::DoOverlapPainting(CDC *pDC, CRect *myRect) {
 
 	if (m_pPalette != nullptr) {                               // if there is a palette
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);  // ... select it into the context
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}                    // ... and tell the system about it
 
 	bSuccess = ReconstructBackground(pDC, myRect);          // go do the actual painting
 
 	if (m_pPalette != nullptr)                                 // map out the palette
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return bSuccess;
 }
@@ -1480,7 +1480,7 @@ bool CSprite::RefreshBackground(CDC *pDC) {
 
 	if (m_pPalette != nullptr) {                               // map a palette to the destination context
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);  // ... if available
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	if (m_bOverlaps)                                        // paint the background bitmap to the device
@@ -1502,7 +1502,7 @@ bool CSprite::RefreshBackground(CDC *pDC) {
 	}
 
 	if (m_pPalette != nullptr)                                 // map out the palette from the destination
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	m_bPositioned = false;                                  // no real position now
 	m_nZPosition = m_nZOrder;                               // reset z ordering
@@ -1545,7 +1545,7 @@ bool CSprite::SaveBackground(CDC *pDC) {
 
 	if (m_pPalette != nullptr) {                           // map a palette to the destination context
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	bSuccess = SetupBackground(pDC);                    // grab the background bitmap
@@ -1556,7 +1556,7 @@ bool CSprite::SaveBackground(CDC *pDC) {
 	}
 
 	if (m_pPalette != nullptr)                             // map out palette from destination context
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return bSuccess;
 }
@@ -1717,9 +1717,9 @@ bool CSprite::ReconstructBackground(CDC *pDC, CRect *myRect) {
 	if (workDC.CreateCompatibleDC(pDC)) {               // create a device context to contain our
 		if (m_pPalette != nullptr) {                       // ... work area and map in the palette
 			pPalOldWork = workDC.SelectPalette(m_pPalette, false);
-			(void) workDC.RealizePalette();
+			workDC.RealizePalette();
 			pPalOld = (*pDC).SelectPalette(m_pPalette, false);
-			(void)(*pDC).RealizePalette();
+			(*pDC).RealizePalette();
 		}
 		pBitmapOld = workDC.SelectObject(pBitmap);      // map our bitmap into the work area
 		if (pBitmapOld != nullptr) {                       // now need to create the original background
@@ -1911,7 +1911,7 @@ paint_sprite:
 						           (*pSprite).SetupImage(pDC);
 						if (bSuccess) {
 							if ((*pSprite).m_bMasked) {                             // need to do a masked transfer ...
-								(void) workDC.BitBlt(cPoint.x,                      // ... mask away where image will go
+								workDC.BitBlt(cPoint.x,                      // ... mask away where image will go
 								                     cPoint.y,
 								                     (*pSprite).m_cSize.cx,
 								                     (*pSprite).m_cSize.cy,
@@ -1922,7 +1922,7 @@ paint_sprite:
 								#if SPRITE_DEBUG
 								bSuccess = (*pDC).BitBlt(viewOrigin.x, viewOrigin.y, dx, dy, &workDC, 0, 0, SRCCOPY);
 								#endif
-								(void) workDC.BitBlt(cPoint.x,                      // ... paint image into cleared area
+								workDC.BitBlt(cPoint.x,                      // ... paint image into cleared area
 								                     cPoint.y,
 								                     (*pSprite).m_cSize.cx,
 								                     (*pSprite).m_cSize.cy,
@@ -1934,7 +1934,7 @@ paint_sprite:
 								bSuccess = (*pDC).BitBlt(viewOrigin.x, viewOrigin.y, dx, dy, &workDC, 0, 0, SRCCOPY);
 								#endif
 							} else {
-								(void) workDC.BitBlt(cPoint.x,                      // just paint the image
+								workDC.BitBlt(cPoint.x,                      // just paint the image
 								                     cPoint.y,
 								                     (*pSprite).m_cSize.cx,
 								                     (*pSprite).m_cSize.cy,
@@ -1961,7 +1961,7 @@ paint_sprite:
 				pSprite = (*pSprite).m_pZPrev;
 			}
 
-			(void)(*pDC).BitBlt(baseRect.left,                  // paint only the part of the work area
+			(*pDC).BitBlt(baseRect.left,                  // paint only the part of the work area
 			                    baseRect.top,                   // ... spanned by our sprites source
 			                    baseRect.right - baseRect.left, // ... and destination locations to
 			                    baseRect.bottom - baseRect.top, // ... the screen; i.e. doing the whole
@@ -1970,10 +1970,10 @@ paint_sprite:
 			                    baseRect.top - unionRect.top,
 			                    SRCCOPY);
 
-			(void) workDC.SelectObject(pBitmapOld);     // tear down the work area's bitmap, palette
+			workDC.SelectObject(pBitmapOld);     // tear down the work area's bitmap, palette
 			if (m_pPalette != nullptr) {                           // ... and device context, as well as the
-				(void) workDC.SelectPalette(pPalOldWork, false); // ... destination's palette
-				(void)(*pDC).SelectPalette(pPalOld, false);
+				workDC.SelectPalette(pPalOldWork, false); // ... destination's palette
+				(*pDC).SelectPalette(pPalOld, false);
 			}
 			workDC.DeleteDC();
 			(*pBitmap).DeleteObject();
@@ -1985,9 +1985,9 @@ paint_sprite:
 punt:
 
 	if (pBitmapOld != nullptr)                             // we failed, so tear down the resources used
-		(void) workDC.SelectObject(pBitmapOld);         // ... map out the bitmap
+		workDC.SelectObject(pBitmapOld);         // ... map out the bitmap
 	if (pPalOldWork != nullptr)                            // ... map out the palette
-		(void) workDC.SelectPalette(pPalOldWork, false);
+		workDC.SelectPalette(pPalOldWork, false);
 	if (workDC.m_hDC != nullptr)                           // ... release the context
 		workDC.DeleteDC();
 
@@ -1995,7 +1995,7 @@ punt:
 	delete pBitmap;
 
 	if (pPalOld != nullptr)                                // map out the palette from the output context
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return false;
 }
@@ -2251,7 +2251,7 @@ bool CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint *pPoint) {
 			bdy = m_cSize.cy;
 			bSuccess = SetupMask(pDC);
 			if (bSuccess) {
-				(void)(*cDC1).BitBlt(bx, by, bdx, bdy, m_pMaskDC, m_cImageRect.left, m_cImageRect.top, NOTSRCCOPY); // get sprite 1's mask
+				(*cDC1).BitBlt(bx, by, bdx, bdy, m_pMaskDC, m_cImageRect.left, m_cImageRect.top, NOTSRCCOPY); // get sprite 1's mask
 				if (!m_bRetainContexts)
 					ReleaseMaskContext();
 				bx = (*pSprite).m_cPosition.x - unionRect.left;     // get positioning information for sprite 2
@@ -2260,11 +2260,11 @@ bool CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint *pPoint) {
 				bdy = (*pSprite).m_cSize.cy;
 				bSuccess = (*pSprite).SetupMask(pDC);
 				if (bSuccess) {
-					(void)(*cDC2).BitBlt(bx, by, bdx, bdy, (*pSprite).m_pMaskDC, (*pSprite).m_cImageRect.left, (*pSprite).m_cImageRect.top, NOTSRCCOPY); // get sprite 2's mask
+					(*cDC2).BitBlt(bx, by, bdx, bdy, (*pSprite).m_pMaskDC, (*pSprite).m_cImageRect.left, (*pSprite).m_cImageRect.top, NOTSRCCOPY); // get sprite 2's mask
 					if (!(*pSprite).m_bRetainContexts)
 						(*pSprite).ReleaseMaskContext();
-					(void)(*cDC1).BitBlt(0, 0, dx, dy, cDC2, 0, 0, SRCAND); // logically AND the masks together
-					(void)(*cDC1).SelectObject(pBitmap1Old);            // ... leaving bits set where they overlap
+					(*cDC1).BitBlt(0, 0, dx, dy, cDC2, 0, 0, SRCAND); // logically AND the masks together
+					(*cDC1).SelectObject(pBitmap1Old);            // ... leaving bits set where they overlap
 					pBitmap1Old = nullptr;
 					(*pBitmap1).GetBitmapBits(dwN, chPixels); // fetch the image we created
 					(*pBitmap1).GetObject(sizeof(BITMAP), &cBitmapData); // .. get the scanline length
@@ -2294,9 +2294,9 @@ bool CSprite::SpritesOverlap(CDC * pDC, CSprite * pSprite, CPoint *pPoint) {
 		free(chPixels);                                 // free up the work area's bitmap
 
 	if (pBitmap1Old != nullptr)                            // map out the bitmaps we used
-		(void)(*cDC1).SelectObject(pBitmap1Old);
+		(*cDC1).SelectObject(pBitmap1Old);
 	if (pBitmap2Old != nullptr)
-		(void)(*cDC2).SelectObject(pBitmap2Old);
+		(*cDC2).SelectObject(pBitmap2Old);
 
 	if (pBitmap1 != nullptr) {                             // delete the bitmap resources and objects
 		(*pBitmap1).DeleteObject();
@@ -2526,7 +2526,7 @@ bool CSprite::CreateMask(CDC *pDC) {
 		if ((*m_pMask).CreateBitmap(mySize.cx, mySize.cy, 1, 1, nullptr)) { // create mask bitmap
 			m_pMaskOld = (*m_pMaskDC).SelectObject(m_pMask);    // map bitmap into context
 			if (m_pMaskOld) {
-				(void)(*m_pMaskDC).BitBlt(0,            // copy in the image, doing an inversion
+				(*m_pMaskDC).BitBlt(0,            // copy in the image, doing an inversion
 				                          0,              // ... so that we can mask out the sprite's
 				                          mySize.cx,      // ... transparent area
 				                          mySize.cy,
@@ -2534,7 +2534,7 @@ bool CSprite::CreateMask(CDC *pDC) {
 				                          0,
 				                          0,
 				                          NOTSRCCOPY);
-				(void)(*m_pImageDC).BitBlt(0,           // remove transparent area from sprite image
+				(*m_pImageDC).BitBlt(0,           // remove transparent area from sprite image
 				                           0,
 				                           mySize.cx,
 				                           mySize.cy,
@@ -2542,7 +2542,7 @@ bool CSprite::CreateMask(CDC *pDC) {
 				                           0,
 				                           0,
 				                           SRCAND);
-				(void)(*m_pMaskDC).BitBlt(0,            // invert mask again so it can be used later
+				(*m_pMaskDC).BitBlt(0,            // invert mask again so it can be used later
 				                          0,              // ... to mask away the sprite image area
 				                          mySize.cx,      // ... from the background for each new
 				                          mySize.cy,      // ... destination
@@ -2762,7 +2762,7 @@ bool CSprite::CreateImageContext(CDC * pDC) {
 		}
 		if ((m_pPalette != nullptr) && (m_pPalImageOld == nullptr)) { // map in palette if present
 			m_pPalImageOld = (*m_pImageDC).SelectPalette(m_pPalette, false);
-			(void)(*m_pImageDC).RealizePalette();
+			(*m_pImageDC).RealizePalette();
 		}
 		return true;
 	}
@@ -2801,7 +2801,7 @@ bool CSprite::CreateBackgroundContext(CDC * pDC) {
 		}
 		if ((m_pPalette != nullptr) && (m_pPalBackOld == nullptr)) {  // map in palette if present
 			m_pPalBackOld = (*m_pBackgroundDC).SelectPalette(m_pPalette, false);
-			(void)(*m_pBackgroundDC).RealizePalette();
+			(*m_pBackgroundDC).RealizePalette();
 		}
 		return true;
 	}
@@ -2859,15 +2859,15 @@ bool CSprite::CreateMaskContext(CDC * pDC) {
  *
  ************************************************************************/
 
-void CSprite::ReleaseImageContext(void) {
+void CSprite::ReleaseImageContext() {
 	if (!m_bVisible)                                    // punt if not visible
 		return;
 
 	if (m_pImageDC != nullptr) {                           // if there is an image device context
 		if (m_pImageOld != nullptr)                        // ... map out existing bitmap
-			(void)(*m_pImageDC).SelectObject(m_pImageOld);
+			(*m_pImageDC).SelectObject(m_pImageOld);
 		if (m_pPalImageOld != nullptr)                     // ... map out the palette
-			(void)(*m_pImageDC).SelectPalette(m_pPalImageOld, false);
+			(*m_pImageDC).SelectPalette(m_pPalImageOld, false);
 		(*m_pImageDC).DeleteDC();                       // ... release the context
 		delete m_pImageDC;                              // ... then delete the device context
 
@@ -2890,17 +2890,17 @@ void CSprite::ReleaseImageContext(void) {
  *
  ************************************************************************/
 
-void CSprite::ReleaseBackgroundContext(void) {
+void CSprite::ReleaseBackgroundContext() {
 	if (!m_bVisible || m_bHaveBackdrop)                 // punt if not visible or have backdrop
 		return;
 
 	if (m_pBackgroundDC != nullptr) {                      // if there is a background device context
 		if (m_pBackgroundOld != nullptr) {                 // ... map out existing bitmap
-			(void)(*m_pBackgroundDC).SelectObject(m_pBackgroundOld);
+			(*m_pBackgroundDC).SelectObject(m_pBackgroundOld);
 			m_pBackgroundOld = nullptr;
 		}
 		if (m_pPalBackOld != nullptr) {                    // ... map out the palette
-			(void)(*m_pBackgroundDC).SelectPalette(m_pPalBackOld, false);
+			(*m_pBackgroundDC).SelectPalette(m_pPalBackOld, false);
 			m_pPalBackOld = nullptr;
 		}
 		(*m_pBackgroundDC).DeleteDC();                  // ... release the context
@@ -2922,14 +2922,14 @@ void CSprite::ReleaseBackgroundContext(void) {
  *
  ************************************************************************/
 
-void CSprite::ReleaseMaskContext(void) {
+void CSprite::ReleaseMaskContext() {
 	if (!m_bVisible)                                    // punt if not visible
 		return;
 
 	if (m_bMasked &&
 	        (m_pMaskDC != nullptr)) {                          // if there is a mask device context
 		if (m_pMaskOld != nullptr)                         // ... map out existing bitmap
-			(void)(*m_pMaskDC).SelectObject(m_pMaskOld);
+			(*m_pMaskDC).SelectObject(m_pMaskOld);
 		(*m_pMaskDC).DeleteDC();                        // ... release the context
 		delete m_pMaskDC;                               // ... then delete the device context
 
@@ -2951,7 +2951,7 @@ void CSprite::ReleaseMaskContext(void) {
  *
  ************************************************************************/
 
-void CSprite::ClearImage(void) {
+void CSprite::ClearImage() {
 	if (!m_bVisible)                                    // punt if not visible
 		return;
 
@@ -2983,7 +2983,7 @@ void CSprite::ClearImage(void) {
  *
  ************************************************************************/
 
-void CSprite::ClearBackgrounds(void) {
+void CSprite::ClearBackgrounds() {
 	CSprite *pSprite = nullptr;
 
 	pSprite = m_pSpriteChain;
@@ -3007,7 +3007,7 @@ void CSprite::ClearBackgrounds(void) {
  *
  ************************************************************************/
 
-void CSprite::ClearBackground(void) {
+void CSprite::ClearBackground() {
 	m_nZPosition = m_nZOrder;                           // reset z ordering
 	m_bOverlaps = false;                                // no longer overlaps other sprites
 	m_bPositioned = false;                              // no longer has a real position
@@ -3058,7 +3058,7 @@ void CSprite::SetRetainBackground(bool bValue) {
  *
  ************************************************************************/
 
-void CSprite::ClearMask(void) {
+void CSprite::ClearMask() {
 	if (!m_bVisible)                                    // punt if not visible
 		return;
 
@@ -3088,7 +3088,7 @@ void CSprite::ClearMask(void) {
  *
  ************************************************************************/
 
-void CSprite::ClearPalette(void) {
+void CSprite::ClearPalette() {
 	if ((m_pPalette != nullptr) && !m_bSharedPalette) {            // explicitly delete the palette resource
 		(*m_pPalette).DeleteObject();                           // ... if it is not shared by other sprites
 		delete m_pPalette;
@@ -3130,13 +3130,13 @@ CDC *CSprite::GetBackdropDC(CDC *pDC) {
 			m_pBackdropDC = nullptr;
 			return nullptr;
 		}
-		(void)(*m_pBackdropDC).RealizePalette();            // make the system use the palette
+		(*m_pBackdropDC).RealizePalette();            // make the system use the palette
 	}
 
 	m_pBackdropOld = (*m_pBackdropDC).SelectObject(m_pBackdrop);    // map in our bitmap
 	if (m_pBackdropOld == nullptr) {
 		if (m_pBackdropPalOld != nullptr) {                    // map out palette on failure
-			(void)(*m_pBackdropDC).SelectPalette(m_pBackdropPalOld, false);
+			(*m_pBackdropDC).SelectPalette(m_pBackdropPalOld, false);
 			m_pBackdropPalOld = nullptr;
 			delete m_pBackdropDC;
 			m_pBackdropDC = nullptr;
@@ -3160,14 +3160,14 @@ CDC *CSprite::GetBackdropDC(CDC *pDC) {
  *
  ************************************************************************/
 
-void CSprite::ReleaseBackdropDC(void) {
+void CSprite::ReleaseBackdropDC() {
 	if (m_pBackdropOld != nullptr) {                       // map back the previous bitmap
-		(void)(*m_pBackdropDC).SelectObject(m_pBackdropOld);
+		(*m_pBackdropDC).SelectObject(m_pBackdropOld);
 		m_pBackdropOld = nullptr;
 	}
 
 	if (m_pBackdropPalOld != nullptr) {                    // map back the previous palette
-		(void)(*m_pBackdropDC).SelectPalette(m_pBackdropPalOld, false);
+		(*m_pBackdropDC).SelectPalette(m_pBackdropPalOld, false);
 		m_pBackdropPalOld = nullptr;
 	}
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/sprite.h b/engines/bagel/hodjnpodj/hnplibs/sprite.h
index a4195c64267..5fec3c2162a 100644
--- a/engines/bagel/hodjnpodj/hnplibs/sprite.h
+++ b/engines/bagel/hodjnpodj/hnplibs/sprite.h
@@ -71,7 +71,7 @@ public:
 
 	bool SetupCels(const int nCels);
 	void SetCel(const int nCelID);
-	void UpdateCel(void) {
+	void UpdateCel() {
 		SetCel(m_nCelID + 1);
 	}
 
@@ -84,7 +84,7 @@ public:
 
 	bool EraseSprite(CDC *pDC);
 
-	void ClearBackground(void);
+	void ClearBackground();
 
 	CSprite *Interception(CDC *pDC) {
 		return (Interception(pDC, m_pSpriteChain));
@@ -96,14 +96,14 @@ public:
 	CSprite *Interception(CRect *newRect, CSprite * pSprite);
 	bool TestInterception(CDC *pDC, CSprite * pSprite, CPoint *pPoint = nullptr);
 
-	bool GetVisible(void) {
+	bool GetVisible() {
 		return (m_bVisible);
 	}
 
 	void SetIntercepts(bool bValue) {
 		m_bIntercepts = bValue;
 	}
-	bool GetIntercepts(void) {
+	bool GetIntercepts() {
 		return (m_bIntercepts);
 	}
 
@@ -111,7 +111,7 @@ public:
 	void SetPosition(CPoint point) {
 		SetPosition(point.x, point.y);
 	}
-	CPoint GetPosition(void) {
+	CPoint GetPosition() {
 		return (m_cPosition);
 	}
 
@@ -119,7 +119,7 @@ public:
 		m_cMovementDelta.x = x;
 		m_cMovementDelta.y = y;
 	}
-	CPoint GetDelta(void) {
+	CPoint GetDelta() {
 		return (m_cMovementDelta);
 	}
 
@@ -127,57 +127,57 @@ public:
 		m_cHotspot.x = x;
 		m_cHotspot.y = y;
 	}
-	CPoint GetHotspot(void) {
+	CPoint GetHotspot() {
 		return (m_cHotspot);
 	}
 
-	CSize GetSize(void) {
+	CSize GetSize() {
 		return (m_cSize);
 	}
 
-	CRect GetRect(void) {
+	CRect GetRect() {
 		return (m_cRect);
 	}
-	CRect GetArea(void) {           // obsolete - use GetRect
+	CRect GetArea() {           // obsolete - use GetRect
 		return (m_cRect);
 	}
 
 	void SetMasked(bool bValue) {
 		m_bMasked = bValue;
 	}
-	bool GetMasked(void) {
+	bool GetMasked() {
 		return (m_bMasked);
 	}
 
 	void SetMobile(bool bValue) {
 		m_bMobile = bValue;
 	}
-	bool GetMobile(void) {
+	bool GetMobile() {
 		return (m_bMobile);
 	}
 
 	void SetOptimizeSpeed(bool bValue) {
 		m_bRetainContexts = false & bValue;
 	}
-	bool GetOptimizeSpeed(void) {
+	bool GetOptimizeSpeed() {
 		return (m_bRetainContexts);
 	}
 
 	void SetTypeCode(int nValue) {
 		m_nType = nValue;
 	}
-	int GetTypeCode(void) {
+	int GetTypeCode() {
 		return (m_nType);
 	}
 
 	void SetData(CObject *pData) {
 		m_pData = pData;
 	}
-	CObject *GetData(void) {
+	CObject *GetData() {
 		return (m_pData);
 	}
 
-	int GetId(void) {
+	int GetId() {
 		return (m_nId);
 	}
 
@@ -185,41 +185,41 @@ public:
 		m_nZOrder = nValue;
 		m_nZPosition = nValue;
 	}
-	int GetZOrder(void) {
+	int GetZOrder() {
 		return (m_nZOrder);
 	}
-	int GetZPosition(void) {
+	int GetZPosition() {
 		return (m_nZPosition);
 	}
 
-	int GetCelCount(void) {
+	int GetCelCount() {
 		return (m_nCelCount);
 	}
-	int GetCelIndex(void) {
+	int GetCelIndex() {
 		return (m_nCelID);
 	}
 
 	void SetAnimated(bool bAnimated) {
 		m_bAnimated = bAnimated;
 	}
-	bool GetAnimated(void) {
+	bool GetAnimated() {
 		return (m_bAnimated);
 	}
 
 	void SetRetainBackground(bool bValue);
-	bool GetRetainBackground(void) {
+	bool GetRetainBackground() {
 		return (m_bRetainBackground);
 	}
 
-	bool IsLinked(void) {
+	bool IsLinked() {
 		return (m_bLinked);
 	}
-	void LinkSprite(void);
-	void UnlinkSprite(void);
-	CSprite *GetNextSprite(void) {
+	void LinkSprite();
+	void UnlinkSprite();
+	CSprite *GetNextSprite() {
 		return (m_pNext);
 	}
-	CSprite *GetPrevSprite(void) {
+	CSprite *GetPrevSprite() {
 		return (m_pPrev);
 	}
 
@@ -229,27 +229,27 @@ public:
 		return (Touched(myPoint, m_pSpriteChain));
 	}
 	static  CSprite *Touched(CPoint myPoint, CSprite *pSprite);
-	static  bool InterceptOccurred(void) {
+	static  bool InterceptOccurred() {
 		return (m_bTouchedSprite);
 	}
-	static  CSprite *GetInterception(void) {
+	static  CSprite *GetInterception() {
 		return (m_pTouchedSprite);
 	}
 
-	static  CSprite *GetSpriteChain(void) {
+	static  CSprite *GetSpriteChain() {
 		return (m_pSpriteChain);
 	}
 	static  bool EraseSprites(CDC *pDC);
-	static  void ClearBackgrounds(void);
-	static  void FlushSpriteChain(void);
+	static  void ClearBackgrounds();
+	static  void FlushSpriteChain();
 
-	static  bool HaveBackdrop(void) {
+	static  bool HaveBackdrop() {
 		return (m_bHaveBackdrop);
 	}
 	static  CDC *GetBackdropDC(CDC *pDC);
-	static  void ReleaseBackdropDC(void);
+	static  void ReleaseBackdropDC();
 	static  bool SetBackdrop(CDC *pDC, CPalette *pPalette, CBitmap *pBitmap);
-	static  void ClearBackdrop(void);
+	static  void ClearBackdrop();
 	static  bool RefreshBackdrop(CDC *pDC, CPalette *pPalette);
 
 private:
@@ -268,13 +268,13 @@ private:
 	bool CreateBackgroundContext(CDC *pDC);
 	bool CreateMaskContext(CDC *pDC);
 
-	void ReleaseImageContext(void);
-	void ReleaseBackgroundContext(void);
-	void ReleaseMaskContext(void);
+	void ReleaseImageContext();
+	void ReleaseBackgroundContext();
+	void ReleaseMaskContext();
 
-	void ClearImage(void);
-	void ClearMask(void);
-	void ClearPalette(void);
+	void ClearImage();
+	void ClearMask();
+	void ClearPalette();
 
 	bool SpritesOverlap(CDC *pDC, CSprite *pSprite, CPoint *pPoint = nullptr);
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/text.cpp b/engines/bagel/hodjnpodj/hnplibs/text.cpp
index f4a24cf558e..d8f6309e0a7 100644
--- a/engines/bagel/hodjnpodj/hnplibs/text.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/text.cpp
@@ -115,7 +115,7 @@ CText::~CText() {
  *
  ************************************************************************/
 
-void CText::InitializeFields(void) {
+void CText::InitializeFields() {
 	m_pBackgroundDC = nullptr;
 	m_pBackground = nullptr;
 	m_pBackgroundOld = nullptr;
@@ -175,7 +175,7 @@ bool CText::SetupText(CDC *pDC, CPalette *pPalette, CRect *pRect, int nJustify)
 
 	if (m_pPalette != nullptr) {
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	if (!m_bFontLoaded) {                       // load the font if we have not
@@ -198,7 +198,7 @@ bool CText::SetupText(CDC *pDC, CPalette *pPalette, CRect *pRect, int nJustify)
 		return false;
 
 	if (m_pPalette != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return true;                              // return status
 }
@@ -226,7 +226,7 @@ bool CText::RestoreBackground(CDC *pDC) {
 
 	if (m_pPalette != nullptr) {
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	if ((m_pBackground != nullptr) &&
@@ -244,7 +244,7 @@ bool CText::RestoreBackground(CDC *pDC) {
 	}
 
 	if (m_pPalette != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return bSuccess;
 }
@@ -342,14 +342,14 @@ bool CText::DisplayText(CDC *pDC, const char *pszText, const int nSize, const in
 
 	if (m_pPalette != nullptr) {
 		pPalOld = (*pDC).SelectPalette(m_pPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	if (!SetupContexts(pDC))                        // setup the device contexts and map in
 		return false;                             // ... the various bitmaps
 
 	if (!m_bHaveBackground) {
-		(void)(*m_pBackgroundDC).BitBlt(           // grab what the background looks like
+		(*m_pBackgroundDC).BitBlt(           // grab what the background looks like
 		    0,                      // ... putting it in the work area
 		    0,
 		    m_cSize.cx,
@@ -373,7 +373,7 @@ bool CText::DisplayText(CDC *pDC, const char *pszText, const int nSize, const in
 
 	textInfo = (*m_pWorkDC).GetTextExtent(pszText, strlen(pszText));  // get the area spanned by the text
 
-	(void)(*m_pWorkDC).BitBlt(                     // copy the saved background to the work area
+	(*m_pWorkDC).BitBlt(                     // copy the saved background to the work area
 	    0,
 	    0,
 	    m_cSize.cx,
@@ -416,12 +416,12 @@ bool CText::DisplayText(CDC *pDC, const char *pszText, const int nSize, const in
 	    strlen(pszText),
 	    1, &m_nTabStop, 0);
 
-	(void)(*m_pWorkDC).SelectObject(pFontOld);         // map out the font
+	(*m_pWorkDC).SelectObject(pFontOld);         // map out the font
 
 	delete m_pFont;                                     // release the font instance
 	m_pFont = nullptr;
 
-	(void)(*pDC).BitBlt(                               // copy the result to the destination context
+	(*pDC).BitBlt(                               // copy the result to the destination context
 	    m_cRect.left,
 	    m_cRect.top,
 	    m_cSize.cx,
@@ -434,7 +434,7 @@ bool CText::DisplayText(CDC *pDC, const char *pszText, const int nSize, const in
 	ReleaseContexts();
 
 	if (m_pPalette != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	return true;
 }
@@ -465,7 +465,7 @@ bool CText::SetupContexts(CDC *pDC) {
 			return false;
 		if (m_pPalette != nullptr) {
 			m_pPalWorkOld = (*m_pWorkDC).SelectPalette(m_pPalette, false);
-			(void)(*m_pWorkDC).RealizePalette();
+			(*m_pWorkDC).RealizePalette();
 		}
 		m_pWorkOld = (*m_pWorkDC).SelectObject(m_pWork);
 		if (m_pWorkOld == nullptr)
@@ -479,7 +479,7 @@ bool CText::SetupContexts(CDC *pDC) {
 			return false;
 		if (m_pPalette != nullptr) {
 			m_pPalBackOld = (*m_pBackgroundDC).SelectPalette(m_pPalette, false);
-			(void)(*m_pBackgroundDC).RealizePalette();
+			(*m_pBackgroundDC).RealizePalette();
 		}
 		m_pBackgroundOld = (*m_pBackgroundDC).SelectObject(m_pBackground);
 		if (m_pBackgroundOld == nullptr)
@@ -503,22 +503,22 @@ bool CText::SetupContexts(CDC *pDC) {
  *
  ************************************************************************/
 
-void CText::ReleaseContexts(void) {
+void CText::ReleaseContexts() {
 	if (m_pWorkOld != nullptr) {
-		(void)(*m_pWorkDC).SelectObject(m_pWorkOld);
+		(*m_pWorkDC).SelectObject(m_pWorkOld);
 		m_pWorkOld = nullptr;
 	}
 	if (m_pBackgroundOld != nullptr) {
-		(void)(*m_pBackgroundDC).SelectObject(m_pBackgroundOld);
+		(*m_pBackgroundDC).SelectObject(m_pBackgroundOld);
 		m_pBackgroundOld = nullptr;
 	}
 
 	if (m_pPalWorkOld != nullptr) {
-		(void)(*m_pWorkDC).SelectPalette(m_pPalWorkOld, false);
+		(*m_pWorkDC).SelectPalette(m_pPalWorkOld, false);
 		m_pPalWorkOld = nullptr;
 	}
 	if (m_pPalBackOld != nullptr) {
-		(void)(*m_pBackgroundDC).SelectPalette(m_pPalBackOld, false);
+		(*m_pBackgroundDC).SelectPalette(m_pPalBackOld, false);
 		m_pPalBackOld = nullptr;
 	}
 
diff --git a/engines/bagel/hodjnpodj/hnplibs/text.h b/engines/bagel/hodjnpodj/hnplibs/text.h
index 49e98d35480..d38717abba9 100644
--- a/engines/bagel/hodjnpodj/hnplibs/text.h
+++ b/engines/bagel/hodjnpodj/hnplibs/text.h
@@ -73,9 +73,9 @@ public:
 	bool DisplayShadowedString(CDC *pDC, const char* pszText, const int nSize, const int nWeight, const COLORREF crColor, const COLORREF crShadow = CTEXT_SHADOW_COLOR, const int DX = CTEXT_SHADOW_DX, const int DY = CTEXT_SHADOW_DY);
 
 private:
-	void InitializeFields(void);
+	void InitializeFields();
 	bool SetupContexts(CDC *pDC);
-	void ReleaseContexts(void);
+	void ReleaseContexts();
 	bool DisplayText(CDC *pDC, const char* pszText, const int nSize, const int nWeight, const bool bShadowed);
 
 private:
diff --git a/engines/bagel/hodjnpodj/life/grid.cpp b/engines/bagel/hodjnpodj/life/grid.cpp
index a88ace8cd57..d03c74c86f2 100644
--- a/engines/bagel/hodjnpodj/life/grid.cpp
+++ b/engines/bagel/hodjnpodj/life/grid.cpp
@@ -43,7 +43,7 @@ colony::colony(int r, int c) {
 			grid[i][j] = NO_LIFE;
 }
 
-colony::~colony(void) {
+colony::~colony() {
 }
 
 colony &colony::operator=(const colony& c) {
diff --git a/engines/bagel/hodjnpodj/life/grid.h b/engines/bagel/hodjnpodj/life/grid.h
index f5f6510f286..a14b814630e 100644
--- a/engines/bagel/hodjnpodj/life/grid.h
+++ b/engines/bagel/hodjnpodj/life/grid.h
@@ -45,7 +45,7 @@ public:
 	//creator
 	colony(int r, int c);
 	//destroy construct
-	~colony(void);
+	~colony();
 	//copy operator
 	colony &operator=(const colony& c);
 	//equality operators: assuming equal dims
@@ -64,7 +64,7 @@ public:
 	};
 	void evolve(colony c);
 	void flip(int r, int c);
-	//void print(void);
+	//void print();
 public:
 	int m_nColony_count;
 };
diff --git a/engines/bagel/hodjnpodj/life/usercfg.cpp b/engines/bagel/hodjnpodj/life/usercfg.cpp
index 130b08f621f..00f14024e2c 100644
--- a/engines/bagel/hodjnpodj/life/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/life/usercfg.cpp
@@ -454,7 +454,7 @@ void CUserCfgDlg::OnPaint() {
 	ReleaseDC(pDC);
 }
 
-void CUserCfgDlg::ClearDialogImage(void) {
+void CUserCfgDlg::ClearDialogImage() {
 	if (m_pOKButton != nullptr) {      // release button
 		delete m_pOKButton;
 		m_pOKButton = nullptr;
diff --git a/engines/bagel/hodjnpodj/life/usercfg.h b/engines/bagel/hodjnpodj/life/usercfg.h
index 5cb26d58a4e..f52949701ac 100644
--- a/engines/bagel/hodjnpodj/life/usercfg.h
+++ b/engines/bagel/hodjnpodj/life/usercfg.h
@@ -89,7 +89,7 @@ public:
 	CColorButton    *m_pCancelButton;                   // Cancel button on scroll
 
 protected:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 	virtual void DoDataExchange(CDataExchange*) override;    // DDX/DDV support
 	virtual bool OnInitDialog() override;
 	virtual void OnOK() override;
diff --git a/engines/bagel/hodjnpodj/mankala/mnk.cpp b/engines/bagel/hodjnpodj/mankala/mnk.cpp
index eda3b5f3abd..93975c4fb2e 100644
--- a/engines/bagel/hodjnpodj/mankala/mnk.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnk.cpp
@@ -97,7 +97,7 @@ static HCURSOR  hHourGlassCursor;
 extern bool gbTurnSoundsOff;
 
 //* CMnkWindow::CMnkWindow() -- mankala window constructor function
-CMnkWindow::CMnkWindow(void) {
+CMnkWindow::CMnkWindow() {
 	CDC* pDC = nullptr ;                         // device context for the screen
 	CString xpszWndClass ;
 	CDibDoc *xpDibDoc = nullptr ;   // pointer to the background art DIB
@@ -277,7 +277,7 @@ CMnkWindow::CMnkWindow(void) {
 }
 
 //* CMnkWindow::~CMnkWindow -- Mankala window destructor function
-CMnkWindow::~CMnkWindow(void) {
+CMnkWindow::~CMnkWindow() {
 }
 
 /*****************************************************************
diff --git a/engines/bagel/hodjnpodj/mankala/mnk.h b/engines/bagel/hodjnpodj/mankala/mnk.h
index 5c32cc5317e..e2de1ebdbb5 100644
--- a/engines/bagel/hodjnpodj/mankala/mnk.h
+++ b/engines/bagel/hodjnpodj/mankala/mnk.h
@@ -203,7 +203,7 @@ class CMove {
 	char m_cEndData ;
 
 	// methods to zero or copy CMove objects
-	void Zero(void) {
+	void Zero() {
 		memset(&m_cStartData, 0, &m_cEndData - &m_cStartData) ;
 	}
 	void Copy(CMove * xpcMove) {
@@ -300,7 +300,7 @@ public:
 // mnklog.cpp -- Mankala game logic
 
 //- InitMankala -- initialize a new game of Mankala
-private: bool InitMankala(void) ;
+private: bool InitMankala() ;
 //- Move -- make a move
 private: bool Move(CPit * xpcSowPit, CMove * xpcMove PDFT(nullptr)) ;
 //- MoveStone -- move one stone for move
@@ -309,9 +309,9 @@ public: bool MoveStone(CMove * xpcMove,
 //- InitData -- initialize data class object
 private: bool InitData(bool bInit PDFT(true)) ;
 //- CountConfigurations -- set up Configurations table
-	bool CountConfigurations(void) ;
+	bool CountConfigurations() ;
 //- PopulateTable -- compute values for best win table
-private: bool PopulateTable(void) ;
+private: bool PopulateTable() ;
 //- MapConfiguration -- map a configuration to its integer index,
 //		store configuration index into Move object
 	bool MapConfiguration(CMove * xpcMove) ;
@@ -483,15 +483,15 @@ class CMnkWindow : public CFrameWnd, public CMnk {
 // mnk.cpp -- Mankala game -- Windows interface
 
 //- CMnkWindow() -- mankala window constructor function
-public: CMnkWindow(void) ;
+public: CMnkWindow() ;
 //- ~CMnkWindow -- Mankala window destructor function
-public: ~CMnkWindow(void) ;
+public: ~CMnkWindow() ;
 
 
 // mnkui.cpp -- Mankala game -- user interface
 
 //- StartGame -- start a new game
-private: bool StartGame(void) ;
+private: bool StartGame() ;
 //- PaintBitmapObject -- paint bitmap
 private: bool PaintBitmapObject(CBmpObject * xpcBmpObject,
 	                                int iBmpType PDFT(0), int iBmpArg PDFT(0)) ;
@@ -512,11 +512,11 @@ public: bool MoveStoneDisplay(CPitWnd * xpcFromPit,
 private: bool AdjustPitDisplay(CPitWnd * xpcPit,
 	                               bool bForcePaint PDFT(false)) ;
 //- PaintScreen -- paint screen for mankala game
-private: void PaintScreen(void) ;
+private: void PaintScreen() ;
 //- ProcessDc -- handle processing of device context
 private: bool ProcessDc(bool bAlloc PDFT(true)) ;
 //- AllocatePits -- allocate pits (including home bin/hand)
-	bool AllocatePits(void) ;
+	bool AllocatePits() ;
 //- SetCrabSign -- to my/your turn
 private: bool SetCrabSign(bool bPaint PDFT(true)) ;
 //- FreePitResources -- free (optionally delete) all pit
@@ -525,15 +525,15 @@ private: bool FreePitResources(bool bDelete PDFT(false)) ;
 //- ClearBitmapObject -- release bitmap object
 private: bool ClearBitmapObject(CBmpObject * xpcBmpObject) ;
 //- ReleaseResources -- release all resources before term
-public: void ReleaseResources(void) ;
+public: void ReleaseResources() ;
 //- DebugDialog -- put up debugging dialog box
-private: bool DebugDialog(void) ;
+private: bool DebugDialog() ;
 public: void Setm_bJustStarted(bool U) {
 		m_bJustStarted = U; //- UserDialog -- put up user dialog box
 	}
-public: bool FAR PASCAL UserDialog(void) ;
+public: bool FAR PASCAL UserDialog() ;
 //- OptionsDialog -- call options dialog
-private: bool OptionsDialog(void) ;
+private: bool OptionsDialog() ;
 
 //private: bool CALLBACK ResetPitsDlgProc(HWND, unsigned int, WPARAM, LPARAM);
 
@@ -544,8 +544,8 @@ private: bool OptionsDialog(void) ;
 //
 //    void SplashScreen();
 //
-//    static    void ReleaseResources(void);
-//    static    void FlushInputEvents(void);
+//    static    void ReleaseResources();
+//    static    void FlushInputEvents();
 //
 //private:
 //public:
diff --git a/engines/bagel/hodjnpodj/mankala/mnklog.cpp b/engines/bagel/hodjnpodj/mankala/mnklog.cpp
index e111c04dc34..43d47cf0347 100644
--- a/engines/bagel/hodjnpodj/mankala/mnklog.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnklog.cpp
@@ -37,7 +37,7 @@ static inline void DebugBreak() {
 }
 
 //* CMnk::InitMankala -- initialize a new game of Mankala
-bool CMnk::InitMankala(void)
+bool CMnk::InitMankala()
 // returns: true if error, false otherwise
 {
 	JXENTER(CMnk::InitMankala) ;
@@ -398,7 +398,7 @@ cleanup:
 }
 
 //* CMnk::CountConfigurations -- set up Configurations table
-bool CMnk::CountConfigurations(void)
+bool CMnk::CountConfigurations()
 // returns: true if error, false otherwise
 {
 	JXENTER(CMnk::CountConfigurations) ;
diff --git a/engines/bagel/hodjnpodj/mankala/mnkopt.cpp b/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
index 0cf4ea72db4..f6ae185a0fc 100644
--- a/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnkopt.cpp
@@ -189,7 +189,7 @@ bool CMnkUsr::OnInitDialog() {
 	return true;  // return true  unless you set the focus to a control
 }
 
-void CMnkUsr::ClearDialogImage(void) {
+void CMnkUsr::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
diff --git a/engines/bagel/hodjnpodj/mankala/mnkopt.h b/engines/bagel/hodjnpodj/mankala/mnkopt.h
index 252ed467b03..a9f49305181 100644
--- a/engines/bagel/hodjnpodj/mankala/mnkopt.h
+++ b/engines/bagel/hodjnpodj/mankala/mnkopt.h
@@ -103,7 +103,7 @@ public:
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 
 	// Generated message map functions
diff --git a/engines/bagel/hodjnpodj/mankala/mnkui.cpp b/engines/bagel/hodjnpodj/mankala/mnkui.cpp
index b4f29bec5d7..3bea7c0c5ef 100644
--- a/engines/bagel/hodjnpodj/mankala/mnkui.cpp
+++ b/engines/bagel/hodjnpodj/mankala/mnkui.cpp
@@ -38,7 +38,7 @@ static int gCount;     //reset to 0 in StartGame() and incremented in AcceptClic
 
 
 //* CMnkWindow::StartGame -- start a new game
-bool CMnkWindow::StartGame(void)
+bool CMnkWindow::StartGame()
 // returns: true if error, false otherwise
 {
 	JXENTER(CMnkWindow::StartGame) ;
@@ -691,7 +691,7 @@ bool CMnkWindow::AdjustPitDisplay(CPitWnd * xpcPit,
 }
 
 //* CMnkWindow::PaintScreen -- paint screen for mankala game
-void CMnkWindow::PaintScreen(void)
+void CMnkWindow::PaintScreen()
 // returns: void
 {
 	JXENTER(CMnkWindow::PaintScreen) ;
@@ -732,7 +732,7 @@ void CMnkWindow::PaintScreen(void)
 
 
 //* CMnkWindow::AllocatePits -- allocate pits (including home bin/hand)
-bool CMnkWindow::AllocatePits(void)
+bool CMnkWindow::AllocatePits()
 // returns: true if error, false otherwise
 {
 	JXENTER(CMnkWindow::AllocatePits) ;
@@ -967,7 +967,7 @@ bool CMnkWindow::ClearBitmapObject(CBmpObject * xpcBmpObject)
 }
 
 //* CMnkWindow::ReleaseResources -- release all resources before term
-void CMnkWindow::ReleaseResources(void) {
+void CMnkWindow::ReleaseResources() {
 	CBmpObject * xpcBmpObject ;     // objects to be freed
 	CPitWnd* xpcPitWnd;
 
@@ -995,7 +995,7 @@ void CMnkWindow::ReleaseResources(void) {
 
 
 //* CMnkWindow::DebugDialog -- put up debugging dialog box
-bool CMnkWindow::DebugDialog(void)
+bool CMnkWindow::DebugDialog()
 // returns: true if error, false otherwise
 {
 	JXENTER(CMnkWindow::DebugDialog) ;
@@ -1042,7 +1042,7 @@ bool CMnkWindow::DebugDialog(void)
 }
 
 //* CMnkWindow::UserDialog -- put up user dialog box
-bool FAR PASCAL CMnkWindow::UserDialog(void)
+bool FAR PASCAL CMnkWindow::UserDialog()
 // returns: true if error, false otherwise
 {
 	JXENTER(CMnkWindow::UserDialog) ;
@@ -1076,7 +1076,7 @@ void CALLBACK CallUserDialog(CWnd * xpcWindow) {
 }
 
 //* CMnkWindow::OptionsDialog -- call options dialog
-bool CMnkWindow::OptionsDialog(void) {
+bool CMnkWindow::OptionsDialog() {
 // returns: true if error, false otherwise
 	JXENTER(CMnkWindow::OptionsDialog) ;
 	int iError = 0 ;        // error code
diff --git a/engines/bagel/hodjnpodj/mazedoom/mod.cpp b/engines/bagel/hodjnpodj/mazedoom/mod.cpp
index 296d1e6cb06..95acb1a3b1a 100644
--- a/engines/bagel/hodjnpodj/mazedoom/mod.cpp
+++ b/engines/bagel/hodjnpodj/mazedoom/mod.cpp
@@ -411,7 +411,7 @@ bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 			m_bIgnoreScrollClick = true;
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
 
-			(void) RulesDlg.DoModal();
+			RulesDlg.DoModal();
 			m_bIgnoreScrollClick = false;
 			(*m_pScrollButton).SendMessage(BM_SETSTATE, false, 0L);
 			if (!_gameOver)
diff --git a/engines/bagel/hodjnpodj/mazedoom/optndlg.cpp b/engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
index 077a157288a..00d137c7ba3 100644
--- a/engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/mazedoom/optndlg.cpp
@@ -173,7 +173,7 @@ bool COptnDlg::OnEraseBkgnd(CDC *pDC) {
 }
 
 
-void COptnDlg::OnDestroy(void) {
+void COptnDlg::OnDestroy() {
 	CBmpDialog::OnDestroy();
 }
 
@@ -321,7 +321,7 @@ void COptnDlg::OnPaint() {
 
 }
 
-void COptnDlg::ClearDialogImage(void) {
+void COptnDlg::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
diff --git a/engines/bagel/hodjnpodj/mazedoom/optndlg.h b/engines/bagel/hodjnpodj/mazedoom/optndlg.h
index 1b88ce34be2..4606b944d92 100644
--- a/engines/bagel/hodjnpodj/mazedoom/optndlg.h
+++ b/engines/bagel/hodjnpodj/mazedoom/optndlg.h
@@ -42,7 +42,7 @@ public:
 	COptnDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr);
 	~COptnDlg();
 	void UpdateScrollbars();
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 // Dialog Data
 	//{{AFX_DATA(COptnDlg)
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp b/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
index 2e887604e17..df5f7e7fa41 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/backpack.cpp
@@ -93,7 +93,7 @@ static  int         nFirstSlot = 0;                 // first item in current inv
 
 
 
-bool CBackpack::SetupKeyboardHook(void) {
+bool CBackpack::SetupKeyboardHook() {
 	pBackpackDialog = this;                         // retain pointer to our dialog box
 
 	lpfnKbdHook = &BackpackHookProc;
@@ -108,7 +108,7 @@ bool CBackpack::SetupKeyboardHook(void) {
 }
 
 
-void CBackpack::RemoveKeyboardHook(void) {
+void CBackpack::RemoveKeyboardHook() {
 	if (m_bKeyboardHook)
 		UnhookWindowsHookEx(hKbdHook);                  // unhook our keyboard procedure
 
@@ -216,7 +216,7 @@ void CBackpack::OnOK() {
 }
 
 
-void CBackpack::OnCancel(void) {
+void CBackpack::OnCancel() {
 	ClearDialogImage();
 	CDialog::OnCancel();
 }
@@ -235,11 +235,11 @@ void CBackpack::OnDestroy() {
 		RemoveKeyboardHook();
 
 	if (pWorkOld != nullptr) {
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 		pWorkOld = nullptr;
 	}
 	if (pWorkPalOld != nullptr) {
-		(void)(*pWorkDC).SelectPalette(pWorkPalOld, false);
+		(*pWorkDC).SelectPalette(pWorkPalOld, false);
 		pWorkPalOld = nullptr;
 	}
 	if (pWork != nullptr) {
@@ -481,7 +481,7 @@ void CBackpack::UpdateContent(CDC *pDC) {
 			(*pDC).SetTextColor(BACKPACK_MORE_COLOR);
 			(*pDC).TextOut(x, y, MORE_TEXT_BLURB, MORE_TEXT_LENGTH);
 		}
-		(void)(*pDC).SelectObject(pFontOld);                            // map out the font
+		(*pDC).SelectObject(pFontOld);                            // map out the font
 	}
 }
 
@@ -503,7 +503,7 @@ void CBackpack::UpdateItem(CDC *pDC, CItem *pItem, int nX, int nY) {
 			nY,
 			(const char *)chBuffer,
 			strlen(chBuffer));
-		(void)(*pDC).SelectObject(pFontOld);                     // map out the font
+		(*pDC).SelectObject(pFontOld);                     // map out the font
 	}
 }
 
@@ -513,7 +513,7 @@ bool CBackpack::OnEraseBkgnd(CDC *) {
 }
 
 
-void CBackpack::ClearDialogImage(void) {
+void CBackpack::ClearDialogImage() {
 	if (pBackgroundBitmap != nullptr) {
 		delete pOKButton;
 		pOKButton = nullptr;
@@ -523,7 +523,7 @@ void CBackpack::ClearDialogImage(void) {
 }
 
 
-void CBackpack::RefreshBackground(void) {
+void CBackpack::RefreshBackground() {
 	CDC *pDC;
 
 	if (pBackgroundBitmap != nullptr) {
@@ -582,7 +582,7 @@ bool CBackpack::CreateWorkAreas(CDC *pDC) {
 		pBackgroundBitmap = nullptr;
 
 	(*pDC).SelectPalette(pBackgroundPalette, false);
-	(void)(*pDC).RealizePalette();
+	(*pDC).RealizePalette();
 
 	if ((GetFreeSpace(0) >= (unsigned long)1000000) &&
 		(GlobalCompact((unsigned long)500000) >= (unsigned long)450000)) {
@@ -592,7 +592,7 @@ bool CBackpack::CreateWorkAreas(CDC *pDC) {
 			if ((pWorkDC != nullptr) &&
 				(*pWorkDC).CreateCompatibleDC(pDC)) {
 				pWorkPalOld = (*pWorkDC).SelectPalette(pBackgroundPalette, false);
-				(void)(*pWorkDC).RealizePalette();
+				(*pWorkDC).RealizePalette();
 				pWorkOld = (*pWorkDC).SelectObject(pWork);
 				if (pWorkOld != nullptr)
 					bSuccess = true;
@@ -606,7 +606,7 @@ bool CBackpack::CreateWorkAreas(CDC *pDC) {
 
 	if (!bSuccess) {
 		if (pWorkPalOld != nullptr) {
-			(void)(*pWorkDC).SelectPalette(pWorkPalOld, false);
+			(*pWorkDC).SelectPalette(pWorkPalOld, false);
 			pWorkPalOld = nullptr;
 		}
 		if (pWork != nullptr) {
@@ -618,7 +618,7 @@ bool CBackpack::CreateWorkAreas(CDC *pDC) {
 		bSuccess = true;
 	}
 
-	(void)(*pDC).SelectPalette(pWorkPalOld, false);
+	(*pDC).SelectPalette(pWorkPalOld, false);
 
 	myRect.SetRect(BACKPACK_TEXTZONE_DX,
 		BACKPACK_BORDER_DY + BACKPACK_TITLEZONE_DDY,
@@ -739,7 +739,7 @@ void CBackpack::OnLButtonDown(unsigned int nFlags, CPoint point) {
 							pButton = GetDlgItem((int)GetDefID()); // get the window for the okay button
 							ASSERT(pButton != nullptr);                // ... and verify we have it
 							(*pButton).EnableWindow(false);  // disable & enable across note entries
-							(void)NotebookDlg.DoModal();   // invoke the notebook dialog box
+							NotebookDlg.DoModal();   // invoke the notebook dialog box
 							(*pButton).EnableWindow(true);
 							pControl = GetDlgItem((int)GetDefID());
 							GotoDlgCtrl(pControl);
@@ -798,21 +798,21 @@ bool CBackpack::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int
 }
 
 
-void CBackpack::DoWaitCursor(void) {
+void CBackpack::DoWaitCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).BeginWaitCursor();
+	(*pMyApp).BeginWaitCursor();
 }
 
 
-void CBackpack::DoArrowCursor(void) {
+void CBackpack::DoArrowCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).EndWaitCursor();
+	(*pMyApp).EndWaitCursor();
 }
 
 } // namespace Gtl
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/backpack.h b/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
index a62dc94659d..79ac68bdc5e 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/backpack.h
@@ -72,14 +72,14 @@ public:
 	static  void UpdateContent(CDC *pDC);
 	static  void UpdateItem(CDC *pDC, CItem *pItem, int nX, int nY);
 	static  void UpdatePage(CDC *pDC);
-	static  void ClearDialogImage(void);
-	static  void RefreshBackground(void);
-	static  void DoWaitCursor(void);
-	static  void DoArrowCursor(void);
+	static  void ClearDialogImage();
+	static  void RefreshBackground();
+	static  void DoWaitCursor();
+	static  void DoArrowCursor();
 
 private:
-	bool SetupKeyboardHook(void);
-	void RemoveKeyboardHook(void);
+	bool SetupKeyboardHook();
+	void RemoveKeyboardHook();
 
 	bool CreateWorkAreas(CDC *pDC);
 
@@ -105,12 +105,12 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(CBackpack)
 	afx_msg int  OnCreate(LPCREATESTRUCT lpCreateStruct);
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 	afx_msg bool OnEraseBkgnd(CDC *pDC);
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
-	afx_msg void OnDestroy(void);
-	afx_msg void OnPaint(void);
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
+	afx_msg void OnDestroy();
+	afx_msg void OnPaint();
 	afx_msg void OnShowWindow(bool bShow, unsigned int nStatus);
 	afx_msg void OnSize(unsigned int nType, int cx, int cy);
 	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
index b047547c1be..2e2fa33cc45 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.cpp
@@ -31,7 +31,7 @@ namespace Metagame {
 CBdbgMgr FAR *CBdbgMgr::lpBdbgMgr = nullptr ;
 
 //* CBdbgMgr::CBdbgMgr -- constructor
-CBdbgMgr::CBdbgMgr(void) {
+CBdbgMgr::CBdbgMgr() {
 	JXENTER(CBdbgMgr::CBdbgMgr) ;
 
 	// zero out all data
@@ -45,7 +45,7 @@ CBdbgMgr::CBdbgMgr(void) {
 }
 
 //* CBdbgMgr::~CBdbgMgr -- destructor
-CBdbgMgr::~CBdbgMgr(void)
+CBdbgMgr::~CBdbgMgr()
 // returns: void
 {
 	JXENTER(CBdbgMgr::~CBdbgMgr) ;
@@ -149,8 +149,8 @@ bool CBdbgMgr::RemoveTraceObject(const char *lpszName, void *lpPtr)
 }
 
 //* CBdbgMgr::ReportTraceObjects -- final report at program end
-bool CBdbgMgr::ReportTraceObjects(void)
-//// int FAR PASCAL CBdbgMgr::ReportTraceObjects(void)
+bool CBdbgMgr::ReportTraceObjects()
+//// int FAR PASCAL CBdbgMgr::ReportTraceObjects()
 // returns: true if error, false otherwise
 {
 	return false;
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
index a297e3dc1cf..b0c1b4d6c12 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bdbg.h
@@ -57,12 +57,12 @@ public:
 	char m_cEndData ;
 
 // methods
-	static CBdbgMgr FAR *GetPointer(void) {
+	static CBdbgMgr FAR *GetPointer() {
 		return lpBdbgMgr;
 	}
 
-	CBdbgMgr(void) ;
-	~CBdbgMgr(void) ;
+	CBdbgMgr() ;
+	~CBdbgMgr() ;
 	bool DebugInit(const char *lpszIniFilename,
 	               const char *lpszIniSectionname) ;
 	int GetDebugInt(const char *lpszOption,
@@ -78,7 +78,7 @@ public:
 	bool TestTraceObject(const char *lpszName, void *lpPtr,
 	                     bool bMissing PDFT(false)) ;
 	bool RemoveTraceObject(const char *lpszName, void *lpPtr) ;
-	bool ReportTraceObjects(void) ;
+	bool ReportTraceObjects() ;
 	STATIC bool OutputWithTime(const char *lpszPattern) ;
 	STATIC bool OutputWithWordWrap(const char *lpStr1,
 	                               const char *lpStr2, int iIndent) ;
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bfc.h b/engines/bagel/hodjnpodj/metagame/bgen/bfc.h
index 4ec2e038c90..905a8929657 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bfc.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bfc.h
@@ -100,7 +100,7 @@ public:
 	char m_cEndData ;
 
 	// constructor
-	CHodjPodj(void) {
+	CHodjPodj() {
 		memset(&m_cStartData, 0, &m_cEndData - &m_cStartData);
 	}
 } ;
@@ -167,7 +167,7 @@ public:
 	char m_cEndData ;
 
 	// constructor
-	CBfcMgr(void) {
+	CBfcMgr() {
 		memset(&m_cStartData, 0, &m_cEndData - &m_cStartData) ;
 	}
 };
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
index 507da02181f..6e374e9d528 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgb.cpp
@@ -36,10 +36,10 @@ namespace Gtl {
 #define CONTROL_PHYSICAL_MEMORY     true
 
 
-typedef uint32 (FAR PASCAL * FPGETFREEMEMINFO)(void);
+typedef uint32 (FAR PASCAL * FPGETFREEMEMINFO)();
 FPGETFREEMEMINFO    lpfnGetFreeMemInfo;
 bool    CheckLowMemory(uint32);
-uint32   GetPhysicalMemory(void);
+uint32   GetPhysicalMemory();
 
 extern  CBfcMgr *lpMetaGameStruct;
 
@@ -62,7 +62,7 @@ CBgbMgr *gpBgbMgr;
 *  RETURNS:  Constructors have no return type
 *
 *****************************************************************************/
-CBgbMgr::CBgbMgr(void) {
+CBgbMgr::CBgbMgr() {
 	// Initialize all member variables to 0
 	memset(&m_cStartData, 0, &m_cEndData - &m_cStartData);
 
@@ -86,7 +86,7 @@ CBgbMgr::CBgbMgr(void) {
 *  RETURNS:  Destructors have no return type
 *
 *****************************************************************************/
-CBgbMgr::~CBgbMgr(void) {
+CBgbMgr::~CBgbMgr() {
 	ReleaseResources();
 
 	// Release the Palette
@@ -507,7 +507,7 @@ void CBgbMgr::CacheOptimize(unsigned long lReqSpace) {
 *  SAMPLE USAGE:    CacheFlush();
 *
 *****************************************************************************/
-void CBgbMgr::CacheFlush(void) {
+void CBgbMgr::CacheFlush() {
 	CBgbObject *pBgbObject;
 
 	//ErrorLog("DEBUG.LOG", "CBgbMgr::CacheFlush");
@@ -839,7 +839,7 @@ cleanup:
 }
 
 //* CBgbMgr::ReInitDc -- do InitDc with existing view and BsuSet
-bool CBgbMgr::ReInitDc(void)
+bool CBgbMgr::ReInitDc()
 // returns: true if error, false otherwise
 {
 	InitDc(m_xpcView, m_xpBsuSet);
@@ -850,7 +850,7 @@ bool CBgbMgr::ReInitDc(void)
 //* CBgbMgr::AdjustLockCount --
 bool CBgbMgr::AdjustLockCount(int iIncr)
 // iIncr -- if <0 or >0, add to lock count; if =0, zero lock count
-//// int PASCAL CBgbMgr::AdjustLockCount(void)
+//// int PASCAL CBgbMgr::AdjustLockCount()
 // returns: true if error, false otherwise
 {
 	if (iIncr != 0)
@@ -936,7 +936,7 @@ bool CBgbMgr::SetPen(COLORREF cPenColor, int iPenWidth)
 }
 
 //* CBgbMgr::ReleaseDc -- release Dc, if one has been gotten
-bool CBgbMgr::ReleaseDc(void)
+bool CBgbMgr::ReleaseDc()
 // returns: true if error, false otherwise
 {
 	JXENTER(CBgbMgr::ReleaseDc) ;
@@ -1005,7 +1005,7 @@ bool CBgbMgr::ClearBitmapObject(CBgbObject *pBgbObject) {
 }
 
 //* CBgbMgr::ReleaseResources -- release all resources at termination
-bool CBgbMgr::ReleaseResources(void)
+bool CBgbMgr::ReleaseResources()
 // returns: true if error, false otherwise
 {
 	JXENTER(CBgbMgr::ReleaseResources) ;
@@ -1048,7 +1048,7 @@ bool CBgbMgr::ReleaseResources(void)
 *  DoAnimations();
 *
 *****************************************************************************/
-void CBgbMgr::DoAnimations(void) {
+void CBgbMgr::DoAnimations() {
 	CBgbObject *pBgbObject;
 	CLList *pList;
 
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bgb.h b/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
index 512e7bc36e9..b2eed3c93e4 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bgb.h
@@ -86,27 +86,27 @@ public:
 	bool PaintBitmapObject(CBgbObject *, bool bPaint PDFT(false), CRect *p = nullptr);
 	bool AnimateSprite(CBgbObject *, CPoint, CPoint);
 	bool InitDc(CView *xpView, CBsuSet *xpBsuSet PDFT(nullptr), CDC *xpDc PDFT(nullptr));
-	bool ReInitDc(void);
+	bool ReInitDc();
 	bool AdjustLockCount(int iIncr);
 	bool SetBrush(COLORREF cBrushColor, int iBrushStyle PDFT(BS_SOLID));
 	bool SetPen(COLORREF cPenColor, int iPenWidth PDFT(0));
-	bool ReleaseDc(void);
+	bool ReleaseDc();
 	bool ClearBitmapObject(CBgbObject *lpcBgbObject);
-	bool ReleaseResources(void);
-	void DoAnimations(void);
-	void PauseAnimations(void) {
+	bool ReleaseResources();
+	void DoAnimations();
+	void PauseAnimations() {
 		m_bAnimationsPaused = true;
 	}
-	void ResumeAnimations(void) {
+	void ResumeAnimations() {
 		m_bAnimationsPaused = false;
 	}
-	bool AnimationsActive(void) const {
+	bool AnimationsActive() const {
 		return !m_bAnimationsPaused;
 	}
 
 	void CacheLoadObject(CBgbObject *);
 	void CacheReleaseObject(CBgbObject *);
-	void CacheFlush(void);
+	void CacheFlush();
 	void CacheOptimize(unsigned long);
 };
 
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
index 3b8c6be984c..7c32614bea3 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.cpp
@@ -36,7 +36,7 @@ static  bool    bScrollTemp;
 ///DEFS bsutl.h
 
 //* CBsuSet::~CBsuSet -- destructor
-CBsuSet::~CBsuSet(void)
+CBsuSet::~CBsuSet()
 // returns: true if error, false otherwise
 {
 	JXENTER(CBsuSet::~CBsuSet);
@@ -166,7 +166,7 @@ cleanup:
 }
 
 //* CBsuSet::UpdateWndDeviceExtents -- update window devices coordinates
-bool CBsuSet::UpdateWndDeviceExtents(void)
+bool CBsuSet::UpdateWndDeviceExtents()
 // returns: true if error, false otherwise
 {
 	JXENTER(CBsuSet::UpdateWndDeviceExtents);
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
index bc8d237c6b2..fac91c6a644 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bsutl.h
@@ -91,7 +91,7 @@ public:
 			&m_cEndData - &m_cStartData);
 	}
 
-	~CBsuSet(void);
+	~CBsuSet();
 	//- InitWndBsuSet -- initialize bsu set for a window
 	bool InitWndBsuSet(CWnd *xpWnd,
 		bool bScrollView PDFT(false), bool bScrollBars PDFT(false),
@@ -106,9 +106,9 @@ public:
 	//      by filling in the device fields
 	bool PrepareWndBsuSet(CSize cDocSize, CRect cScrollRect);
 	//- UpdateWndDeviceExtents -- update window devices coordinates
-	bool UpdateWndDeviceExtents(void);
+	bool UpdateWndDeviceExtents();
 	//- LinkWndBsuSet -- link window/dialog bsu sets
-	bool LinkWndBsuSet(void);
+	bool LinkWndBsuSet();
 	//- PrepareDc -- replace OnPrepareDC -- set the viewport and
 	//  the clip rectangle to the specified region
 	bool PrepareDc(CDC *xpDc, bool bRelocatable PDFT(true));
@@ -190,7 +190,7 @@ public:
 		m_bRelocatable = (bRelocatable != 0);
 	}
 
-	bool IfRelocatable(void) const {
+	bool IfRelocatable() const {
 		return m_bRelocatable != 0;
 	}
 
@@ -221,7 +221,7 @@ public:
 		m_bRelocatable = (bRelocatable != 0);
 	}
 
-	bool IfRelocatable(void) const {
+	bool IfRelocatable() const {
 		return m_bRelocatable != 0;
 	}
 
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/c1btndlg.h b/engines/bagel/hodjnpodj/metagame/bgen/c1btndlg.h
index 1c190a22283..e85f247c049 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/c1btndlg.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/c1btndlg.h
@@ -42,7 +42,7 @@ public:
 	               const char *pszText2 = nullptr, const char *pszText3 = nullptr);
 
 private:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Dialog Data
 	//{{AFX_DATA(C1ButtonDialog)
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/c2btndlg.h b/engines/bagel/hodjnpodj/metagame/bgen/c2btndlg.h
index b1795a79dd0..180079d8995 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/c2btndlg.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/c2btndlg.h
@@ -44,7 +44,7 @@ public:
 	               const char *pszText3 = nullptr);
 
 private:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Dialog Data
 	//{{AFX_DATA(C2ButtonDialog)
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/item.h b/engines/bagel/hodjnpodj/metagame/bgen/item.h
index d8e584e96a8..87ead7b6791 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/item.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/item.h
@@ -50,11 +50,11 @@ public:
 
 // Implementation
 public:
-	int GetID(void) {
+	int GetID() {
 		return (m_nID);
 	}
 
-	long GetQuantity(void) {
+	long GetQuantity() {
 		return (m_nQuantity);
 	}
 	void SetQuantity(long nQuantity) {
@@ -62,11 +62,11 @@ public:
 	}
 
 	#ifndef FRAME_EXE
-	char *GetDescription(void) {
+	char *GetDescription() {
 		return (GetDescription(m_nID, m_nQuantity));
 	}
 	#endif
-	int GetActionCode(void) {
+	int GetActionCode() {
 		return (m_nActionCode);
 	}
 	void SetActionCode(int nActionCode) {
@@ -74,28 +74,28 @@ public:
 	}
 
 	#ifndef FRAME_EXE
-	const char *GetArtSpec(void) {
+	const char *GetArtSpec() {
 		return (m_pItemBitmapPath[m_nID - MG_OBJ_BASE]);
 	}
-	const char *GetSoundSpec(void) {
+	const char *GetSoundSpec() {
 		return (m_pItemSoundPath[m_nID - MG_OBJ_BASE]);
 	}
 
-	int GetValue(void) {
+	int GetValue() {
 		return (m_nValue[m_nID - MG_OBJ_BASE]);
 	}
 	#endif
 
 	bool AddNote(int nID, int nClue, int nRepeat, int nPerson, int nPlace);
 	bool AddNote(CNote *pNote);
-	CNote *GetFirstNote(void) {
+	CNote *GetFirstNote() {
 		return (m_pNotes);
 	}
 
-	CItem  *GetNext(void) {
+	CItem  *GetNext() {
 		return (m_pNext);
 	}
-	CItem *GetPrev(void) {
+	CItem *GetPrev() {
 		return (m_pPrev);
 	}
 
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/note.h b/engines/bagel/hodjnpodj/metagame/bgen/note.h
index 0bd0bd6083e..0cd48dc5b7e 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/note.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/note.h
@@ -44,35 +44,35 @@ public:
 
 // Implementation
 public:
-	int GetID(void) {
+	int GetID() {
 		return (m_nID);
 	}
 	void SetID(int nID) {
 		m_nID = nID;
 	}
 
-	int GetClueID(void) {
+	int GetClueID() {
 		return (m_nClueID);
 	}
 	void SetClueID(int nClue) {
 		m_nClueID = nClue;
 	}
 
-	int GetRepeatCount(void) {
+	int GetRepeatCount() {
 		return (m_nRepeatCount);
 	}
 	void SetRepeatCount(int nRepeat) {
 		m_nRepeatCount = nRepeat;
 	}
 
-	int GetPersonID(void) {
+	int GetPersonID() {
 		return (m_nPersonID);
 	}
 	void SetPersonID(int nPerson) {
 		m_nPersonID = nPerson;
 	}
 
-	int GetPlaceID(void) {
+	int GetPlaceID() {
 		return (m_nPlaceID);
 	}
 	void SetPlaceID(int nPlace) {
@@ -80,7 +80,7 @@ public:
 	}
 
 	#ifndef FRAME_EXE
-	const char *GetClueArtSpec(void) {
+	const char *GetClueArtSpec() {
 		if ((m_nClueID >= NOTE_ICON_BASE) &&
 		        (m_nClueID < NOTE_ICON_BASE + NOTE_ICON_COUNT))
 			return (m_pNoteBitmapPath[m_nClueID]);
@@ -88,7 +88,7 @@ public:
 			return nullptr;
 	}
 
-	const char *GetPersonArtSpec(void) {
+	const char *GetPersonArtSpec() {
 		if ((m_nPersonID >= NOTE_ICON_BASE) &&
 		        (m_nPersonID < NOTE_ICON_BASE + NOTE_ICON_COUNT))
 			return (m_pNoteBitmapPath[m_nPersonID]);
@@ -96,7 +96,7 @@ public:
 			return nullptr;
 	}
 
-	const char *GetPlaceArtSpec(void) {
+	const char *GetPlaceArtSpec() {
 		if ((m_nPlaceID >= NOTE_ICON_BASE) &&
 		        (m_nPlaceID < NOTE_ICON_BASE + NOTE_ICON_COUNT))
 			return (m_pNoteBitmapPath[m_nPlaceID]);
@@ -104,7 +104,7 @@ public:
 			return nullptr;
 	}
 
-	const char *GetDescription(void) {
+	const char *GetDescription() {
 		if ((m_nID >= 0) &&
 		        (m_nID < NOTE_COUNT))
 			return (m_pNoteText[m_nID]);
@@ -112,7 +112,7 @@ public:
 			return nullptr;
 	}
 
-	const char *GetPersonSoundSpec(void) {
+	const char *GetPersonSoundSpec() {
 		if ((m_nPersonID >= NOTE_ICON_BASE) &&
 		        (m_nPersonID < NOTE_ICON_BASE + NOTE_ICON_COUNT))
 			return (m_pNoteSoundPath[m_nPersonID]);
@@ -120,7 +120,7 @@ public:
 			return nullptr;
 	}
 
-	const char *GetPlaceSoundSpec(void) {
+	const char *GetPlaceSoundSpec() {
 		if ((m_nPlaceID >= NOTE_ICON_BASE) &&
 		        (m_nPlaceID < NOTE_ICON_BASE + NOTE_ICON_COUNT))
 			return (m_pNoteSoundPath[m_nPlaceID]);
@@ -129,10 +129,10 @@ public:
 	}
 	#endif
 
-	CNote  *GetNext(void) {
+	CNote  *GetNext() {
 		return (m_pNext);
 	}
-	CNote *GetPrev(void) {
+	CNote *GetPrev() {
 		return (m_pPrev);
 	}
 
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp b/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
index 3d35c334047..085dd9cc9cb 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/notebook.cpp
@@ -100,7 +100,7 @@ static  CNote *pKeyNote = nullptr;               // single note to be shown
 
 
 
-bool CNotebook::SetupKeyboardHook(void) {
+bool CNotebook::SetupKeyboardHook() {
 	pNotebookDialog = this;                         // retain pointer to our dialog box
 
 	hKbdHook = SetWindowsHookEx(WH_KEYBOARD, NotebookHookProc, hExeInst, GetCurrentTask());
@@ -111,7 +111,7 @@ bool CNotebook::SetupKeyboardHook(void) {
 }
 
 
-void CNotebook::RemoveKeyboardHook(void) {
+void CNotebook::RemoveKeyboardHook() {
 	if (m_bKeyboardHook)
 		UnhookWindowsHookEx(hKbdHook);                  // unhook our keyboard procedure
 
@@ -228,7 +228,7 @@ void CNotebook::OnOK() {
 }
 
 
-void CNotebook::OnCancel(void) {
+void CNotebook::OnCancel() {
 	ClearDialogImage();                             // pre-clear dialog buttons
 	CDialog::OnCancel();                            // ... and restore background
 }
@@ -250,11 +250,11 @@ void CNotebook::OnDestroy() {
 		RemoveKeyboardHook();
 
 	if (pWorkOld != nullptr) {                         // release the various contexts, palettes
-		(void)(*pWorkDC).SelectObject(pWorkOld);    // ... and bitmaps that we used
+		(*pWorkDC).SelectObject(pWorkOld);    // ... and bitmaps that we used
 		pWorkOld = nullptr;
 	}
 	if (pWorkPalOld != nullptr) {
-		(void)(*pWorkDC).SelectPalette(pWorkPalOld, false);
+		(*pWorkDC).SelectPalette(pWorkPalOld, false);
 		pWorkPalOld = nullptr;
 	}
 	if (pWork != nullptr) {
@@ -559,7 +559,7 @@ void CNotebook::UpdateContent(CDC *pDC) {
 		}
 	}
 
-	(void)(*pDC).SelectObject(pFontOld);                            // map out the font
+	(*pDC).SelectObject(pFontOld);                            // map out the font
 }
 
 
@@ -576,7 +576,7 @@ bool CNotebook::OnEraseBkgnd(CDC *) {
 }
 
 
-void CNotebook::ClearDialogImage(void) {
+void CNotebook::ClearDialogImage() {
 	if (pBackgroundBitmap != nullptr) {                            // release the dialog button
 		delete pOKButton;                                       // ... validate our window to avoid refresh
 		pOKButton = nullptr;                                       // ... and restore the background
@@ -586,7 +586,7 @@ void CNotebook::ClearDialogImage(void) {
 }
 
 
-void CNotebook::RefreshBackground(void) {
+void CNotebook::RefreshBackground() {
 	CDC *pDC;
 
 	if (pBackgroundBitmap != nullptr) {
@@ -645,7 +645,7 @@ bool CNotebook::CreateWorkAreas(CDC *pDC) {
 		pBackgroundBitmap = nullptr;
 
 	(*pDC).SelectPalette(pBackgroundPalette, false); // create an offscreen bitmap that
-	(void)(*pDC).RealizePalette();                           // ... we can use to construct note
+	(*pDC).RealizePalette();                           // ... we can use to construct note
 	// ... entries to avoid flashes
 	if ((GetFreeSpace(0) >= (unsigned long)1000000) &&
 		(GlobalCompact((unsigned long)500000) >= (unsigned long)450000)) {
@@ -655,7 +655,7 @@ bool CNotebook::CreateWorkAreas(CDC *pDC) {
 			if ((pWorkDC != nullptr) &&
 				(*pWorkDC).CreateCompatibleDC(pDC)) {
 				pWorkPalOld = (*pWorkDC).SelectPalette(pBackgroundPalette, false);
-				(void)(*pWorkDC).RealizePalette();
+				(*pWorkDC).RealizePalette();
 				pWorkOld = (*pWorkDC).SelectObject(pWork);
 				if (pWorkOld != nullptr)
 					bSuccess = true;
@@ -667,11 +667,11 @@ bool CNotebook::CreateWorkAreas(CDC *pDC) {
 		bSuccess = true;
 	}
 
-	(void)(*pDC).SelectPalette(pWorkPalOld, false);
+	(*pDC).SelectPalette(pWorkPalOld, false);
 
 	if (!bSuccess) {                                        // not successful, so tear down
 		if (pWorkPalOld != nullptr) {                          // ... the work area
-			(void)(*pWorkDC).SelectPalette(pWorkPalOld, false);
+			(*pWorkDC).SelectPalette(pWorkPalOld, false);
 			pWorkPalOld = nullptr;
 		}
 		if (pWork != nullptr) {
@@ -790,21 +790,21 @@ bool CNotebook::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int
 }
 
 
-void CNotebook::DoWaitCursor(void) {
+void CNotebook::DoWaitCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).BeginWaitCursor();
+	(*pMyApp).BeginWaitCursor();
 }
 
 
-void CNotebook::DoArrowCursor(void) {
+void CNotebook::DoArrowCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).EndWaitCursor();
+	(*pMyApp).EndWaitCursor();
 }
 
 } // namespace Gtl
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/notebook.h b/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
index 6117f420e8e..0ea7d5a65db 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
+++ b/engines/bagel/hodjnpodj/metagame/bgen/notebook.h
@@ -89,16 +89,16 @@ public:
 	static  void UpdateNotebook(CDC *pDC);
 	static  void UpdateContent(CDC *pDC);
 	static  void UpdateNote(CDC *pDC);
-	static  void ClearDialogImage(void);
-	static  void RefreshBackground(void);
-	static  void DoWaitCursor(void);
-	static  void DoArrowCursor(void);
+	static  void ClearDialogImage();
+	static  void RefreshBackground();
+	static  void DoWaitCursor();
+	static  void DoArrowCursor();
 
 private:
 	static  void ShowClue(CNote *pNote);
 
-	bool SetupKeyboardHook(void);
-	void RemoveKeyboardHook(void);
+	bool SetupKeyboardHook();
+	void RemoveKeyboardHook();
 
 	bool CreateWorkAreas(CDC *pDC);
 
@@ -127,12 +127,12 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(CNotebook)
 	afx_msg int  OnCreate(LPCREATESTRUCT lpCreateStruct);
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 	afx_msg bool OnEraseBkgnd(CDC *pDC);
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
-	afx_msg void OnDestroy(void);
-	afx_msg void OnPaint(void);
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
+	afx_msg void OnDestroy();
+	afx_msg void OnPaint();
 	afx_msg void OnShowWindow(bool bShow, unsigned int nStatus);
 	afx_msg void OnSize(unsigned int nType, int cx, int cy);
 	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
diff --git a/engines/bagel/hodjnpodj/metagame/frame/dialogs.h b/engines/bagel/hodjnpodj/metagame/frame/dialogs.h
index 19f80ee9070..892553129df 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/dialogs.h
+++ b/engines/bagel/hodjnpodj/metagame/frame/dialogs.h
@@ -45,12 +45,12 @@ public:
 
 private:
 	bool OnInitDialog() override;
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
@@ -94,12 +94,12 @@ public:
 
 private:
 	bool OnInitDialog() override;
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index d05882badf7..24036828766 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -81,7 +81,7 @@ using GrandTour::LPGRANDTRSTRUCT;
 typedef HWND (FAR PASCAL *FPZOOMFUNCT)(HWND, bool);
 typedef HWND (FAR PASCAL *FPGTFUNCT)(HWND, LPGRANDTRSTRUCT);
 typedef HWND (FAR PASCAL *FPMETAFUNCT)(HWND, CBfcMgr *, bool);
-typedef uint32 (FAR PASCAL * FPGETFREEMEMINFO)(void);
+typedef uint32 (FAR PASCAL * FPGETFREEMEMINFO)();
 
 // Flags when a .dll in the original is loaded
 
@@ -319,7 +319,7 @@ CHodjPodjWindow::CHodjPodjWindow() {
 }
 
 
-void CHodjPodjWindow::GetProfileSettings(void) {
+void CHodjPodjWindow::GetProfileSettings() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
@@ -337,7 +337,7 @@ void CHodjPodjWindow::GetProfileSettings(void) {
 }
 
 
-void CHodjPodjWindow::SaveProfileSettings(void) {
+void CHodjPodjWindow::SaveProfileSettings() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
@@ -348,7 +348,7 @@ void CHodjPodjWindow::SaveProfileSettings(void) {
 }
 
 
-void LoadFloatLib(void) {
+void LoadFloatLib() {
 	double fHack = 3.1415;
 
 	fHack = fHack / 1.4;
@@ -373,7 +373,7 @@ bool CHodjPodjWindow::CheckConfig(CDC *pDC) {
 }
 
 
-bool CHodjPodjWindow::CheckLowMemory(void) {
+bool CHodjPodjWindow::CheckLowMemory() {
 	bool bMemoryProblem;
 	uint32 dwFreeSpace;
 
@@ -772,7 +772,7 @@ bool CHodjPodjWindow::OnEraseBkgnd(CDC *) {
 }
 
 
-void CHodjPodjWindow::BlackScreen(void) {
+void CHodjPodjWindow::BlackScreen() {
 	CDC         *pDC;
 	CBrush      Brush(RGB(0, 0, 0));
 	CPalette    *pPalOld = nullptr;
@@ -784,13 +784,13 @@ void CHodjPodjWindow::BlackScreen(void) {
 
 	if (pGamePalette != nullptr) {                                  // map in color palette to be used
 		pPalOld = (*pDC).SelectPalette(pGamePalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	pDC->FillRect(&MainRect, &Brush);
 
 	if (pPalOld != nullptr)                                 // relinquish the resources we built
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ReleaseDC(pDC);
 }
@@ -824,7 +824,7 @@ void CHodjPodjWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsign
 
 
 LRESULT CHodjPodjWindow::OnMCINotify(WPARAM wParam, LPARAM lParam) {
-	(void) CSound::OnMCIStopped(wParam, lParam);
+	CSound::OnMCIStopped(wParam, lParam);
 	return 0;
 }
 
@@ -953,7 +953,7 @@ void    CHodjPodjWindow::LoadNewDLL(LPARAM lParam) {
 		if (bLoadedDLL == false) {
 			CString     cTmp;
 
-			(void) PositionAtHomePath();
+			PositionAtHomePath();
 
 			cTmp = "Unable to find or load the ";
 			cTmp += CMgStatic::cGameTable[ nWhichDLL ].m_lpszGameName;
@@ -973,14 +973,14 @@ void    CHodjPodjWindow::LoadNewDLL(LPARAM lParam) {
 }
 
 
-void CHodjPodjWindow::FreeCurrentDLL(void) {
+void CHodjPodjWindow::FreeCurrentDLL() {
 	delete g_wndGame;
 	g_wndGame = nullptr;
 	dllLoaded = false;
 }
 
 
-bool CHodjPodjWindow::LoadMetaDLL(void) {
+bool CHodjPodjWindow::LoadMetaDLL() {
 	FreeCurrentDLL();
 	dllLoaded = true;
 	Metagame::Gtl::RunMeta(m_hWnd, lpMetaGame, false);
@@ -989,7 +989,7 @@ bool CHodjPodjWindow::LoadMetaDLL(void) {
 	return true;
 }
 
-bool CHodjPodjWindow::LoadZoomDLL(void) {
+bool CHodjPodjWindow::LoadZoomDLL() {
 	dllLoaded = true;
 	g_wndGame = CWnd::FromHandle(Metagame::Zoom::RunZoomMap(m_hWnd,
 		nChallengePhase == 0));
@@ -999,7 +999,7 @@ bool CHodjPodjWindow::LoadZoomDLL(void) {
 }
 
 
-bool CHodjPodjWindow::LoadGrandTourDLL(void) {
+bool CHodjPodjWindow::LoadGrandTourDLL() {
 	if (lpGrandTour == nullptr) {
 		int i;
 
@@ -1614,7 +1614,7 @@ void CHodjPodjWindow::OnParentNotify(unsigned int msg, LPARAM lParam) {
 		nGameReturn = lParam;
 
 		if (dllLoaded) {
-			(void) PositionAtHomePath();
+			PositionAtHomePath();
 
 			if (nGameReturn < 0) {
 				bReturnToZoom = false;
@@ -1711,12 +1711,12 @@ bool CHodjPodjWindow::FindCDROM() {
 }
 
 
-bool CHodjPodjWindow::DriveWriteLocked(void) {
+bool CHodjPodjWindow::DriveWriteLocked() {
 	return false;
 }
 
 
-void CHodjPodjWindow::StartBackgroundMidi(void) {
+void CHodjPodjWindow::StartBackgroundMidi() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
@@ -1731,7 +1731,7 @@ void CHodjPodjWindow::StartBackgroundMidi(void) {
 }
 
 
-void CHodjPodjWindow::StopBackgroundMidi(void) {
+void CHodjPodjWindow::StopBackgroundMidi() {
 	if (pBackgroundMidi != nullptr) {
 		(*pBackgroundMidi).stop();
 		delete pBackgroundMidi;
@@ -1761,7 +1761,7 @@ void CHodjPodjWindow::OnClose() {
 }
 
 
-void CHodjPodjWindow::ReleaseResources(void) {
+void CHodjPodjWindow::ReleaseResources() {
 	CSound::clearSounds();
 
 	if (bMetaLoaded) {
@@ -2007,7 +2007,7 @@ void InitBFCInfo(CBfcMgr *pBfcMgr) {
  *
  ****************************************************************/
 
-void CHodjPodjWindow::FlushInputEvents(void) {
+void CHodjPodjWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
@@ -2098,7 +2098,7 @@ bool CHodjPodjWindow::Restore() {
 }
 
 
-void CHodjPodjWindow::ShowCredits(void) {
+void CHodjPodjWindow::ShowCredits() {
 	MSG msg;
 	long lTimeElapsed, lStart;
 	unsigned long lGoal, lWait;
diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
index c3e79746ec0..9de1044cb94 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.h
@@ -70,48 +70,48 @@ private:
 public:
 	CHodjPodjWindow();
 
-	void BlackScreen(void);
+	void BlackScreen();
 
-	void FreeCurrentDLL(void);
-	bool LoadMetaDLL(void);
-	bool LoadZoomDLL(void);
-	bool LoadGrandTourDLL(void);
+	void FreeCurrentDLL();
+	bool LoadMetaDLL();
+	bool LoadZoomDLL();
+	bool LoadGrandTourDLL();
 
 	void HandleError(ERROR_CODE);
 
 	void PlayMovie(const int, const char *, bool);
 
-	void GetProfilePath(void);
-	void GetHomePath(void);
-	bool GetCDPath(void);
-	bool PositionAtHomePath(void);
+	void GetProfilePath();
+	void GetHomePath();
+	bool GetCDPath();
+	bool PositionAtHomePath();
 	bool PositionAtMiniPath(int);
-	bool PositionAtCDPath(void);
-	bool FindCDROM(void);
-	bool DriveWriteLocked(void);
+	bool PositionAtCDPath();
+	bool FindCDROM();
+	bool DriveWriteLocked();
 
-	long DetermineChallengeScore(void);
+	long DetermineChallengeScore();
 	LPARAM UpdateChallengePhase(LPARAM);
-	void SetComputerScore(void);
+	void SetComputerScore();
 
-	void GetProfileSettings(void);
-	void SaveProfileSettings(void);
+	void GetProfileSettings();
+	void SaveProfileSettings();
 
-	bool CheckLowMemory(void);
+	bool CheckLowMemory();
 
-	bool Restore(void);
-	void ShowCredits(void);
+	bool Restore();
+	void ShowCredits();
 
-	static  void ReleaseResources(void);
-	static  void FlushInputEvents(void);
+	static  void ReleaseResources();
+	static  void FlushInputEvents();
 
 private:
 	bool CheckConfig(CDC *pDC);
-	bool SetupNewMeta(void);
+	bool SetupNewMeta();
 	void LoadNewDLL(LPARAM);
-	void UpdateDLLRouting(void);
-	void StartBackgroundMidi(void);
-	void StopBackgroundMidi(void);
+	void UpdateDLLRouting();
+	void StartBackgroundMidi();
+	void StopBackgroundMidi();
 
 protected:
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
diff --git a/engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp b/engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
index 0acc6d61abf..cb41e25bbd6 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/maindlg.cpp
@@ -122,14 +122,14 @@ bool CMainGameDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CBmpDialog::OnCommand(wParam, lParam);
 }
 
-void CMainGameDlg::OnCancel(void) {
+void CMainGameDlg::OnCancel() {
 	ClearDialogImage();
 //  CBmpDialog::OnCancel();
 	EndDialog(0);
 	return;
 }
 
-void CMainGameDlg::OnOK(void) {
+void CMainGameDlg::OnOK() {
 	if (m_pPlayMetaButton->GetState() & 0x0008) {
 		SendMessage(WM_COMMAND, IDC_PLAY_META, (LPARAM)BN_CLICKED);
 		return;
@@ -157,7 +157,7 @@ void CMainGameDlg::OnOK(void) {
 	return;
 }
 
-void CMainGameDlg::ClearDialogImage(void) {
+void CMainGameDlg::ClearDialogImage() {
 	/*
 	    if ( m_pPlayMetaButton != nullptr ) {
 	        delete m_pPlayMetaButton;
@@ -402,7 +402,7 @@ bool CMainGameDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CMainGameDlg::OnPaint(void) {
+void CMainGameDlg::OnPaint() {
 
 //      call CBmpDialog onpaint, to paint the background
 	CBmpDialog::OnPaint();
diff --git a/engines/bagel/hodjnpodj/metagame/frame/msudlg.cpp b/engines/bagel/hodjnpodj/metagame/frame/msudlg.cpp
index a304313d464..22df9ea2ee2 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/msudlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/msudlg.cpp
@@ -197,13 +197,13 @@ bool CMetaSetupDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CBmpDialog::OnCommand(wParam, lParam);
 }
 
-void CMetaSetupDlg::OnCancel(void) {
+void CMetaSetupDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CMetaSetupDlg::OnOK(void) {
+void CMetaSetupDlg::OnOK() {
 
 	if (pPlayButton->GetState() & 0x0008) {
 		SendMessage(WM_COMMAND, IDC_PLAY, (LPARAM)BN_CLICKED);
@@ -261,7 +261,7 @@ void CMetaSetupDlg::OnOK(void) {
 	return;
 }
 
-void CMetaSetupDlg::ClearDialogImage(void) {
+void CMetaSetupDlg::ClearDialogImage() {
 	/*
 	    if ( pPlayButton != nullptr )
 	        delete pPlayButton;
@@ -483,7 +483,7 @@ bool CMetaSetupDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CMetaSetupDlg::OnPaint(void) {
+void CMetaSetupDlg::OnPaint() {
 //      call CBmpDialog onpaint, to paint the background
 	CBmpDialog::OnPaint();
 
diff --git a/engines/bagel/hodjnpodj/metagame/grand_tour/dialogs.h b/engines/bagel/hodjnpodj/metagame/grand_tour/dialogs.h
index cd43c83b210..0a33db5679c 100644
--- a/engines/bagel/hodjnpodj/metagame/grand_tour/dialogs.h
+++ b/engines/bagel/hodjnpodj/metagame/grand_tour/dialogs.h
@@ -43,12 +43,12 @@ public:
 private:
 	void GetScores();
 	bool OnInitDialog() override;
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
index 5b62cfc2852..66523ed00ef 100644
--- a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
+++ b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
@@ -1855,7 +1855,7 @@ void CMainGTWindow::OnDestroy() {
 
 #define DEL(X) delete X; X = nullptr
 
-void CMainGTWindow::ReleaseResources(void) {
+void CMainGTWindow::ReleaseResources() {
 	DEL(pText);
 
 	DEL(pScoresResetButton);
@@ -1916,7 +1916,7 @@ void CMainGTWindow::ReleaseResources(void) {
  *
  ****************************************************************/
 
-void CMainGTWindow::FlushInputEvents(void) {
+void CMainGTWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
index 5d097afbc1b..1b51fe73040 100644
--- a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
+++ b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.h
@@ -104,17 +104,17 @@ public:
 	CMainGTWindow(HWND, LPGRANDTRSTRUCT);
 	~CMainGTWindow();
 
-	void SplashScreen(void);
-	void AdjustScore(void);
-	void GetScores(void);
-	void SaveScores(void);
-	void ResetScores(void);
-	void SaveCurrGame(void);
-	void RestoreGame(void);
+	void SplashScreen();
+	void AdjustScore();
+	void GetScores();
+	void SaveScores();
+	void ResetScores();
+	void SaveCurrGame();
+	void RestoreGame();
 	int GetNextGameCode(bool = true);
 
-	static  void ReleaseResources(void);
-	static  void FlushInputEvents(void);
+	static  void ReleaseResources();
+	static  void FlushInputEvents();
 
 private:
 
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/citemdlg.h b/engines/bagel/hodjnpodj/metagame/gtl/citemdlg.h
index b13a8a7d605..b3baf85f91b 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/citemdlg.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/citemdlg.h
@@ -81,7 +81,7 @@ public:
 //}}AFX_DATA
 
 private:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Implementation
 protected:
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.h b/engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.h
index 424e05c637f..e97394ead6f 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/cmapdlg.h
@@ -67,7 +67,7 @@ public:
 	// standard constructor
 	CMapDialog(CWnd* pParent, CPalette *pPalette, POINT HodjLoc, POINT PodjLoc);
 
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Dialog Data
 	//{{AFX_DATA(CMapDialog)
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/cturndlg.cpp b/engines/bagel/hodjnpodj/metagame/gtl/cturndlg.cpp
index 0847f0593ac..611f58edb79 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/cturndlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/cturndlg.cpp
@@ -159,7 +159,7 @@ bool CTurnDialog::OnEraseBkgnd(CDC *) {
 	return true;
 }
 
-void CTurnDialog::ClearDialogImage(void) {
+void CTurnDialog::ClearDialogImage() {
 	if (m_pTextMessage != nullptr) {
 		delete m_pTextMessage;
 		m_pTextMessage = nullptr;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/cturndlg.h b/engines/bagel/hodjnpodj/metagame/gtl/cturndlg.h
index 25631cee53c..5e80d07ec79 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/cturndlg.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/cturndlg.h
@@ -62,7 +62,7 @@ public:
 
 	// standard constructor
 	CTurnDialog(CWnd *pParent, CPalette *pPalette, bool bHodj, bool bGain, bool bTurn);
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Dialog Data
 	//{{AFX_DATA(CTurnDialog)
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp b/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
index 3b594fe5229..f22130acfe4 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/encount.cpp
@@ -610,7 +610,7 @@ int DoEncounter(CWnd *pWnd, CPalette *pPalette, bool bHodj, CInventory *pInvento
 			nTestProb = TRAP_PROB;                                  // Get probability, scaled by ten
 			nRandom = brand() % RAND_FACTOR;
 			if (nTestProb >= nRandom) {                                        // If we are in the probability percentage...
-				// check ItemCount(void), set Item flag
+				// check ItemCount(), set Item flag
 				pItem = (*pInventory).FindItem(MG_OBJ_MISH);                    // See if they have mish or mosh
 				if (pItem != nullptr)                                              // don't count crowns and notebook
 					nItems = (*pInventory).ItemCount() - INVENT_MIN_ITEM_COUNT - ENC_MISHMOSH; // and Mish & Mosh
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
index 90526d80cf9..6ee6255eab3 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtl.cpp
@@ -117,7 +117,7 @@ bool CGtlApp::InitInstance() {
 }
 
 
-void CGtlApp::CreateInstance(void) {
+void CGtlApp::CreateInstance() {
 	pSdiDocTemplate = new CSingleDocTemplate(
 	    IDR_GTLTYPE,
 	    RUNTIME_CLASS(CGtlDoc),
@@ -131,7 +131,7 @@ void CGtlApp::CreateInstance(void) {
 }
 
 //* CGtlApp::CallOnFileNew --
-bool CGtlApp::CallOnFileNew(void)
+bool CGtlApp::CallOnFileNew()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlApp::CallOnFileNew) ;
@@ -146,7 +146,7 @@ bool CGtlApp::CallOnFileNew(void)
 }
 
 //* CGtlApp::CallOnFileOpen --
-bool CGtlApp::CallOnFileOpen(void)
+bool CGtlApp::CallOnFileOpen()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlApp::CallOnFileOpen) ;
@@ -161,7 +161,7 @@ bool CGtlApp::CallOnFileOpen(void)
 }
 
 //* CGtlApp::CallOnFileSave --
-bool CGtlApp::CallOnFileSave(void)
+bool CGtlApp::CallOnFileSave()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlApp::CallOnFileSave) ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtl.h b/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
index da9c530f881..31687032a44 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtl.h
@@ -77,10 +77,10 @@ public:
 
 public:
 	bool InitApplication() override;
-	void CreateInstance(void);
-	bool CallOnFileNew(void) ;
-	bool CallOnFileOpen(void) ;
-	bool CallOnFileSave(void) ;
+	void CreateInstance();
+	bool CallOnFileNew() ;
+	bool CallOnFileOpen() ;
+	bool CallOnFileSave() ;
 	//- DoMessageBox -- override of CWinApp function to
 	//              display message box messages
 	virtual int DoMessageBox(const char *lpszPrompt,
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
index 7b9e0764876..dae53b67f45 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlcpl.cpp
@@ -57,7 +57,7 @@ int CGtlData::Compile(const char *xpszPathName) {
 	while (!bDone) {
 
 		if (!CGtlData::ReadLine())  // read line, check for error
-			(void)CGtlData::ParseLine();
+			CGtlData::ParseLine();
 
 		if (m_bEof)     // if end of file
 			bDone = true ;
@@ -82,7 +82,7 @@ cleanup:
 
 
 //* CGtlData::ParseLine -- parse input line
-bool CGtlData::ParseLine(void)
+bool CGtlData::ParseLine()
 // returns: true if error, false otherwise
 {
 	char szBuf[MAX_LABEL_LENGTH];
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
index 96641e8b2c5..78bdb21824d 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldat.h
@@ -143,8 +143,8 @@ class CGtlView;
 
 class CMemDC {
 public:
-	CMemDC(void);
-	~CMemDC(void);
+	CMemDC();
+	~CMemDC();
 
 	CDC      *m_pDC;
 	CPalette *m_pPalOld;
@@ -220,7 +220,7 @@ public:
 
 	CNode();
 
-	bool IfRelocatable(void) {
+	bool IfRelocatable() {
 		return (m_bRelocatable != 0) ;
 	}
 };
@@ -240,7 +240,7 @@ class CStratLocInfo {
 	int m_iAdjustedWeight ;     // weight adjusted by distance
 
 	char m_cEndData ;
-	CStratLocInfo(void) {
+	CStratLocInfo() {
 		memset(&m_cStartData,
 		       0, &m_cEndData - &m_cStartData) ;
 	}
@@ -266,7 +266,7 @@ class CStrategyInfo {
 
 	CStratLocInfo m_cStratLocInfo[MG_LOC_MAX + 1] ;
 
-	CStrategyInfo(void) {
+	CStrategyInfo() {
 		memset(&m_cStartData,
 		       0, &m_cEndData - &m_cStartData) ;
 	}
@@ -432,7 +432,7 @@ public:
 
 	// constructor zeroes out all fields and allocates far arrays
 public:
-	void ClearData(void) {
+	void ClearData() {
 		memset(&m_cStartData,
 		       0, &m_cEndData - &m_cStartData) ;
 	}
@@ -457,7 +457,7 @@ public:
 	int Compile(const char *xpszPathName);
 
 	//- ParseLine -- parse input line
-	bool ParseLine(void) ;
+	bool ParseLine() ;
 	//- ParseInteger -- parse integer, store into node structure
 	CLexElement *ParseInteger(CLexElement * xpLxel,
 	                          int iPrevType, int FAR& iValue) ;
@@ -484,7 +484,7 @@ private:
 	//- FindKeyword -- find keyword, given tree node type
 	const char *FindKeyword(int iType) ;
 	//- ReadLine -- read input line
-	bool ReadLine(void) ;
+	bool ReadLine() ;
 	//- ErrorMsg -- publish error message
 	bool ErrorMsg(CLexElement * xpLxel, const char *szMessage) ;
 
@@ -493,19 +493,19 @@ private:
 public:
 	//- CGtlData -- constructor -- zero out all fields, allocate
 	//      arrays, and set colors
-	CGtlData(void) ;
-	~CGtlData(void) ;
+	CGtlData() ;
+	~CGtlData() ;
 
-	void    CreateOffScreenBmp(void);
-	void    DeleteOffScreenBmp(void);
-	void    PaintOffScreenBmp(void);
-	CMemDC *GetMemDC(void);
+	void    CreateOffScreenBmp();
+	void    DeleteOffScreenBmp();
+	void    PaintOffScreenBmp();
+	CMemDC *GetMemDC();
 	void    ReleaseMemDC(CMemDC *);
 
 
-	bool SetColors(void) ;
+	bool SetColors() ;
 	//- ClearInhibitDraw -- clear m_bInhibitDraw flag
-	bool ClearInhibitDraw(void) ;
+	bool ClearInhibitDraw() ;
 	//- Draw -- draw data
 	bool Draw(CGtlView * xpGtlView, CRect * xpClipRect,
 	          CDC* xpDc PDFT(nullptr)) ;
@@ -541,7 +541,7 @@ private:
 	bool UpdateNodeDialog(bool bRetrieve) ;
 
 	//- UpdateFocusRect -- update focus rectangle for hiliting
-	bool UpdateFocusRect(void) ;
+	bool UpdateFocusRect() ;
 
 	//- AdjustToView -- set up bitmaps for view
 	bool AdjustToView(CGtlView *);
@@ -567,7 +567,7 @@ private:
 	//- ModifySelectNode -- modify node select/deselect
 	bool ModifySelectNode(CNode FAR * lpNode PDFT(nullptr), bool bSelect PDFT(true)) ;
 	//- GetSelectedNode -- return selected node, or nullptr if none
-	CNode FAR *GetSelectedNode(void) ;
+	CNode FAR *GetSelectedNode() ;
 	//- SelectLink -- select or deselect a link
 	bool SelectLink(CNode FAR * lpNode1 PDFT(nullptr), CNode FAR * lpNode2 PDFT(nullptr)) ;
 	//- IfLinked -- test whether two nodes are linked
@@ -623,7 +623,7 @@ private:
 
 public:
 	//- PositionCharacters -- set positions for Hodj and Podj
-	bool PositionCharacters(void) ;
+	bool PositionCharacters() ;
 
 private:
 	//- PositionACharacter -- find positions for Hodj and Podj
@@ -639,18 +639,18 @@ public:
 
 private:
 	//- InitProblem -- initialize character problem
-	bool InitProblem(void) ;
+	bool InitProblem() ;
 	//- EndMoveProcessing -- handle things at end of a move
-	bool EndMoveProcessing(void) ;
+	bool EndMoveProcessing() ;
 
 public:
 	//- SwitchPlayers -- switch between Hodj and Podj
-	bool SwitchPlayers(void) ;
+	bool SwitchPlayers() ;
 	//- InitInterface -- init data for interface manager
 	bool InitInterface(int iCode, bool & bExitDll) ;
 	//- ReturnFromInterface -- reset everything
 	//              after interface return
-	bool ReturnFromInterface(void) ;
+	bool ReturnFromInterface() ;
 
 private:
 	//- TakeIneligibleAction -- take action if character is at
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
index 41812d3dc16..2813152c104 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.cpp
@@ -122,7 +122,7 @@ bool CGtlDoc::OnSaveDocument(const char *xpszPathName) {
 
 
 //* CGtlDoc::DoOnFileSaveAs --
-bool CGtlDoc::DoOnFileSaveAs(void)
+bool CGtlDoc::DoOnFileSaveAs()
 // returns: true if error, false otherwise
 {
 	CDocument::OnFileSaveAs() ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h b/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
index e826ec8fb32..e9cae873b06 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtldoc.h
@@ -76,16 +76,16 @@ protected:
 	virtual bool OnSaveDocument(const char* xpszPathName);
 
 public:
-	virtual bool DoOnFileSaveAs(void);
+	virtual bool DoOnFileSaveAs();
 
 private:
 	//- OnChangedViewList -- called by MFC when a view is
 	//      added or deleted
-	virtual void OnChangedViewList(void) override;
+	virtual void OnChangedViewList() override;
 
 public:
 	//- FixChecks -- fix dialog box check marks
-	bool FixChecks(void);
+	bool FixChecks();
 
 };
 
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
index 8d493d11dec..37f97a95785 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.cpp
@@ -262,7 +262,7 @@ void CGtlFrame::RecalcLayout(bool bNotify)
 #if OLD_CODE
 
 ////* CGtlFrame::CallOnFileNew --
-void CGtlFrame::CallOnFileNew(void)
+void CGtlFrame::CallOnFileNew()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlFrame::CallOnFileNew) ;
@@ -278,7 +278,7 @@ void CGtlFrame::CallOnFileNew(void)
 }
 
 ////* CGtlFrame::CallOnFileOpen --
-void CGtlFrame::CallOnFileOpen(void)
+void CGtlFrame::CallOnFileOpen()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlFrame::CallOnFileOpen) ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
index 714ba68acec..3a8e4e8876b 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlfrm.h
@@ -89,10 +89,10 @@ protected:
 public:
 	//- NewFrame -- set pointer to interface manager in frame
 	bool NewFrame(CBfcMgr *lpBfcMgr PDFT(nullptr)) ;
-	bool ShowControlDialog(void) ;
-	bool ShowNodeDialog(void) ;
-	bool ShowInfoDialog(void) ;
-	bool ShowMenuDialog(void) ;
+	bool ShowControlDialog() ;
+	bool ShowNodeDialog() ;
+	bool ShowInfoDialog() ;
+	bool ShowMenuDialog() ;
 	//- GetCurrentDocAndView -- get last focused doc/view
 	bool GetCurrentDocAndView(CGtlDoc * &xpcGtlDoc,
 	                          CGtlView *&xpcGtlFocusView, CGtlView *&xpcGtlMouseView) ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtllex.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtllex.cpp
index 6f6e1392b1a..ed6e52485f9 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtllex.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtllex.cpp
@@ -84,7 +84,7 @@ const char *CGtlData::FindKeyword(int iType)
 }
 
 //* CGtlData::ReadLine -- read input line
-bool CGtlData::ReadLine(void)
+bool CGtlData::ReadLine()
 // returns: true if error, false otherwise
 {
 	int iError = 0 ;        // error code
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
index 3d1cf1f08d9..f350680e9cd 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmgm.cpp
@@ -284,7 +284,7 @@ bool CGtlData::MoveCharToNode(CNode FAR *lpTargetNode)
 
 	if ((lpiShortPath = FindShortestPath(lpNode, lpTargetNode)) == nullptr) {
 		C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", "You can't get there", "from here...");
-		(void) dlg1Button.DoModal();
+		dlg1Button.DoModal();
 		iError = 101 ;
 		goto cleanup ;
 	}
@@ -1039,7 +1039,7 @@ cleanup:
 }
 
 //* CGtlData::PositionCharacters -- set positions for Hodj and Podj
-bool CGtlData::PositionCharacters(void)
+bool CGtlData::PositionCharacters()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlData::PositionCharacters) ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
index 0e941124dea..57f1c172782 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlmve.cpp
@@ -223,7 +223,7 @@ int nMissTurn = 0;  // 0 - nobody misses turn; 1 - Hodj misses turn; 2 - Podj mi
 
 
 // destructor deletes strategy information object
-CXodj::~CXodj(void) {
+CXodj::~CXodj() {
 	if (m_xpStrategyInfo != nullptr)
 		delete m_xpStrategyInfo ;
 
@@ -235,7 +235,7 @@ CXodj::~CXodj(void) {
 }
 
 //* CGtlData::InitProblem -- initialize character problem
-bool CGtlData::InitProblem(void)
+bool CGtlData::InitProblem()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlData::InitProblem) ;
@@ -466,7 +466,7 @@ cleanup:
 }
 
 //* CGtlData::EndMoveProcessing -- handle things at end of a move
-bool CGtlData::EndMoveProcessing(void)
+bool CGtlData::EndMoveProcessing()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlData::EndMoveProcessing) ;
@@ -510,10 +510,10 @@ bool CGtlData::EndMoveProcessing(void)
 
 				if (lpMetaGameStruct->m_cHodj.m_bHaveMishMosh) {
 					C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", " ", "Podj challenges Hodj!");
-					(void) dlg1Button.DoModal();
+					dlg1Button.DoModal();
 				} else {
 					C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", " ", "Hodj challenges Podj!");
-					(void) dlg1Button.DoModal();
+					dlg1Button.DoModal();
 				}
 
 				CSound::waitWaveSounds();
@@ -572,10 +572,10 @@ bool CGtlData::EndMoveProcessing(void)
 
 				if (lpMetaGameStruct->m_cHodj.m_bHaveMishMosh) {
 					C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", " ", "Podj challenges Hodj!");
-					(void) dlg1Button.DoModal();
+					dlg1Button.DoModal();
 				} else {
 					C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", " ", "Hodj challenges Podj!");
-					(void) dlg1Button.DoModal();
+					dlg1Button.DoModal();
 				}
 
 				CSound::waitWaveSounds();
@@ -767,8 +767,8 @@ void CGtlData::DoTransport(CXodj *pXodj, int iNode) {
 
 
 //* CGtlData::SwitchPlayers -- switch between Hodj and Podj
-bool CGtlData::SwitchPlayers(void)
-//// int FAR PASCAL CGtlData::SwitchPlayers(void)
+bool CGtlData::SwitchPlayers()
+//// int FAR PASCAL CGtlData::SwitchPlayers()
 // returns: true if we need to switch players again, false otherwise
 {
 	CHodjPodj *pCurPlayer;
@@ -1648,7 +1648,7 @@ bool CGtlData::InitInterface(int iCode, bool & bExitDll)
 				char blurb[128];
 				Common::sprintf_s(blurb, "%d %s for the clue.", xpLocTable->m_iCost, (xpLocTable->m_iCost == 1 ? "crown" : "crowns"));
 				C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", (m_xpCurXodj->m_bHodj ? "Hodj generously offers" : "Podj generously offers"), blurb);
-				(void) dlg1Button.DoModal();
+				dlg1Button.DoModal();
 				m_xpCurXodj->m_pInventory->DiscardItem(MG_OBJ_CROWN, xpLocTable->m_iCost);
 			}
 
@@ -1726,7 +1726,7 @@ cleanup:
 }
 
 //* CGtlData::ReturnFromInterface -- reset everything after interface return
-bool CGtlData::ReturnFromInterface(void)
+bool CGtlData::ReturnFromInterface()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlData::ReturnFromInterface) ;
@@ -2115,10 +2115,10 @@ bool CGtlData::TakeIneligibleAction(CXodj *xpXodj, int iFunctionCode, int iLocat
 			if ((xpXodj->m_iWinInfoWon == xpXodj->m_iWinInfoNeed) &&
 			        (xpXodj->m_iSecondaryInfoWon == xpXodj->m_iSecondaryInfoNeed)) {
 				C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", (xpXodj->m_bHodj ? "Hodj has all the" : "Podj has all the"), "clues he needs!");
-				(void) dlg1Button.DoModal();
+				dlg1Button.DoModal();
 			} else if (xpXodj->m_iWinInfoWon == xpXodj->m_iWinInfoNeed) {
 				C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", (xpXodj->m_bHodj ? "Review Hodj's clues" : "Review Podj's clues"), "for what to do next.");
-				(void) dlg1Button.DoModal();
+				dlg1Button.DoModal();
 			}
 		} else if (iFunctionCode == MG_VISIT_INFO) {
 			if (bLacksMoney) {
@@ -2130,11 +2130,11 @@ bool CGtlData::TakeIneligibleAction(CXodj *xpXodj, int iFunctionCode, int iLocat
 				xpLocTable = CMgStatic::FindLoc(iLocationCode);
 				Common::sprintf_s(blurb, (m_xpCurXodj->m_bHodj ? "Hodj needs %ld more" : "Podj needs %ld more"), xpLocTable->m_iCost - m_xpCurXodj->m_pInventory->FindItem(MG_OBJ_CROWN)->GetQuantity());
 				C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", blurb, "crowns for the clue.");
-				(void) dlg1Button.DoModal();
+				dlg1Button.DoModal();
 			} else if ((xpXodj->m_iWinInfoWon == xpXodj->m_iWinInfoNeed) &&
 			           (xpXodj->m_iSecondaryInfoWon == xpXodj->m_iSecondaryInfoNeed)) {
 				C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", (xpXodj->m_bHodj ? "Hodj has all the" : "Podj has all the"), "clues he needs!");
-				(void) dlg1Button.DoModal();
+				dlg1Button.DoModal();
 			}
 		}
 	}
@@ -2880,7 +2880,7 @@ bool CGtlData::DivulgeInformation(CXodj * pXodj, bool bSecondary)
 		// show the clue in dialog box
 		if (pXodj->m_bComputer) {
 			C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", " ", (pXodj->m_bHodj ? "Hodj gets a clue!" : "Podj gets a clue!"));
-			(void) dlg1Button.DoModal();
+			dlg1Button.DoModal();
 		} else
 			pMainWindow->ShowClue(m_cBgbMgr.m_xpGamePalette, pNote);
 
@@ -3291,7 +3291,7 @@ bool CGtlData::DetermineGameEligibility(CXodj *xpXodj, int iGameCode, bool bExec
 				gpMyView->ReleaseDC(pDC);
 				if (!(nDevCaps & RC_PALETTE)) {
 					C1ButtonDialog dlg1Button((CWnd *)pMainWindow, m_cBgbMgr.m_xpGamePalette, "&OK", "To play Beacon,", "your display must be", "set to 256 colors.");
-					(void) dlg1Button.DoModal();
+					dlg1Button.DoModal();
 					bEligibility = false;
 				}
 			}
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
index dc3bd4b63de..c83300f73aa 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlui.cpp
@@ -45,7 +45,7 @@ namespace Gtl {
 #define PODJ_SOUND_END      64000
 #define PODJS_STARS_FILE    ".\\ART\\PSTAR.BMP"
 
-extern uint32 GetPhysicalMemory(void);
+extern uint32 GetPhysicalMemory();
 
 
 CNode::CNode() {
@@ -60,7 +60,7 @@ CNode::CNode() {
 
 //* CGtlData::CGtlData -- constructor -- zero out all fields, allocate
 //      arrays, and set colors
-CGtlData::CGtlData(void) {
+CGtlData::CGtlData() {
 	JXENTER(CGtlData::CGtlData) ;
 
 	TRACECONSTRUCTOR(CGtlData) ;
@@ -84,7 +84,7 @@ CGtlData::CGtlData(void) {
 }
 
 //* CGtlData::~CGtlData -- destructor
-CGtlData::~CGtlData(void) {
+CGtlData::~CGtlData() {
 	JXENTER(CGtlData::~CGtlData) ;
 	CXodj *xpXodj, *xpXodjNext ;
 
@@ -109,7 +109,7 @@ CGtlData::~CGtlData(void) {
 	RETURN_VOID ;
 }
 
-void CGtlData::CreateOffScreenBmp(void) {
+void CGtlData::CreateOffScreenBmp() {
 	CDC *pScreenDC;
 	CGtlApp *xpGtlApp = (CGtlApp *)AfxGetApp();
 
@@ -132,14 +132,14 @@ void CGtlData::CreateOffScreenBmp(void) {
 	}
 }
 
-void CGtlData::DeleteOffScreenBmp(void) {
+void CGtlData::DeleteOffScreenBmp() {
 	if (m_pOffScreenBmp != nullptr) {
 		delete m_pOffScreenBmp;
 		m_pOffScreenBmp = nullptr;
 	}
 }
 
-void CGtlData::PaintOffScreenBmp(void) {
+void CGtlData::PaintOffScreenBmp() {
 	CDC *pScreenDC;
 	CMemDC *pMemDC;
 	CPalette *pScreenPalOld;
@@ -159,19 +159,19 @@ void CGtlData::PaintOffScreenBmp(void) {
 		}
 	}
 }
-CMemDC::CMemDC(void) {
+CMemDC::CMemDC() {
 	m_pDC = new CDC;
 	assert(m_pDC != nullptr);
 }
 
-CMemDC::~CMemDC(void) {
+CMemDC::~CMemDC() {
 	if (m_pDC != nullptr) {
 		delete m_pDC;
 		m_pDC = nullptr;
 	}
 }
 
-CMemDC *CGtlData::GetMemDC(void) {
+CMemDC *CGtlData::GetMemDC() {
 	CMemDC *pMemDC;
 
 	if ((pMemDC = new CMemDC) != nullptr) {
@@ -197,7 +197,7 @@ void CGtlData::ReleaseMemDC(CMemDC *pMemDC) {
 }
 
 //* CGtlData::SetColors -- set colors of various elements
-bool CGtlData::SetColors(void)
+bool CGtlData::SetColors()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlData::SetColors) ;
@@ -222,7 +222,7 @@ bool CGtlData::SetColors(void)
 }
 
 //* CGtlData::ClearInhibitDraw -- clear m_bInhibitDraw flag
-bool CGtlData::ClearInhibitDraw(void)
+bool CGtlData::ClearInhibitDraw()
 // returns: true if error, false otherwise
 {
 	JXENTER(CGtlData::ClearInhibitDraw) ;
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
index 646b8440f54..20a9d8a631e 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.cpp
@@ -184,7 +184,7 @@ cleanup:
 
 
 //* CGtlView::OnInitialUpdate --
-void CGtlView::OnInitialUpdate(void) {
+void CGtlView::OnInitialUpdate() {
 	JXENTER(CGtlView::OnInitialUpdate) ;
 	CGtlDoc *xpDoc = GetDocument() ;
 
@@ -331,7 +331,7 @@ void CGtlView::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int
 		if ((bAnimations = gpBgbMgr->AnimationsActive()) != false)
 			gpBgbMgr->PauseAnimations();
 		gpBgbMgr->CacheOptimize(2000000);
-		(void) RulesDlg.DoModal();
+		RulesDlg.DoModal();
 		if (bAnimations)
 			gpBgbMgr->ResumeAnimations();
 		break;
@@ -472,7 +472,7 @@ void CGtlView::OnSoundNotify(CSound *) {
 }
 
 
-void CGtlView::FlushInputEvents(void) {
+void CGtlView::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                      // find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.h b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
index fad2b9662bf..4b9111c9e92 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/gtlview.h
@@ -60,7 +60,7 @@ public:
 	char m_cEndData ;
 
 	class CGtlDoc *GetDocument();
-	void UpdateDialogs(void) ;
+	void UpdateDialogs() ;
 	void OnSoundNotify(CSound *);
 
 	//- OnUpdate -- called when document changes to update view
@@ -70,7 +70,7 @@ public:
 
 private:
 	//- OnInitialUpdate --
-	void OnInitialUpdate(void);
+	void OnInitialUpdate();
 
 protected:
 	//- PreCreateWindow -- change view window style
@@ -80,7 +80,7 @@ protected:
 public:
 	virtual ~CGtlView();
 
-	void FlushInputEvents(void);
+	void FlushInputEvents();
 
 
 // Generated message map functions
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/init.h b/engines/bagel/hodjnpodj/metagame/gtl/init.h
index d1d8140e488..86a06b518b3 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/init.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/init.h
@@ -31,7 +31,7 @@ namespace Metagame {
 namespace Gtl {
 
 extern HWND FAR PASCAL RunMeta(HWND hParentWnd, CBfcMgr *lpBfcMgr, bool bMetaLoaded);
-extern void SetupCursor(void);
+extern void SetupCursor();
 extern void SetupWindow(CBfcMgr *);
 
 } // namespace Gtl
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/optdlg.cpp b/engines/bagel/hodjnpodj/metagame/gtl/optdlg.cpp
index 2c7b872b90c..a9ab33c9797 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/optdlg.cpp
@@ -135,7 +135,7 @@ bool CMetaOptDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 
 		case IDC_RULES: {
 			CRules RulesDlg(this, "metarule.txt", m_pPalette, nullptr);
-			(void) RulesDlg.DoModal();
+			RulesDlg.DoModal();
 			return true;
 		}
 
@@ -152,7 +152,7 @@ bool CMetaOptDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CMetaOptDlg::OnOK(void) {
+void CMetaOptDlg::OnOK() {
 	if (m_pSaveGameButton->GetState() & 0x0008) {
 		SendMessage(WM_COMMAND, IDC_SAVE_GAME, (LPARAM)BN_CLICKED);
 		return;
@@ -175,12 +175,12 @@ void CMetaOptDlg::OnOK(void) {
 	}
 }
 
-void CMetaOptDlg::OnCancel(void) {
+void CMetaOptDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(0);
 }
 
-void CMetaOptDlg::ClearDialogImage(void) {
+void CMetaOptDlg::ClearDialogImage() {
 	if (m_pSaveGameButton != nullptr) {
 		delete m_pSaveGameButton;
 		m_pSaveGameButton = nullptr;
@@ -310,7 +310,7 @@ bool CMetaOptDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CMetaOptDlg::OnPaint(void) {
+void CMetaOptDlg::OnPaint() {
 	PAINTSTRUCT lpPaint;
 
 	CBmpDialog::OnPaint();
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/optdlg.h b/engines/bagel/hodjnpodj/metagame/gtl/optdlg.h
index 7281de46700..52dabc5d89f 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/optdlg.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/optdlg.h
@@ -56,12 +56,12 @@ public:
 
 private:
 	bool OnInitDialog() override;
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp b/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
index 6ceddbc8d67..d878d771b9d 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/pawn.cpp
@@ -100,7 +100,7 @@ static  bool        bPlayingHodj = true;            // whether playing Hodj or P
 
 
 
-bool CPawnShop::SetupKeyboardHook(void) {
+bool CPawnShop::SetupKeyboardHook() {
 	pPawnDialog = this;                         // retain pointer to our dialog box
 
 	hKbdHook = SetWindowsHookEx(WH_KEYBOARD, PawnHookProc, hExeInst, GetCurrentTask());
@@ -111,7 +111,7 @@ bool CPawnShop::SetupKeyboardHook(void) {
 }
 
 
-void CPawnShop::RemoveKeyboardHook(void) {
+void CPawnShop::RemoveKeyboardHook() {
 	if (m_bKeyboardHook)
 		UnhookWindowsHookEx(hKbdHook);                  // unhook our keyboard procedure
 
@@ -221,7 +221,7 @@ void CPawnShop::OnOK() {
 }
 
 
-void CPawnShop::OnCancel(void) {
+void CPawnShop::OnCancel() {
 	ClearDialogImage();
 	CDialog::OnCancel();
 }
@@ -240,11 +240,11 @@ void CPawnShop::OnDestroy() {
 		RemoveKeyboardHook();
 
 	if (pWorkOld != nullptr) {
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 		pWorkOld = nullptr;
 	}
 	if (pWorkPalOld != nullptr) {
-		(void)(*pWorkDC).SelectPalette(pWorkPalOld, false);
+		(*pWorkDC).SelectPalette(pWorkPalOld, false);
 		pWorkPalOld = nullptr;
 	}
 	if (pWork != nullptr) {
@@ -496,7 +496,7 @@ void CPawnShop::UpdateContent(CDC *pDC) {
 			(*pDC).SetTextColor(PAWN_MORE_COLOR);
 			(*pDC).TextOut(x, y, MORE_TEXT_BLURB, MORE_TEXT_LENGTH);
 		}
-		(void)(*pDC).SelectObject(pFontOld);                            // map out the font
+		(*pDC).SelectObject(pFontOld);                            // map out the font
 	}
 }
 
@@ -518,7 +518,7 @@ void CPawnShop::UpdateItem(CDC *pDC, CItem *pItem, int nX, int nY) {
 		    nY,
 		    (const char *) chBuffer,
 		    strlen(chBuffer));
-		(void)(*pDC).SelectObject(pFontOld);                     // map out the font
+		(*pDC).SelectObject(pFontOld);                     // map out the font
 	}
 }
 
@@ -549,7 +549,7 @@ bool CPawnShop::OnEraseBkgnd(CDC *) {
 }
 
 
-void CPawnShop::ClearDialogImage(void) {
+void CPawnShop::ClearDialogImage() {
 	if (pBackgroundBitmap != nullptr) {
 		delete pOKButton;
 		pOKButton = nullptr;
@@ -559,7 +559,7 @@ void CPawnShop::ClearDialogImage(void) {
 }
 
 
-void CPawnShop::RefreshBackground(void) {
+void CPawnShop::RefreshBackground() {
 	CDC *pDC;
 
 	if (pBackgroundBitmap != nullptr) {
@@ -618,7 +618,7 @@ bool CPawnShop::CreateWorkAreas(CDC *pDC) {
 		pBackgroundBitmap = nullptr;
 
 	(*pDC).SelectPalette(pBackgroundPalette, false);
-	(void)(*pDC).RealizePalette();
+	(*pDC).RealizePalette();
 
 	if ((GetFreeSpace(0) >= (unsigned long) 1000000) &&
 	        (GlobalCompact((unsigned long) 500000) >= (unsigned long) 450000)) {
@@ -628,7 +628,7 @@ bool CPawnShop::CreateWorkAreas(CDC *pDC) {
 			if ((pWorkDC != nullptr) &&
 			        (*pWorkDC).CreateCompatibleDC(pDC)) {
 				pWorkPalOld = (*pWorkDC).SelectPalette(pBackgroundPalette, false);
-				(void)(*pWorkDC).RealizePalette();
+				(*pWorkDC).RealizePalette();
 				pWorkOld = (*pWorkDC).SelectObject(pWork);
 				if (pWorkOld != nullptr)
 					bSuccess = true;
@@ -642,7 +642,7 @@ bool CPawnShop::CreateWorkAreas(CDC *pDC) {
 
 	if (!bSuccess) {
 		if (pWorkPalOld != nullptr) {
-			(void)(*pWorkDC).SelectPalette(pWorkPalOld, false);
+			(*pWorkDC).SelectPalette(pWorkPalOld, false);
 			pWorkPalOld = nullptr;
 		}
 		if (pWork != nullptr) {
@@ -654,7 +654,7 @@ bool CPawnShop::CreateWorkAreas(CDC *pDC) {
 		bSuccess = true;
 	}
 
-	(void)(*pDC).SelectPalette(pWorkPalOld, false);
+	(*pDC).SelectPalette(pWorkPalOld, false);
 
 	myRect.SetRect(PAWN_TEXTZONE_DX,
 	               PAWN_BORDER_DY + PAWN_TITLEZONE_DDY,
@@ -840,21 +840,21 @@ bool CPawnShop::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned int
 }
 
 
-void CPawnShop::DoWaitCursor(void) {
+void CPawnShop::DoWaitCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).BeginWaitCursor();
+	(*pMyApp).BeginWaitCursor();
 }
 
 
-void CPawnShop::DoArrowCursor(void) {
+void CPawnShop::DoArrowCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).EndWaitCursor();
+	(*pMyApp).EndWaitCursor();
 }
 
 } // namespace Gtl
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/pawn.h b/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
index f421d08f001..59d3eba7e36 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/pawn.h
@@ -78,14 +78,14 @@ public:
 	static  void UpdateItem(CDC *pDC, CItem *pItem, int nX, int nY);
 	static  void UpdatePage(CDC *pDC);
 	static  void UpdateCrowns(CDC *pDC);
-	static  void ClearDialogImage(void);
-	static  void RefreshBackground(void);
-	static  void DoWaitCursor(void);
-	static  void DoArrowCursor(void);
+	static  void ClearDialogImage();
+	static  void RefreshBackground();
+	static  void DoWaitCursor();
+	static  void DoArrowCursor();
 
 private:
-	bool SetupKeyboardHook(void);
-	void RemoveKeyboardHook(void);
+	bool SetupKeyboardHook();
+	void RemoveKeyboardHook();
 
 	bool CreateWorkAreas(CDC *pDC);
 
@@ -109,12 +109,12 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(CPawnShop)
 	afx_msg int  OnCreate(LPCREATESTRUCT lpCreateStruct);
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 	afx_msg bool OnEraseBkgnd(CDC *pDC);
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
-	afx_msg void OnDestroy(void);
-	afx_msg void OnPaint(void);
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
+	afx_msg void OnDestroy();
+	afx_msg void OnPaint();
 	afx_msg void OnShowWindow(bool bShow, unsigned int nStatus);
 	afx_msg void OnSize(unsigned int nType, int cx, int cy);
 	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp b/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
index 92e6c2dd755..18b3aa311c9 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/rules.cpp
@@ -151,7 +151,7 @@ bool CRules::SetupKeyboardHook() {
 }
 
 
-void CRules::RemoveKeyboardHook(void) {
+void CRules::RemoveKeyboardHook() {
 	#if BUILD_FOR_DLL
 	if (m_bKeyboardHook)
 		UnhookWindowsHookEx(hKbdHook);                  // unhook our keyboard procedure
@@ -261,7 +261,7 @@ void CRules::OnOK() {
 }
 
 
-void CRules::OnCancel(void) {
+void CRules::OnCancel() {
 	ClearDialogImage();
 	CDialog::OnCancel();
 }
@@ -382,7 +382,7 @@ void CRules::OnPaint() {
 
 	if (pScrollPalette != nullptr) {                   // map in our palette
 		pPalOld = dc.SelectPalette(pScrollPalette, false);
-		(void) dc.RealizePalette();                 // .. and make the system use it
+		dc.RealizePalette();                 // .. and make the system use it
 	}
 
 	if (first_time) {                               // unfurl scroll visually
@@ -403,7 +403,7 @@ void CRules::OnPaint() {
 		WritePage(&dc, nHelpPage);
 		UpdateMore(&dc);                            // update the "more" indicator
 	} else
-		(void) dc.BitBlt(        // update the screen with just the
+		dc.BitBlt(        // update the screen with just the
 		    0, 0,                           // ... current page of text
 		    ScrollRect.right,
 		    ScrollRect.bottom,
@@ -412,7 +412,7 @@ void CRules::OnPaint() {
 		    SRCCOPY);
 
 	if (pScrollPalette != nullptr)                     // map out our palette
-		(void) dc.SelectPalette(pPalOld, false);
+		dc.SelectPalette(pPalOld, false);
 
 	DoArrowCursor();                                // return to an arrow cursor
 }
@@ -423,7 +423,7 @@ bool CRules::OnEraseBkgnd(CDC *pDC) {
 }
 
 
-void CRules::ClearDialogImage(void) {
+void CRules::ClearDialogImage() {
 	delete pOKButton;
 	pOKButton = nullptr;
 	if (pBackgroundBitmap != nullptr)
@@ -432,7 +432,7 @@ void CRules::ClearDialogImage(void) {
 }
 
 
-void CRules::RefreshBackground(void) {
+void CRules::RefreshBackground() {
 	CDC         *pDC;
 	CPalette    *pPalOld = nullptr;
 
@@ -443,10 +443,10 @@ void CRules::RefreshBackground(void) {
 
 	if (pScrollPalette != nullptr) {                   // map in our palette
 		pPalOld = (*pDC).SelectPalette(pScrollPalette, false);
-		(void)(*pDC).RealizePalette();              // .. and make the system use it
+		(*pDC).RealizePalette();              // .. and make the system use it
 	}
 
-	(void)(*pDC).BitBlt(        // repaint the background as it was
+	(*pDC).BitBlt(        // repaint the background as it was
 	    0,
 	    0,
 	    ScrollRect.right,
@@ -457,7 +457,7 @@ void CRules::RefreshBackground(void) {
 	    SRCCOPY);
 
 	if (pScrollPalette != nullptr)                     // map out our palette
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ReleaseDC(pDC);                                 // release the context
 }
@@ -491,7 +491,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		return;
 	}
 
-	(void)(*pBackgroundDC).BitBlt(      // save the entire background
+	(*pBackgroundDC).BitBlt(      // save the entire background
 	    0, 0,
 	    ScrollRect.right,
 	    ScrollRect.bottom,
@@ -499,7 +499,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCCOPY);
 
-	(void)(*pScrollDC).BitBlt(       // copy background to scroll context
+	(*pScrollDC).BitBlt(       // copy background to scroll context
 	    0, 0,                           // ... so we can construct the scroll
 	    ScrollRect.right,               // ... on top of it in a masked manner
 	    ScrollRect.bottom,
@@ -511,7 +511,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 
 	ScrollTopCurlRect = ScrollTopRect;              // record where we're putting the top curl
 
-	(void)(*pScrollDC).BitBlt(       // mask out where the top curl goes
+	(*pScrollDC).BitBlt(       // mask out where the top curl goes
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -519,7 +519,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollTopMaskDC).BitBlt(     // invert the top curl mask
+	(*pScrollTopMaskDC).BitBlt(     // invert the top curl mask
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -527,7 +527,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollTopDC).BitBlt(      // remove transparent area from top curl
+	(*pScrollTopDC).BitBlt(      // remove transparent area from top curl
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -535,7 +535,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollTopMaskDC).BitBlt(     // restore top curl mask
+	(*pScrollTopMaskDC).BitBlt(     // restore top curl mask
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -543,7 +543,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollDC).BitBlt(       // paint top curl into the scroll
+	(*pScrollDC).BitBlt(       // paint top curl into the scroll
 	    0, 0,
 	    ScrollTopRect.right,
 	    ScrollTopRect.bottom,
@@ -557,7 +557,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	dstRect.top += ScrollTopRect.bottom;            // ... mid section strip of the scroll
 	dstRect.bottom += ScrollTopRect.bottom;
 
-	(void)(*pScrollMidMaskDC).BitBlt(     // invert the mid section mask
+	(*pScrollMidMaskDC).BitBlt(     // invert the mid section mask
 	    0, 0,
 	    ScrollMidRect.right,
 	    ScrollMidRect.bottom,
@@ -565,7 +565,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollMidDC).BitBlt(      // mask out transparent part of mid section
+	(*pScrollMidDC).BitBlt(      // mask out transparent part of mid section
 	    0, 0,
 	    ScrollMidRect.right,
 	    ScrollMidRect.bottom,
@@ -573,7 +573,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollMidMaskDC).BitBlt(     // reset the mid section mask
+	(*pScrollMidMaskDC).BitBlt(     // reset the mid section mask
 	    0, 0,
 	    ScrollMidRect.right,
 	    ScrollMidRect.bottom,
@@ -582,7 +582,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    DSTINVERT);
 
 	for (i = 0; i < SCROLL_PIECES; i++) {           // build the scroll's mid section srip-wise
-		(void)(*pScrollDC).BitBlt(
+		(*pScrollDC).BitBlt(
 		    dstRect.left,               // mask out where the image will go
 		    dstRect.top + ScrollMidRect.bottom * i,
 		    ScrollMidRect.right,
@@ -591,7 +591,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    0, 0,
 		    SRCAND);
 
-		(void)(*pScrollDC).BitBlt(      // paint in the mid section image
+		(*pScrollDC).BitBlt(      // paint in the mid section image
 		    dstRect.left,
 		    dstRect.top + ScrollMidRect.bottom * i,
 		    ScrollMidRect.right,
@@ -607,7 +607,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	dstRect.bottom = dstRect.top + ScrollBotRect.bottom;
 	ScrollBotCurlRect = dstRect;
 
-	(void)(*pScrollDC).BitBlt(       // mask out where the bottom curl image goes
+	(*pScrollDC).BitBlt(       // mask out where the bottom curl image goes
 	    dstRect.left,
 	    dstRect.top,
 	    ScrollBotRect.right,
@@ -616,7 +616,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollBotMaskDC).BitBlt(     // invert the bottom curl mask
+	(*pScrollBotMaskDC).BitBlt(     // invert the bottom curl mask
 	    0, 0,
 	    ScrollBotRect.right,
 	    ScrollBotRect.bottom,
@@ -624,7 +624,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollBotDC).BitBlt(      // mask out transparent part of curl
+	(*pScrollBotDC).BitBlt(      // mask out transparent part of curl
 	    0, 0,
 	    ScrollBotRect.right,
 	    ScrollBotRect.bottom,
@@ -632,7 +632,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    SRCAND);
 
-	(void)(*pScrollBotMaskDC).BitBlt(     // reset the mask
+	(*pScrollBotMaskDC).BitBlt(     // reset the mask
 	    0, 0,
 	    ScrollBotRect.right,
 	    ScrollBotRect.bottom,
@@ -640,7 +640,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 	    0, 0,
 	    DSTINVERT);
 
-	(void)(*pScrollDC).BitBlt(       // paint in the bottom curl
+	(*pScrollDC).BitBlt(       // paint in the bottom curl
 	    dstRect.left,
 	    dstRect.top,
 	    ScrollBotRect.right,
@@ -674,7 +674,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 
 		dst2Rect = dstRect;
 
-		(void)(*pWorkDC).BitBlt(      // splat in the background for top curl
+		(*pWorkDC).BitBlt(      // splat in the background for top curl
 		    0, 0,
 		    ScrollTopRect.right,
 		    ScrollTopRect.bottom,
@@ -683,7 +683,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    dst2Rect.top,
 		    SRCCOPY);
 
-		(void)(*pWorkDC).BitBlt(      // mask out where the top curl goes
+		(*pWorkDC).BitBlt(      // mask out where the top curl goes
 		    0, 0,
 		    ScrollTopRect.right,
 		    ScrollTopRect.bottom,
@@ -691,7 +691,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    0, 0,
 		    SRCAND);
 
-		(void)(*pWorkDC).BitBlt(      // insert the top curl background
+		(*pWorkDC).BitBlt(      // insert the top curl background
 		    0, 0,
 		    ScrollTopRect.right,
 		    ScrollTopRect.bottom,
@@ -700,7 +700,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    SRCPAINT);
 
 		if (i == 0) {                               // if first time, just paint curl to display
-			(void)(*pDC).BitBlt(
+			(*pDC).BitBlt(
 			    dst2Rect.left,
 			    dst2Rect.top,
 			    ScrollTopRect.right,
@@ -709,7 +709,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 			    0, 0,
 			    SRCCOPY);
 		} else {
-			(void)(*pWorkDC).BitBlt(     // ... otherwise paint in a new piece of
+			(*pWorkDC).BitBlt(     // ... otherwise paint in a new piece of
 			    dst2Rect.left,          // ... the middle section
 			    ScrollTopRect.bottom,
 			    dst2Rect.right,
@@ -718,7 +718,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 			    dst2Rect.left,
 			    dst2Rect.top + ScrollTopRect.bottom,
 			    SRCCOPY);
-			(void)(*pDC).BitBlt(      // ... then paint it and the curl, thus
+			(*pDC).BitBlt(      // ... then paint it and the curl, thus
 			    dst2Rect.left,          // ... causing the top to seemingly unfurl
 			    dst2Rect.top,           // ... by one more strip
 			    ScrollTopRect.right,
@@ -732,7 +732,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		dst2Rect.bottom = dstRect.bottom;
 
 		if ((i == 0) || ((i == 1) && (h == 1))) {   // if first time or doing last iteration
-			(void)(*pWorkDC).BitBlt(                // ... just paint in the bottom curl
+			(*pWorkDC).BitBlt(                // ... just paint in the bottom curl
 			    0, 0,
 			    dst2Rect.right,
 			    scroll_delta,
@@ -741,7 +741,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 			    dst2Rect.top,
 			    SRCCOPY);
 		} else {                                    //
-			(void)(*pWorkDC).BitBlt(
+			(*pWorkDC).BitBlt(
 			    0, 0,
 			    dst2Rect.right,
 			    scroll_delta,
@@ -751,7 +751,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 			    SRCCOPY);
 		}
 
-		(void)(*pWorkDC).BitBlt(
+		(*pWorkDC).BitBlt(
 		    0,
 		    scroll_delta,
 		    ScrollBotRect.right,
@@ -761,7 +761,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    dst2Rect.top + scroll_delta,
 		    SRCCOPY);
 
-		(void)(*pWorkDC).BitBlt(
+		(*pWorkDC).BitBlt(
 		    0,
 		    scroll_delta,
 		    ScrollBotRect.right,
@@ -770,7 +770,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    0, 0,
 		    SRCAND);
 
-		(void)(*pWorkDC).BitBlt(
+		(*pWorkDC).BitBlt(
 		    0,
 		    scroll_delta,
 		    ScrollBotRect.right,
@@ -779,7 +779,7 @@ void CRules::UnfurlScroll(CDC *pDC) {
 		    0, 0,
 		    SRCPAINT);
 
-		(void)(*pDC).BitBlt(
+		(*pDC).BitBlt(
 		    ScrollBotRect.left,
 		    dst2Rect.top,
 		    ScrollBotRect.right,
@@ -824,7 +824,7 @@ void CRules::UpdateScroll(int nPage) {
 
 	if (pScrollPalette != nullptr) {                   // map in our palette
 		pPalOld = (*pDC).SelectPalette(pScrollPalette, false);
-		(void)(*pDC).RealizePalette();              // .. and make the system use it
+		(*pDC).RealizePalette();              // .. and make the system use it
 	}
 
 	dstRect = ScrollMidRect;                        // setup initial destination for blts
@@ -832,7 +832,7 @@ void CRules::UpdateScroll(int nPage) {
 	dstRect.bottom += ScrollTopRect.bottom;
 
 	for (i = 0; i < SCROLL_PIECES; i++) {           // repaint the scroll midsection artwork
-		(void)(*pScrollDC).BitBlt(      // ... mask out where artwork goes
+		(*pScrollDC).BitBlt(      // ... mask out where artwork goes
 		    dstRect.left,
 		    dstRect.top + ScrollMidRect.bottom * i,
 		    ScrollMidRect.right,
@@ -841,7 +841,7 @@ void CRules::UpdateScroll(int nPage) {
 		    0, 0,
 		    SRCAND);
 
-		(void)(*pScrollDC).BitBlt(      // ... paint in the scroll artwork
+		(*pScrollDC).BitBlt(      // ... paint in the scroll artwork
 		    dstRect.left,
 		    dstRect.top + ScrollMidRect.bottom * i,
 		    ScrollMidRect.right,
@@ -853,7 +853,7 @@ void CRules::UpdateScroll(int nPage) {
 
 	WritePage(pScrollDC, nPage);                    // construct the new page of text
 
-	(void)(*pDC).BitBlt(        // paint the result to the sceen
+	(*pDC).BitBlt(        // paint the result to the sceen
 	    TEXT_LEFT_MARGIN,
 	    ScrollTopRect.bottom + TEXT_TOP_MARGIN,
 	    TEXT_WIDTH,
@@ -866,7 +866,7 @@ void CRules::UpdateScroll(int nPage) {
 	UpdateMore(pDC);                                // update the "more" indicator
 
 	if (pScrollPalette != nullptr)                     // map out our palette
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ReleaseDC(pDC);
 }
@@ -1003,7 +1003,7 @@ crop_byte:
 			break;
 	}
 
-	(void)(*pDC).SelectObject(pFontOld);
+	(*pDC).SelectObject(pFontOld);
 
 	dwHelpPagePosition[nPage + 1] += i + nCropped;
 	dwHelpPageEOL[nPage + 1] = bEOL;
@@ -1032,7 +1032,7 @@ crop_byte:
 	if (bEOF && (i >= (int) nCount))
 		bHelpEOF = true;
 
-	(void)(*pDC).SelectObject(pFontOld);
+	(*pDC).SelectObject(pFontOld);
 
 }
 
@@ -1057,7 +1057,7 @@ void CRules::UpdateMore(CDC *pDC) {
 	dy = fontMetrics.tmHeight;
 
 	if (nHelpPage == 0)
-		(void)(*pDC).BitBlt(
+		(*pDC).BitBlt(
 		    x,
 		    y,
 		    dx,
@@ -1075,7 +1075,7 @@ void CRules::UpdateMore(CDC *pDC) {
 	    TEXT_MORE_DY;
 
 	if (bHelpEOF)
-		(void)(*pDC).BitBlt(
+		(*pDC).BitBlt(
 		    x,
 		    y,
 		    dx,
@@ -1087,7 +1087,7 @@ void CRules::UpdateMore(CDC *pDC) {
 	else
 		(*pDC).TextOut(x, y, MORE_TEXT_BLURB, MORE_TEXT_LENGTH);
 
-	(void)(*pDC).SelectObject(pFontOld);
+	(*pDC).SelectObject(pFontOld);
 }
 
 
@@ -1261,7 +1261,7 @@ CDC *CRules::SetupMask(CDC *pDC, CDC *pBitmapDC, CBitmap *pMask, CBitmap * &pMas
 	        (*pNewDC).CreateCompatibleDC(pDC)) {
 		pMaskOld = (*pNewDC).SelectObject(pMask);
 		if (pMaskOld != nullptr) {
-			(void)(*pNewDC).BitBlt(
+			(*pNewDC).BitBlt(
 			    0, 0,
 			    (*pRect).right,
 			    (*pRect).bottom,
@@ -1288,7 +1288,7 @@ CDC *CRules::SetupCompatibleContext(CDC *pDC, CBitmap *pBitmap, CBitmap * &pBitm
 			pPalOld = (*pNewDC).SelectPalette(pPalette, false);
 		else
 			pPalOld = nullptr;
-		(void)(*pNewDC).RealizePalette();
+		(*pNewDC).RealizePalette();
 		pBitmapOld = (*pNewDC).SelectObject(pBitmap);
 		if (pBitmapOld != nullptr)
 			return (pNewDC);
@@ -1300,12 +1300,12 @@ CDC *CRules::SetupCompatibleContext(CDC *pDC, CBitmap *pBitmap, CBitmap * &pBitm
 
 void CRules::ReleaseCompatibleContext(CDC *&pDC, CBitmap * &pBitmap, CBitmap *pBitmapOld, CPalette *pPalOld) {
 	if (pBitmapOld != nullptr) {
-		(void)(*pDC).SelectObject(pBitmapOld);
+		(*pDC).SelectObject(pBitmapOld);
 		pBitmapOld = nullptr;
 	}
 
 	if (pPalOld != nullptr) {
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 		pPalOld = nullptr;
 	}
 
@@ -1436,21 +1436,21 @@ bool CRules::OnSetCursor(CWnd *pWnd, unsigned int nHitTest, unsigned int message
 }
 
 
-void CRules::DoWaitCursor(void) {
+void CRules::DoWaitCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).BeginWaitCursor();
+	(*pMyApp).BeginWaitCursor();
 }
 
 
-void CRules::DoArrowCursor(void) {
+void CRules::DoArrowCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).EndWaitCursor();
+	(*pMyApp).EndWaitCursor();
 }
 
 } // namespace Gtl
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/rules.h b/engines/bagel/hodjnpodj/metagame/gtl/rules.h
index 17f2da98a00..f107e9b7f41 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/rules.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/rules.h
@@ -43,13 +43,13 @@ public:
 	CRules(CWnd* pParent = nullptr, char *pszPathName = nullptr, CPalette *pPalette = nullptr, char *pszSoundPath = nullptr);   // standard constructor
 
 	void UpdateScroll(int nPage);
-	void ClearDialogImage(void);
-	void RefreshBackground(void);
+	void ClearDialogImage();
+	void RefreshBackground();
 
 private:
 
-	bool SetupKeyboardHook(void);
-	void RemoveKeyboardHook(void);
+	bool SetupKeyboardHook();
+	void RemoveKeyboardHook();
 
 	static  CDibDoc *LoadScrollDIB(const char *pSpec, CRect *pRect);
 	static  bool PaintScrollDIB(CDC *pDC, CDibDoc *pDibDoc);
@@ -62,11 +62,11 @@ private:
 	void UnfurlScroll(CDC *pDC);
 	void UpdateMore(CDC *pDC);
 	void WritePage(CDC *pDC, int nPage);
-	void DoWaitCursor(void);
+	void DoWaitCursor();
 	void DoWaitCursor(int nCode) override {
 		CDialog::DoWaitCursor(nCode);
 	}
-	void DoArrowCursor(void);
+	void DoArrowCursor();
 	void Sleep(clock_t wait);
 
 private:
@@ -93,12 +93,12 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(CRules)
 	afx_msg int  OnCreate(LPCREATESTRUCT lpCreateStruct);
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 	afx_msg bool OnEraseBkgnd(CDC *pDC);
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
-	afx_msg void OnDestroy(void);
-	afx_msg void OnPaint(void);
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
+	afx_msg void OnDestroy();
+	afx_msg void OnPaint();
 	afx_msg void OnShowWindow(bool bShow, unsigned int nStatus);
 	afx_msg void OnSize(unsigned int nType, int cx, int cy);
 	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp b/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
index 63387e58dd2..e4cffbf44be 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
@@ -221,7 +221,7 @@ CSpinner::~CSpinner() {
  *
  ************************************************************************/
 
-void CSpinner::SetupSpinner(void) {
+void CSpinner::SetupSpinner() {
 	int i, j, n;
 	int Values[SPINNER_COUNT];
 
@@ -286,7 +286,7 @@ int CSpinner::Animate(int nX, int nY) {
 			if (HandleMessages())                   // ... and terminate loop if urgent
 				break;
 		}
-		(void) Hide();                              // hide the spinner
+		Hide();                              // hide the spinner
 	}
 
 	AfxGetApp()->DoWaitCursor(-1);
@@ -339,7 +339,7 @@ bool CSpinner::Show(int nX, int nY) {
  *
  ************************************************************************/
 
-bool CSpinner::Hide(void) {
+bool CSpinner::Hide() {
 	bool    bSuccess = false;
 
 	if (m_pSprite == nullptr)                              // punt if no spinner sprite
@@ -369,7 +369,7 @@ bool CSpinner::Hide(void) {
  *
  ************************************************************************/
 
-int CSpinner::Spin(void) {
+int CSpinner::Spin() {
 	int         i, j, nIdx;
 	CBitmap     *pBitmap = nullptr;
 	CPalette    *pPalette = nullptr;
@@ -454,7 +454,7 @@ punt:
  *
  ************************************************************************/
 
-bool CSpinner::HandleMessages(void) {
+bool CSpinner::HandleMessages() {
 	MSG     msg;
 
 	if (PeekMessage(&msg, nullptr, 0, WM_KEYFIRST - 1, PM_REMOVE)) {
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/spinner.h b/engines/bagel/hodjnpodj/metagame/gtl/spinner.h
index c1c435afd41..219218ad5b8 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/spinner.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/spinner.h
@@ -55,23 +55,23 @@ public:
 	CSpinner(CWnd *pWnd, CDC *pDC, int nX = 0, int nY = 0, bool bHodj = true);
 	~CSpinner();
 
-	int Animate(void) {
+	int Animate() {
 		return (Animate(m_nX, m_nY));
 	}
 	int Animate(int nX, int nY);
 
 private:
 	bool Initialize(CWnd *pWnd, CDC *pDC, int nX = 0, int nY = 0, bool bHodj = true);
-	int Spin(void);
-	bool Hide(void);
-	bool Show(void) {
+	int Spin();
+	bool Hide();
+	bool Show() {
 		return (Show(m_nX, m_nY));
 	}
 	bool Show(int nX, int nY);
 
-	void SetupSpinner(void);
+	void SetupSpinner();
 
-	static bool HandleMessages(void);
+	static bool HandleMessages();
 
 private:
 	CWnd    *m_pWnd;            // window for messages
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
index 9529f0c5cf6..3c41784ac44 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/store.cpp
@@ -101,7 +101,7 @@ static  bool        bPlayingHodj = true;            // whether playing Hodj or P
 
 
 
-bool CGeneralStore::SetupKeyboardHook(void) {
+bool CGeneralStore::SetupKeyboardHook() {
 	pStoreDialog = this;                            // retain pointer to our dialog box
 
 	hKbdHook = SetWindowsHookEx(WH_KEYBOARD, StoreHookProc, hExeInst, GetCurrentTask());
@@ -112,7 +112,7 @@ bool CGeneralStore::SetupKeyboardHook(void) {
 }
 
 
-void CGeneralStore::RemoveKeyboardHook(void) {
+void CGeneralStore::RemoveKeyboardHook() {
 	if (m_bKeyboardHook)
 		UnhookWindowsHookEx(hKbdHook);                  // unhook our keyboard procedure
 
@@ -222,7 +222,7 @@ void CGeneralStore::OnOK() {
 }
 
 
-void CGeneralStore::OnCancel(void) {
+void CGeneralStore::OnCancel() {
 	ClearDialogImage();
 	CDialog::OnCancel();
 }
@@ -241,11 +241,11 @@ void CGeneralStore::OnDestroy() {
 		RemoveKeyboardHook();
 
 	if (pWorkOld != nullptr) {
-		(void)(*pWorkDC).SelectObject(pWorkOld);
+		(*pWorkDC).SelectObject(pWorkOld);
 		pWorkOld = nullptr;
 	}
 	if (pWorkPalOld != nullptr) {
-		(void)(*pWorkDC).SelectPalette(pWorkPalOld, false);
+		(*pWorkDC).SelectPalette(pWorkPalOld, false);
 		pWorkPalOld = nullptr;
 	}
 	if (pWork != nullptr) {
@@ -497,7 +497,7 @@ void CGeneralStore::UpdateContent(CDC *pDC) {
 			(*pDC).SetTextColor(STORE_MORE_COLOR);
 			(*pDC).TextOut(x, y, MORE_TEXT_BLURB, MORE_TEXT_LENGTH);
 		}
-		(void)(*pDC).SelectObject(pFontOld);                            // map out the font
+		(*pDC).SelectObject(pFontOld);                            // map out the font
 	}
 }
 
@@ -540,7 +540,7 @@ bool CGeneralStore::OnEraseBkgnd(CDC *) {
 }
 
 
-void CGeneralStore::ClearDialogImage(void) {
+void CGeneralStore::ClearDialogImage() {
 	if (pBackgroundBitmap != nullptr) {
 		delete pOKButton;
 		pOKButton = nullptr;
@@ -550,7 +550,7 @@ void CGeneralStore::ClearDialogImage(void) {
 }
 
 
-void CGeneralStore::RefreshBackground(void) {
+void CGeneralStore::RefreshBackground() {
 	CDC *pDC;
 
 	if (pBackgroundBitmap != nullptr) {
@@ -609,7 +609,7 @@ bool CGeneralStore::CreateWorkAreas(CDC *pDC) {
 		pBackgroundBitmap = nullptr;
 
 	(*pDC).SelectPalette(pBackgroundPalette, false);
-	(void)(*pDC).RealizePalette();
+	(*pDC).RealizePalette();
 
 	if ((GetFreeSpace(0) >= (unsigned long) 1000000) &&
 	        (GlobalCompact((unsigned long) 500000) >= (unsigned long) 450000)) {
@@ -619,7 +619,7 @@ bool CGeneralStore::CreateWorkAreas(CDC *pDC) {
 			if ((pWorkDC != nullptr) &&
 			        (*pWorkDC).CreateCompatibleDC(pDC)) {
 				pWorkPalOld = (*pWorkDC).SelectPalette(pBackgroundPalette, false);
-				(void)(*pWorkDC).RealizePalette();
+				(*pWorkDC).RealizePalette();
 				pWorkOld = (*pWorkDC).SelectObject(pWork);
 				if (pWorkOld != nullptr)
 					bSuccess = true;
@@ -633,7 +633,7 @@ bool CGeneralStore::CreateWorkAreas(CDC *pDC) {
 
 	if (!bSuccess) {
 		if (pWorkPalOld != nullptr) {
-			(void)(*pWorkDC).SelectPalette(pWorkPalOld, false);
+			(*pWorkDC).SelectPalette(pWorkPalOld, false);
 			pWorkPalOld = nullptr;
 		}
 		if (pWork != nullptr) {
@@ -645,7 +645,7 @@ bool CGeneralStore::CreateWorkAreas(CDC *pDC) {
 		bSuccess = true;
 	}
 
-	(void)(*pDC).SelectPalette(pWorkPalOld, false);
+	(*pDC).SelectPalette(pWorkPalOld, false);
 
 	myRect.SetRect(STORE_TEXTZONE_DX,
 	               STORE_BORDER_DY + STORE_TITLEZONE_DDY,
@@ -845,21 +845,21 @@ bool CGeneralStore::OnSetCursor(CWnd *pWnd, unsigned int /*nHitTest*/, unsigned
 }
 
 
-void CGeneralStore::DoWaitCursor(void) {
+void CGeneralStore::DoWaitCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).BeginWaitCursor();
+	(*pMyApp).BeginWaitCursor();
 }
 
 
-void CGeneralStore::DoArrowCursor(void) {
+void CGeneralStore::DoArrowCursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).EndWaitCursor();
+	(*pMyApp).EndWaitCursor();
 }
 
 } // namespace Gtl
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/store.h b/engines/bagel/hodjnpodj/metagame/gtl/store.h
index f4cc72f227c..d05d7bde3b8 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/store.h
+++ b/engines/bagel/hodjnpodj/metagame/gtl/store.h
@@ -79,14 +79,14 @@ public:
 	static  void UpdateItem(CDC *pDC, CItem *pItem, int nX, int nY);
 	static  void UpdatePage(CDC *pDC);
 	static  void UpdateCrowns(CDC *pDC);
-	static  void ClearDialogImage(void);
-	static  void RefreshBackground(void);
-	static  void DoWaitCursor(void);
-	static  void DoArrowCursor(void);
+	static  void ClearDialogImage();
+	static  void RefreshBackground();
+	static  void DoWaitCursor();
+	static  void DoArrowCursor();
 
 private:
-	bool SetupKeyboardHook(void);
-	void RemoveKeyboardHook(void);
+	bool SetupKeyboardHook();
+	void RemoveKeyboardHook();
 
 	bool CreateWorkAreas(CDC *pDC);
 
@@ -110,12 +110,12 @@ protected:
 	// Generated message map functions
 	//{{AFX_MSG(CGeneralStore)
 	afx_msg int  OnCreate(LPCREATESTRUCT lpCreateStruct);
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 	afx_msg bool OnEraseBkgnd(CDC *pDC);
-	virtual void OnOK(void) override;
-	virtual void OnCancel(void) override;
-	afx_msg void OnDestroy(void);
-	afx_msg void OnPaint(void);
+	virtual void OnOK() override;
+	virtual void OnCancel() override;
+	afx_msg void OnDestroy();
+	afx_msg void OnPaint();
 	afx_msg void OnShowWindow(bool bShow, unsigned int nStatus);
 	afx_msg void OnSize(unsigned int nType, int cx, int cy);
 	afx_msg void OnMouseMove(unsigned int nFlags, CPoint point);
diff --git a/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp b/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
index b7eee138060..393c52c13c4 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/restdlg.cpp
@@ -78,13 +78,13 @@ bool CRestoreDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CRestoreDlg::OnCancel(void) {
+void CRestoreDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(-1);
 }
 
 
-bool CRestoreDlg::OnInitDialog(void) {
+bool CRestoreDlg::OnInitDialog() {
 	CRect rect;
 	CDC *pDC;
 	int i;
@@ -135,7 +135,7 @@ bool CRestoreDlg::OnInitDialog(void) {
 }
 
 
-void CRestoreDlg::OnPaint(void) {
+void CRestoreDlg::OnPaint() {
 	CDC *pDC;
 
 	CBmpDialog::OnPaint();
@@ -148,7 +148,7 @@ void CRestoreDlg::OnPaint(void) {
 }
 
 
-void CRestoreDlg::ClearDialogImage(void) {
+void CRestoreDlg::ClearDialogImage() {
 	int i;
 	if (m_pTxtRestore != nullptr) {
 		delete m_pTxtRestore;
@@ -169,7 +169,7 @@ void CRestoreDlg::ClearDialogImage(void) {
 }
 
 
-void CRestoreDlg::OnDestroy(void) {
+void CRestoreDlg::OnDestroy() {
 	int i;
 
 	if (m_pTxtRestore != nullptr) {
diff --git a/engines/bagel/hodjnpodj/metagame/saves/restdlg.h b/engines/bagel/hodjnpodj/metagame/saves/restdlg.h
index daa8cde24dc..d47bd2e38b4 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/restdlg.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/restdlg.h
@@ -38,18 +38,18 @@ public:
 	CRestoreDlg(char *[], CWnd *, CPalette *);
 
 protected:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	//{{AFX_MSG(COptions)
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual void OnCancel(void) override;
-	afx_msg void OnDestroy(void);
-	afx_msg void OnPaint(void);
+	virtual void OnCancel() override;
+	afx_msg void OnDestroy();
+	afx_msg void OnPaint();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
 private:
-	bool OnInitDialog(void) override;
+	bool OnInitDialog() override;
 
 	CColorButton *m_pSlotButtons[MAX_SAVEGAMES];
 	CColorButton *m_pQuitButton;
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp b/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
index d9b801bf9fb..2735940360a 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savedlg.cpp
@@ -107,7 +107,7 @@ bool CSaveDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CSaveDlg::OnCancel(void) {
+void CSaveDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(-1);
 }
@@ -153,7 +153,7 @@ void CSaveDlg::EditDescription(int nNewSlot) {
 }
 
 
-bool CSaveDlg::OnInitDialog(void) {
+bool CSaveDlg::OnInitDialog() {
 	CRect rect;
 	CDC *pDC;
 	int i;
@@ -214,7 +214,7 @@ bool CSaveDlg::OnInitDialog(void) {
 }
 
 
-void CSaveDlg::OnPaint(void) {
+void CSaveDlg::OnPaint() {
 	CDC *pDC;
 
 	CBmpDialog::OnPaint();
@@ -227,7 +227,7 @@ void CSaveDlg::OnPaint(void) {
 }
 
 
-void CSaveDlg::ClearDialogImage(void) {
+void CSaveDlg::ClearDialogImage() {
 	int i;
 
 	if (m_pTxtSave != nullptr) {
@@ -254,7 +254,7 @@ void CSaveDlg::ClearDialogImage(void) {
 }
 
 
-void CSaveDlg::OnDestroy(void) {
+void CSaveDlg::OnDestroy() {
 	ClearDialogImage();
 
 	CBmpDialog::OnDestroy();
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savedlg.h b/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
index 5c07fbde1dd..2a3c476433a 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
+++ b/engines/bagel/hodjnpodj/metagame/saves/savedlg.h
@@ -38,19 +38,19 @@ public:
 	CSaveDlg(char *[], CWnd *, CPalette *);
 
 protected:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 	void EditDescription(int);
 
 	//{{AFX_MSG(COptions)
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual void OnCancel(void) override;
-	afx_msg void OnDestroy(void);
-	afx_msg void OnPaint(void);
+	virtual void OnCancel() override;
+	afx_msg void OnDestroy();
+	afx_msg void OnPaint();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
 private:
-	bool OnInitDialog(void) override;
+	bool OnInitDialog() override;
 
 	CColorButton *m_pSlotButtons[MAX_SAVEGAMES];
 	CEdit        *m_pSlotText[MAX_SAVEGAMES];
diff --git a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
index 30650cb019e..082bfc0796b 100644
--- a/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
+++ b/engines/bagel/hodjnpodj/metagame/saves/savegame.cpp
@@ -52,7 +52,7 @@ struct stInventoryInfo {
 } stPlayerBuf[MAX_PLAYERS];
 
 // Local prototypes
-static ERROR_CODE GetSaveGameDescriptions(void);
+static ERROR_CODE GetSaveGameDescriptions();
 static void WipeBFC(CBfcMgr *pBfcMgr);
 
 bool SaveGame(CWnd *pWnd, CPalette *pPalette, ERROR_CODE *pErrCode) {
diff --git a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
index 8253ac71c8e..685f89de197 100644
--- a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
+++ b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
@@ -582,7 +582,7 @@ void CMainZoomWindow::OnDestroy() {
  *
  ****************************************************************/
 
-void CMainZoomWindow::ReleaseResources(void) {
+void CMainZoomWindow::ReleaseResources() {
 	delete pText;
 	pText = nullptr;
 
@@ -628,7 +628,7 @@ void CMainZoomWindow::ReleaseResources(void) {
  *
  ****************************************************************/
 
-void CMainZoomWindow::FlushInputEvents(void) {
+void CMainZoomWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/novacancy/main.cpp b/engines/bagel/hodjnpodj/novacancy/main.cpp
index 6e0d02e95ea..94836ce2534 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.cpp
+++ b/engines/bagel/hodjnpodj/novacancy/main.cpp
@@ -68,7 +68,7 @@ static int gnLDieLeftFinal,    // final positions of dice.
 
 extern HWND ghParentWnd;
 
-CMainWindow::CMainWindow(void) {
+CMainWindow::CMainWindow() {
 	CString  WndClass;
 	CRect    tmpRect;
 	CDibDoc *pDibDoc;
@@ -427,12 +427,12 @@ bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CMainWindow::GamePause(void) {
+void CMainWindow::GamePause() {
 	m_bPause = true;
 };
 
 
-void CMainWindow::GameResume(void) {
+void CMainWindow::GameResume() {
 	m_bPause = false;
 };
 
@@ -572,7 +572,7 @@ void CMainWindow::PlayGame() {
 
 
 
-void CMainWindow::GameReset(void) {
+void CMainWindow::GameReset() {
 	m_bGameActive = false;                      // there is no currently active game
 
 	for (short i = 0; i < 10; i++) {
@@ -1708,7 +1708,7 @@ END_MESSAGE_MAP()
 *   Animates dice by using cell sprites.
 *
 *   CALLING SEQUENCE:
-*   void AnimateDice(void)
+*   void AnimateDice()
 *
 *   FORMAL PARAMETERS:
 *   none.
@@ -1726,7 +1726,7 @@ END_MESSAGE_MAP()
 *   n/a
 ****************************************************************************************************************
 */
-void CMainWindow::AnimateDice(void) {
+void CMainWindow::AnimateDice() {
 	CDC* pDC;
 
 	// Coordinates of each cel from cell strip on splash screen.
diff --git a/engines/bagel/hodjnpodj/novacancy/main.h b/engines/bagel/hodjnpodj/novacancy/main.h
index 86cfc567af9..b9fd5cc09f0 100644
--- a/engines/bagel/hodjnpodj/novacancy/main.h
+++ b/engines/bagel/hodjnpodj/novacancy/main.h
@@ -38,22 +38,22 @@ char *GetStringFromResource(unsigned int);
 
 class CMainWindow : public CFrameWnd {
 public:
-	CMainWindow(void);
-	void        PlayGame(void);
-	void        PaintScreen(void);
-	void        LoadIniSettings(void);
-	void        SaveIniSettings(void);
+	CMainWindow();
+	void        PlayGame();
+	void        PaintScreen();
+	void        LoadIniSettings();
+	void        SaveIniSettings();
 
 
 protected:
-	void        GameReset(void);
-	void        GamePause(void);
-	void        GameResume(void);
+	void        GameReset();
+	void        GamePause();
+	void        GameResume();
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	void        HandleError(ERROR_CODE);
 	void        DeleteSprite(CSprite *);
 
-	void        OnPaint(void);
+	void        OnPaint();
 	void        OnTimer(uintptr);
 	void        OnMouseMove(unsigned int, CPoint);
 	virtual void        OnLButtonDown(unsigned int, CPoint);
@@ -62,7 +62,7 @@ protected:
 	virtual  void        OnSysKeyDown(unsigned int, unsigned int, unsigned int);
 	virtual void        OnKeyDown(unsigned int, unsigned int, unsigned int);
 	void        OnActivate(unsigned int, CWnd *, bool) override;
-	void        OnClose(void);
+	void        OnClose();
 	virtual LRESULT     OnMCINotify(WPARAM, LPARAM);
 	virtual LRESULT     OnMMIONotify(WPARAM, LPARAM);
 
@@ -124,7 +124,7 @@ private:
 	bool m_bDiceBmpsLoaded;
 	CString gWndClass;
 
-	void AnimateDice(void);
+	void AnimateDice();
 	short LegalizeMove(short i);
 	bool IsThrowDoable(byte dice_sum);
 };
diff --git a/engines/bagel/hodjnpodj/packrat/dialogs.h b/engines/bagel/hodjnpodj/packrat/dialogs.h
index aad49695848..09c1be76c56 100644
--- a/engines/bagel/hodjnpodj/packrat/dialogs.h
+++ b/engines/bagel/hodjnpodj/packrat/dialogs.h
@@ -52,8 +52,8 @@ public:
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnCancel(void) override;
-	virtual void OnOK(void) override;
+	virtual void OnCancel() override;
+	virtual void OnOK() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnPaint();
@@ -79,8 +79,8 @@ public:
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnCancel(void) override;
-	virtual void OnOK(void) override;
+	virtual void OnCancel() override;
+	virtual void OnOK() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/packrat/msgdlg.cpp b/engines/bagel/hodjnpodj/packrat/msgdlg.cpp
index 33aa755b8ab..368103dc14e 100644
--- a/engines/bagel/hodjnpodj/packrat/msgdlg.cpp
+++ b/engines/bagel/hodjnpodj/packrat/msgdlg.cpp
@@ -109,19 +109,19 @@ bool CMsgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CDialog::OnCommand(wParam, lParam);
 }
 
-void CMsgDlg::OnCancel(void) {
+void CMsgDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CMsgDlg::OnOK(void) {
+void CMsgDlg::OnOK() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CMsgDlg::ClearDialogImage(void) {
+void CMsgDlg::ClearDialogImage() {
 
 	if (pMsgOKButton != nullptr) {
 		delete pMsgOKButton;
@@ -213,7 +213,7 @@ bool CMsgDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CMsgDlg::OnPaint(void) {
+void CMsgDlg::OnPaint() {
 //      call CBmpDialog onpaint, to paint the background
 	CBmpDialog::OnPaint();
 
diff --git a/engines/bagel/hodjnpodj/packrat/optdlg.cpp b/engines/bagel/hodjnpodj/packrat/optdlg.cpp
index f67e785d20e..8070f70b46f 100644
--- a/engines/bagel/hodjnpodj/packrat/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/packrat/optdlg.cpp
@@ -136,13 +136,13 @@ bool CPackRatOptDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CDialog::OnCommand(wParam, lParam);
 }
 
-void CPackRatOptDlg::OnCancel(void) {
+void CPackRatOptDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CPackRatOptDlg::OnOK(void) {
+void CPackRatOptDlg::OnOK() {
 	if (pPROKButton->GetState()  & 0x0008)
 		SendMessage(WM_COMMAND, IDC_MINI_OK, BN_CLICKED);
 	else
@@ -150,7 +150,7 @@ void CPackRatOptDlg::OnOK(void) {
 	return;
 }
 
-void CPackRatOptDlg::ClearDialogImage(void) {
+void CPackRatOptDlg::ClearDialogImage() {
 
 	if (pPROKButton != nullptr) {
 		delete pPROKButton;
@@ -251,7 +251,7 @@ bool CPackRatOptDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CPackRatOptDlg::OnPaint(void) {
+void CPackRatOptDlg::OnPaint() {
 	CDC             *pDC;
 	CString         strLevel = "Game Level :";
 	CString         strLives = "Number of Lives :";
diff --git a/engines/bagel/hodjnpodj/packrat/packrat.cpp b/engines/bagel/hodjnpodj/packrat/packrat.cpp
index 12796d4b604..649d77bd290 100644
--- a/engines/bagel/hodjnpodj/packrat/packrat.cpp
+++ b/engines/bagel/hodjnpodj/packrat/packrat.cpp
@@ -2962,7 +2962,7 @@ void CMainPackRatWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, uns
 			}
 			pOptionButton->EnableWindow(false);
 			UpdateWindow();
-			(void) dlgRules.DoModal();      // invoke the help dialog box
+			dlgRules.DoModal();      // invoke the help dialog box
 			pOptionButton->EnableWindow(true);
 			m_bSuspend = bTemp;
 		}
@@ -3405,7 +3405,7 @@ void CMainPackRatWindow::OnDestroy() {
  *
  ****************************************************************/
 
-void CMainPackRatWindow::ReleaseResources(void) {
+void CMainPackRatWindow::ReleaseResources() {
 	int nLoop1;
 
 	delete pBalloonSprite;
@@ -3555,7 +3555,7 @@ int CMainPackRatWindow::Power(int nBase, int nPower) {
  *
  ****************************************************************/
 
-void CMainPackRatWindow::FlushInputEvents(void) {
+void CMainPackRatWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/packrat/packrat.h b/engines/bagel/hodjnpodj/packrat/packrat.h
index 6a95edf27ad..e219e94925d 100644
--- a/engines/bagel/hodjnpodj/packrat/packrat.h
+++ b/engines/bagel/hodjnpodj/packrat/packrat.h
@@ -115,8 +115,8 @@ public:
 	void initStatics();
 	void SplashScreen();
 
-	static  void ReleaseResources(void);
-	static  void FlushInputEvents(void);
+	static  void ReleaseResources();
+	static  void FlushInputEvents();
 	void MainLoop();
 	void ResetGame();
 	int Power(int, int);
diff --git a/engines/bagel/hodjnpodj/pdq/game.cpp b/engines/bagel/hodjnpodj/pdq/game.cpp
index ef216045cf4..fde868ea2c5 100644
--- a/engines/bagel/hodjnpodj/pdq/game.cpp
+++ b/engines/bagel/hodjnpodj/pdq/game.cpp
@@ -73,19 +73,19 @@ STATIC const char *pszCategorySounds[N_CATEGORIES] = {
 *
 */
 ERROR_CODE  CleanScreen(CDC *);
-ERROR_CODE  LoadNewPhrase(void);
+ERROR_CODE  LoadNewPhrase();
 ERROR_CODE  BuildSpriteList(CDC *);
-void        KillCurPhrase(void);
+void        KillCurPhrase();
 void        BuildRandomPhraseOrder();
-bool     RevealNextLetter(void);
+bool     RevealNextLetter();
 void CALLBACK GameTimerHook(HWND, unsigned int, uintptr, uint32);
 int         StrLenNoSpaces(const char *);
 int         GetIndex(CSprite *);
-void        LoadGameCfg(void);
-void        SaveGameCfg(void);
+void        LoadGameCfg();
+void        SaveGameCfg();
 ERROR_CODE  ValidatePhrase(PHRASES *);
 void        UpdateScore(unsigned int, unsigned int, unsigned int, unsigned int);
-int         NumLinkedSprites(void);
+int         NumLinkedSprites();
 
 #define TIMER_ID        50
 #define START_X_ODD     318
@@ -138,7 +138,7 @@ int         nPhrasePixelLength;
 *  returns   errCode - Error return code
 *
 **/
-ERROR_CODE LoadNewPhrase(void) {
+ERROR_CODE LoadNewPhrase() {
 	STATIC int nLast;
 	char *p, buf[MAX_PLENGTH_S + 2];
 	int i, n, nType;
@@ -1121,7 +1121,7 @@ void GameGetScore(unsigned int *nLeft, unsigned int *nTotal, unsigned int *nLeft
 *  returns   nSprites = number of sprites in linked list
 *
 **/
-int NumLinkedSprites(void) {
+int NumLinkedSprites() {
 	CSprite *pSprite;
 	int i = 0;
 
diff --git a/engines/bagel/hodjnpodj/pdq/game.h b/engines/bagel/hodjnpodj/pdq/game.h
index de20e7dfe75..a8f0ebb66fe 100644
--- a/engines/bagel/hodjnpodj/pdq/game.h
+++ b/engines/bagel/hodjnpodj/pdq/game.h
@@ -85,12 +85,12 @@ namespace PDQ {
 */
 extern ERROR_CODE  InitGame(HWND, CDC *);
 extern ERROR_CODE  StartGame(CDC *);
-extern void        GameStopTimer(void);
-extern ERROR_CODE  GameStartTimer(void);
-extern void        GamePauseTimer(void);
-extern void        GameResumeTimer(void);
+extern void        GameStopTimer();
+extern ERROR_CODE  GameStartTimer();
+extern void        GamePauseTimer();
+extern void        GameResumeTimer();
 extern ERROR_CODE  EndGame(CDC *);
-extern void        WinGame(void);
+extern void        WinGame();
 extern ERROR_CODE  RepaintSpriteList(CDC *);
 extern bool     CheckUserGuess(const char *);
 extern void CALLBACK GetGameParams(CWnd *);
diff --git a/engines/bagel/hodjnpodj/pdq/guess.cpp b/engines/bagel/hodjnpodj/pdq/guess.cpp
index 01b9b535511..8f7adc45156 100644
--- a/engines/bagel/hodjnpodj/pdq/guess.cpp
+++ b/engines/bagel/hodjnpodj/pdq/guess.cpp
@@ -44,7 +44,7 @@ void CGuessDlg::DoDataExchange(CDataExchange* pDX) {
 	DDX_Text(pDX, IDC_EDIT, text);
 }
 
-bool CGuessDlg::OnInitDialog(void) {
+bool CGuessDlg::OnInitDialog() {
 	CEdit *pEdit;
 
 	CBmpDialog::OnInitDialog();
diff --git a/engines/bagel/hodjnpodj/pdq/guess.h b/engines/bagel/hodjnpodj/pdq/guess.h
index f1e4c6385d0..dd046e9fcb8 100644
--- a/engines/bagel/hodjnpodj/pdq/guess.h
+++ b/engines/bagel/hodjnpodj/pdq/guess.h
@@ -43,9 +43,9 @@ public:
 
 protected:
 	virtual void DoDataExchange(CDataExchange *) override;    // DDX/DDV support
-	bool OnInitDialog(void) override;
+	bool OnInitDialog() override;
 	void OnTimer(uintptr);
-	void OnPaint(void);
+	void OnPaint();
 	void OnSetFocus(CWnd *);
 	void OnActivate(unsigned int, CWnd *, bool) override;
 	bool OnEraseBkgnd(CDC *);
diff --git a/engines/bagel/hodjnpodj/pdq/main.cpp b/engines/bagel/hodjnpodj/pdq/main.cpp
index 26a02dae62f..4e1b033cb99 100644
--- a/engines/bagel/hodjnpodj/pdq/main.cpp
+++ b/engines/bagel/hodjnpodj/pdq/main.cpp
@@ -215,7 +215,7 @@ CMainWindow::CMainWindow() {
 	HandleError(errCode);
 }
 
-ERROR_CODE CMainWindow::LoadCategoryNames(void) {
+ERROR_CODE CMainWindow::LoadCategoryNames() {
 	CDC *pDC;
 	int i;
 	ERROR_CODE errCode;
@@ -250,7 +250,7 @@ ERROR_CODE CMainWindow::LoadCategoryNames(void) {
 	return errCode;
 }
 
-void CMainWindow::ReleaseCategoryNames(void) {
+void CMainWindow::ReleaseCategoryNames() {
 	int i;
 
 	for (i = N_CATEGORIES - 1; i >= 0; i--) {
@@ -278,7 +278,7 @@ void CMainWindow::PaintCategory(int iType) {
 }
 
 
-void CMainWindow::EraseCategory(void) {
+void CMainWindow::EraseCategory() {
 	CDC *pDC;
 
 	assert((m_iLastType >= 0) && (m_iLastType < N_CATEGORIES));
diff --git a/engines/bagel/hodjnpodj/pdq/main.h b/engines/bagel/hodjnpodj/pdq/main.h
index a68e54affb5..938e1f63c7f 100644
--- a/engines/bagel/hodjnpodj/pdq/main.h
+++ b/engines/bagel/hodjnpodj/pdq/main.h
@@ -41,22 +41,22 @@ public:
 	CMainWindow();
 	~CMainWindow() override {}
 
-	void        PlayGame(void);
-	void        PaintScreen(void);
+	void        PlayGame();
+	void        PaintScreen();
 	void        PaintCategory(int);
-	void        EraseCategory(void);
+	void        EraseCategory();
 
 	int         m_nTurnCount = 0;
 
 protected:
-	ERROR_CODE  LoadCategoryNames(void);
-	void        ReleaseCategoryNames(void);
+	ERROR_CODE  LoadCategoryNames();
+	void        ReleaseCategoryNames();
 
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	void HandleError(ERROR_CODE);
 	void OnSoundNotify(CSound *pSound);
 
-	void OnPaint(void);
+	void OnPaint();
 	void OnChar(unsigned int, unsigned int, unsigned int);
 	void OnSysChar(unsigned int, unsigned int, unsigned int);
 	void OnKeyDown(unsigned int, unsigned int, unsigned int);
@@ -65,7 +65,7 @@ protected:
 	void OnLButtonDown(unsigned int, CPoint);
 	void OnActivate(unsigned int, CWnd *, bool) override;
 	void OnSetFocus(CWnd *);
-	void OnClose(void);
+	void OnClose();
 	LRESULT OnMCINotify(WPARAM, LPARAM);
 	LRESULT OnMMIONotify(WPARAM, LPARAM);
 
diff --git a/engines/bagel/hodjnpodj/pdq/usercfg.cpp b/engines/bagel/hodjnpodj/pdq/usercfg.cpp
index 1c0f7660e3a..fa6ad78e6c8 100644
--- a/engines/bagel/hodjnpodj/pdq/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/pdq/usercfg.cpp
@@ -260,7 +260,7 @@ void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 }
 
 
-bool CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog() {
 	CRect tmpRect;
 	char buf[10];
 	CDC *pDC;
@@ -363,7 +363,7 @@ bool CUserCfgDlg::OnInitDialog(void) {
 }
 
 
-void CUserCfgDlg::OnPaint(void) {
+void CUserCfgDlg::OnPaint() {
 	CDC *pDC;
 
 	CBmpDialog::OnPaint();
@@ -385,7 +385,7 @@ BEGIN_MESSAGE_MAP(CUserCfgDlg, CBmpDialog)
 	ON_WM_DESTROY()
 END_MESSAGE_MAP()
 
-void CUserCfgDlg::OnDestroy(void) {
+void CUserCfgDlg::OnDestroy() {
 	if (m_pSpeedScroll != nullptr) {
 		delete m_pSpeedScroll;
 		m_pSpeedScroll = nullptr;
@@ -400,7 +400,7 @@ void CUserCfgDlg::OnDestroy(void) {
 }
 
 
-void CUserCfgDlg::DispSpeed(void) {
+void CUserCfgDlg::DispSpeed() {
 	CDC *pDC;
 
 	if ((pDC = GetDC()) != nullptr) {
@@ -410,7 +410,7 @@ void CUserCfgDlg::DispSpeed(void) {
 }
 
 
-void CUserCfgDlg::DispShown(void) {
+void CUserCfgDlg::DispShown() {
 	CDC *pDC;
 	char    msg[5];
 
@@ -423,7 +423,7 @@ void CUserCfgDlg::DispShown(void) {
 }
 
 
-void CUserCfgDlg::ClearDialogImage(void) {
+void CUserCfgDlg::ClearDialogImage() {
 	CDC *pDC;
 
 	if (m_bShouldSave) {
diff --git a/engines/bagel/hodjnpodj/pdq/usercfg.h b/engines/bagel/hodjnpodj/pdq/usercfg.h
index 4556ba0848b..45bc70db7b8 100644
--- a/engines/bagel/hodjnpodj/pdq/usercfg.h
+++ b/engines/bagel/hodjnpodj/pdq/usercfg.h
@@ -47,12 +47,12 @@ protected:
 
 	virtual void DoDataExchange(CDataExchange *) override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual bool OnInitDialog(void) override;
-	void PutDlgData(void);
-	void GetDlgData(void);
-	void DispSpeed(void);
-	void DispShown(void);
-	void ClearDialogImage(void);
+	virtual bool OnInitDialog() override;
+	void PutDlgData();
+	void GetDlgData();
+	void DispSpeed();
+	void DispShown();
+	void ClearDialogImage();
 
 
 	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
diff --git a/engines/bagel/hodjnpodj/peggle/game.cpp b/engines/bagel/hodjnpodj/peggle/game.cpp
index c1361c75c9c..98b133a17a7 100644
--- a/engines/bagel/hodjnpodj/peggle/game.cpp
+++ b/engines/bagel/hodjnpodj/peggle/game.cpp
@@ -44,9 +44,9 @@ namespace Peggle {
 
 extern  LPGAMESTRUCT    pGameInfo;
 
-void setup_cursor(void);
-void set_wait_cursor(void);
-void reset_wait_cursor(void);
+void setup_cursor();
+void set_wait_cursor();
+void reset_wait_cursor();
 
 CBmpButton  *pScrollButton = nullptr;
 
@@ -201,7 +201,7 @@ CMainWindow::CMainWindow(HWND hCallingApp) {
 
 	SetUpBoard(pDC);
 
-	(void)(*pDC).SelectPalette(pPalOld, false);
+	(*pDC).SelectPalette(pPalOld, false);
 	ReleaseDC(pDC);
 
 	if ((*pGameInfo).bMusicEnabled) {
@@ -414,7 +414,7 @@ bool CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 		case IDC_RULES:
 			bIgnoreScroll = true;
 			(*pScrollButton).SendMessage(BM_SETSTATE, true, 0L);
-			(void) RulesDlg.DoModal();                          // invoke the help dialog box
+			RulesDlg.DoModal();                          // invoke the help dialog box
 			break;
 
 		case IDC_NEWGAME:
@@ -1054,7 +1054,7 @@ void CMainWindow::UpdatePegPosition(CDC *pDC, CSprite *pBaseSprite, int x, int y
 }
 
 
-void CMainWindow::UndoTurn(void) {
+void CMainWindow::UndoTurn() {
 	CDC     *pDC;
 	int     newx, newy, oldx, oldy,
 	        neighborx, neighbory;
@@ -1320,7 +1320,7 @@ void CMainWindow::OnClose() {
 }
 
 
-void setup_cursor(void) {
+void setup_cursor() {
 	HCURSOR hNewCursor;
 	CWinApp *pMyApp;
 
@@ -1333,21 +1333,21 @@ void setup_cursor(void) {
 }
 
 
-void set_wait_cursor(void) {
+void set_wait_cursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).BeginWaitCursor();
+	(*pMyApp).BeginWaitCursor();
 }
 
 
-void reset_wait_cursor(void) {
+void reset_wait_cursor() {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
 
-	(void)(*pMyApp).EndWaitCursor();
+	(*pMyApp).EndWaitCursor();
 }
 
 } // namespace Peggle
diff --git a/engines/bagel/hodjnpodj/peggle/game.h b/engines/bagel/hodjnpodj/peggle/game.h
index e35e509f77f..f8245d9100f 100644
--- a/engines/bagel/hodjnpodj/peggle/game.h
+++ b/engines/bagel/hodjnpodj/peggle/game.h
@@ -67,7 +67,7 @@ public:
 	static  CPoint GridToPoint(int i, int j);
 	static  CPoint PointToGrid(CPoint point);
 	static  void UndoMove(CDC *pDC);
-	void UndoTurn(void);
+	void UndoTurn();
 
 private:
 	bool    m_bProgramActive;
diff --git a/engines/bagel/hodjnpodj/peggle/gameinit.cpp b/engines/bagel/hodjnpodj/peggle/gameinit.cpp
index 56f1cc7eacf..f3fc94ec3bc 100644
--- a/engines/bagel/hodjnpodj/peggle/gameinit.cpp
+++ b/engines/bagel/hodjnpodj/peggle/gameinit.cpp
@@ -84,7 +84,7 @@ void WINAPI WindowsInit() {
 }
 
 // Reset the default Windows control colors
-void WINAPI WindowsCleanup(void) {
+void WINAPI WindowsCleanup() {
 }
 
 } // namespace Peggle
diff --git a/engines/bagel/hodjnpodj/peggle/options.cpp b/engines/bagel/hodjnpodj/peggle/options.cpp
index 153cf0ba239..5211c40213a 100644
--- a/engines/bagel/hodjnpodj/peggle/options.cpp
+++ b/engines/bagel/hodjnpodj/peggle/options.cpp
@@ -55,7 +55,7 @@ void COptions::OnClickedRules() {
 	CWnd    *pControl = nullptr;
 
 	CRules  RulesDlg(this, RULESSPEC, pOptionsPalette, ((*pGameInfo).bSoundEffectsEnabled ? NARRATIVESPEC : nullptr));
-	(void) RulesDlg.DoModal();                      // invoke the help dialog box
+	RulesDlg.DoModal();                      // invoke the help dialog box
 	SetDefID(IDC_OPTIONS_OPTIONS);
 	SetDefID(IDC_OPTIONS_RETURN);
 	pControl = GetDlgItem(IDC_OPTIONS_RETURN);
diff --git a/engines/bagel/hodjnpodj/peggle/options.h b/engines/bagel/hodjnpodj/peggle/options.h
index 4dee296893d..d8f5e70b399 100644
--- a/engines/bagel/hodjnpodj/peggle/options.h
+++ b/engines/bagel/hodjnpodj/peggle/options.h
@@ -35,8 +35,8 @@ class COptions : public CDialog {
 public:
 	COptions(CWnd* pParent, CPalette *pPalette, int iDlgId);
 
-	void ClearDialogImage(void);
-	void RefreshBackground(void);
+	void ClearDialogImage();
+	void RefreshBackground();
 
 	int     m_iDlgId ;  // dialog id
 	CWnd    *m_pDlgParentWnd;
diff --git a/engines/bagel/hodjnpodj/peggle/optndlg.cpp b/engines/bagel/hodjnpodj/peggle/optndlg.cpp
index 31070db12a9..3850784fa2a 100644
--- a/engines/bagel/hodjnpodj/peggle/optndlg.cpp
+++ b/engines/bagel/hodjnpodj/peggle/optndlg.cpp
@@ -163,7 +163,7 @@ bool COptnDlg::OnInitDialog() {
 }
 
 
-void COptnDlg::OnDestroy(void) {
+void COptnDlg::OnDestroy() {
 	bool    bUpdateNeeded;
 
 	if (m_pDlgBackground != nullptr) {
diff --git a/engines/bagel/hodjnpodj/peggle/optsub.cpp b/engines/bagel/hodjnpodj/peggle/optsub.cpp
index b6ab953895a..bed49bc4900 100644
--- a/engines/bagel/hodjnpodj/peggle/optsub.cpp
+++ b/engines/bagel/hodjnpodj/peggle/optsub.cpp
@@ -102,13 +102,13 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // COptions message handlers
 
-void COptions::OnOK(void) {
+void COptions::OnOK() {
 	ClearDialogImage();
 	CDialog::EndDialog(IDC_OPTIONS_QUIT);
 }
 
 
-bool COptions::OnInitDialog(void) {
+bool COptions::OnInitDialog() {
 	bool    bSuccess;
 	CWnd    *pButton;
 	CDC     *pDC;
@@ -212,7 +212,7 @@ bool COptions::OnInitDialog(void) {
 }
 
 
-void COptions::OnDestroy(void) {
+void COptions::OnDestroy() {
 	bool    bUpdateNeeded;
 
 	if (m_iDlgId == IDD_OPTIONS_DIALOG) {
@@ -273,7 +273,7 @@ bool COptions::OnEraseBkgnd(CDC *pDC) {
 }
 
 
-void COptions::OnPaint(void) {
+void COptions::OnPaint() {
 	bool        bSuccess;
 	CPalette    *pPalOld = nullptr;
 
@@ -285,18 +285,18 @@ void COptions::OnPaint(void) {
 
 	if (pOptionsPalette != nullptr) {
 		pPalOld = dc.SelectPalette(pOptionsPalette, false);
-		(void) dc.RealizePalette();
+		dc.RealizePalette();
 	}
 
 	bSuccess = PaintMaskedDIB(&dc, pOptionsPalette, ".\\art\\oscroll.bmp", 0, 0);
 	ASSERT(bSuccess);
 
 	if (pOptionsPalette != nullptr)
-		(void) dc.SelectPalette(pPalOld, false);
+		dc.SelectPalette(pPalOld, false);
 }
 
 
-void COptions::ClearDialogImage(void) {
+void COptions::ClearDialogImage() {
 	if (m_pDlgBackground != nullptr) {
 		if (m_iDlgId == IDD_OPTIONS_DIALOG) {
 			if (pRulesButton != nullptr)
@@ -344,7 +344,7 @@ void COptions::ClearDialogImage(void) {
 }
 
 
-void COptions::RefreshBackground(void) {
+void COptions::RefreshBackground() {
 	bool        bSuccess;
 	CDC         *pDC;
 	CPalette    *pPalOld = nullptr;
@@ -356,14 +356,14 @@ void COptions::RefreshBackground(void) {
 
 	if (pOptionsPalette != nullptr) {
 		pPalOld = (*pDC).SelectPalette(pOptionsPalette, false);
-		(void)(*pDC).RealizePalette();
+		(*pDC).RealizePalette();
 	}
 
 	bSuccess = PaintBitmap(pDC, pOptionsPalette, m_pDlgBackground, 0, 0);
 	ASSERT(bSuccess);
 
 	if (pOptionsPalette != nullptr)
-		(void)(*pDC).SelectPalette(pPalOld, false);
+		(*pDC).SelectPalette(pPalOld, false);
 
 	ReleaseDC(pDC);
 }
diff --git a/engines/bagel/hodjnpodj/poker/amtdlg.cpp b/engines/bagel/hodjnpodj/poker/amtdlg.cpp
index efe8d64f833..541291c6baf 100644
--- a/engines/bagel/hodjnpodj/poker/amtdlg.cpp
+++ b/engines/bagel/hodjnpodj/poker/amtdlg.cpp
@@ -150,7 +150,7 @@ bool CSetAmountDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
  *  bool to tell windows that it has dealt this function
  *
  ****************************************************************/
-bool CSetAmountDlg::OnInitDialog(void) {
+bool CSetAmountDlg::OnInitDialog() {
 	bool    bSuccess;
 
 	CBmpDialog::OnInitDialog();
@@ -233,7 +233,7 @@ void CSetAmountDlg::SetInitialOptions(long lCurrentAmount) {
  *  n/a
  *
  ****************************************************************/
-void CSetAmountDlg::OnPaint(void) {
+void CSetAmountDlg::OnPaint() {
 	CDC             *pDC;
 	CString     strHowMuch1 = "How much would you";
 	CString     strHowMuch2 = "like (0 - 1000)?";
@@ -420,7 +420,7 @@ bool CSetAmountDlg::OnEraseBkgnd(CDC *pDC) {
 	return true;
 }
 
-void CSetAmountDlg::ClearDialogImage(void) {
+void CSetAmountDlg::ClearDialogImage() {
 
 	if (pAmountButton != nullptr) {
 		delete pAmountButton;
diff --git a/engines/bagel/hodjnpodj/poker/c1btndlg.h b/engines/bagel/hodjnpodj/poker/c1btndlg.h
index 4060e902849..87bc9396f67 100644
--- a/engines/bagel/hodjnpodj/poker/c1btndlg.h
+++ b/engines/bagel/hodjnpodj/poker/c1btndlg.h
@@ -41,7 +41,7 @@ public:
 	C1ButtonDialog(CWnd *, CPalette *, const char *, const char *, const char *pszText2 = nullptr, const char *pszText3 = nullptr);
 
 private:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Dialog Data
 	//{{AFX_DATA(C1ButtonDialog)
diff --git a/engines/bagel/hodjnpodj/poker/dialogs.h b/engines/bagel/hodjnpodj/poker/dialogs.h
index e9bc4ed974f..aa535f1c07e 100644
--- a/engines/bagel/hodjnpodj/poker/dialogs.h
+++ b/engines/bagel/hodjnpodj/poker/dialogs.h
@@ -48,7 +48,7 @@ public:
 
 protected:
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 	afx_msg void OnPaint();
 	afx_msg bool OnEraseBkgnd(CDC *pDC);
 	afx_msg void OnDestroy();
@@ -116,7 +116,7 @@ public:
 
 protected:
 	virtual void DoDataExchange(CDataExchange *) override;
-	virtual bool OnInitDialog(void) override;
+	virtual bool OnInitDialog() override;
 	afx_msg void OnSetpayoffs();
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnCancel() override;
@@ -140,7 +140,7 @@ public:
 	bool OnInitDialog() override;
 
 protected:
-	virtual void OnOK(void) override;
+	virtual void OnOK() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/poker/optdlg.cpp b/engines/bagel/hodjnpodj/poker/optdlg.cpp
index 9ab7503527f..f1e5d6f52b1 100644
--- a/engines/bagel/hodjnpodj/poker/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/poker/optdlg.cpp
@@ -153,7 +153,7 @@ bool COptionsDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
  *  bool to tell windows that it has dealt this function
  *
  ****************************************************************/
-bool COptionsDlg::OnInitDialog(void) {
+bool COptionsDlg::OnInitDialog() {
 	bool    bSuccess;
 
 	CBmpDialog::OnInitDialog();
@@ -233,7 +233,7 @@ void COptionsDlg::OnDestroy() {
 	CBmpDialog::OnDestroy();
 }
 
-void COptionsDlg::ClearDialogImage(void) {
+void COptionsDlg::ClearDialogImage() {
 
 	if (pAmountButton != nullptr) {
 		delete pAmountButton;
diff --git a/engines/bagel/hodjnpodj/poker/poffsdlg.cpp b/engines/bagel/hodjnpodj/poker/poffsdlg.cpp
index 551572c47b6..ec1a7e59dd5 100644
--- a/engines/bagel/hodjnpodj/poker/poffsdlg.cpp
+++ b/engines/bagel/hodjnpodj/poker/poffsdlg.cpp
@@ -86,7 +86,7 @@ void CSetPayoffsDlg::DoDataExchange(CDataExchange *pDX) {
 	CDialog::DoDataExchange(pDX);
 }
 
-bool CSetPayoffsDlg::OnInitDialog(void) {
+bool CSetPayoffsDlg::OnInitDialog() {
 	bool    bSuccess = false;
 
 	CBmpDialog::OnInitDialog();
@@ -279,7 +279,7 @@ bool CSetPayoffsDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
  *  n/a
  *
  ****************************************************************/
-void CSetPayoffsDlg::OnPaint(void) {
+void CSetPayoffsDlg::OnPaint() {
 	CDC             *pDC;
 	int         nOldBkMode;
 
@@ -562,7 +562,7 @@ bool CSetPayoffsDlg::OnEraseBkgnd(CDC *pDC) {
 	return true;
 }
 
-void CSetPayoffsDlg::ClearDialogImage(void) {
+void CSetPayoffsDlg::ClearDialogImage() {
 
 	if (pSetPayButton != nullptr) {
 		delete pSetPayButton;
diff --git a/engines/bagel/hodjnpodj/poker/poker.cpp b/engines/bagel/hodjnpodj/poker/poker.cpp
index b4245e55664..09539c35cc5 100644
--- a/engines/bagel/hodjnpodj/poker/poker.cpp
+++ b/engines/bagel/hodjnpodj/poker/poker.cpp
@@ -258,7 +258,7 @@ CMainPokerWindow::CMainPokerWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct)
 // load splash screen
 	pDC = GetDC();                                  // get a device context for our window
 
-//(void)FetchBitmap( pDC, &pGamePalette, SPLASHSPEC );
+//()FetchBitmap( pDC, &pGamePalette, SPLASHSPEC );
 
 
 	pDibDoc = new CDibDoc();                        // create an object to hold our splash screen
@@ -395,7 +395,7 @@ CMainPokerWindow::CMainPokerWindow(HWND hCallingWnd, LPGAMESTRUCT lpGameStruct)
 		pBtnPalette = nullptr;
 	}
 
-	(void)pDC->SelectPalette(pOldPal, false);
+	pDC->SelectPalette(pOldPal, false);
 	pDC->RealizePalette();
 	pOldPal = nullptr;
 	ReleaseDC(pDC);
@@ -1084,7 +1084,7 @@ bool CMainPokerWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 void CMainPokerWindow::OnRButtonDown(unsigned int nFlags, CPoint point) {
 	CSetPayoffsDlg  dlgPayOff((CWnd *)this, pGamePalette, IDD_WINRATIO, nPayOff, true);
 
-	(void)dlgPayOff.DoModal();
+	dlgPayOff.DoModal();
 
 	CWnd::OnLButtonDown(nFlags, point);
 }
@@ -1242,7 +1242,7 @@ void CMainPokerWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsig
 	if (nChar == VK_F1) {
 		pOptionButton->ShowWindow(SW_HIDE);
 //		UpdateWindow();
-		(void) dlgRules.DoModal();      // invoke the help dialog box
+		dlgRules.DoModal();      // invoke the help dialog box
 		pOptionButton->ShowWindow(SW_SHOWNORMAL);
 		return;
 	} else {
@@ -1902,7 +1902,7 @@ void CMainPokerWindow::SetHoldList(int nIndex) {
 	pDnBmp = nullptr;
 	pDsBmp = nullptr;
 
-	(void)pDC->SelectPalette(pOldPal, false);
+	pDC->SelectPalette(pOldPal, false);
 	ReleaseDC(pDC);
 }
 
@@ -2201,7 +2201,7 @@ int CMainPokerWindow::Mod(int Dividend, int Divisor) {
  *
  ****************************************************************/
 
-void CMainPokerWindow::ReleaseResources(void) {
+void CMainPokerWindow::ReleaseResources() {
 	int i;
 
 	if (pGameSound != nullptr) {
@@ -2275,7 +2275,7 @@ void CMainPokerWindow::ReleaseResources(void) {
  *
  ****************************************************************/
 
-void CMainPokerWindow::FlushInputEvents(void) {
+void CMainPokerWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/poker/poker.h b/engines/bagel/hodjnpodj/poker/poker.h
index 4e0cdf8d380..d1deb5cc07e 100644
--- a/engines/bagel/hodjnpodj/poker/poker.h
+++ b/engines/bagel/hodjnpodj/poker/poker.h
@@ -277,8 +277,8 @@ public:
 	void    ResetGame(long = 0L);
 	void    SetBet(long);
 
-	static  void ReleaseResources(void);
-	static  void FlushInputEvents(void);
+	static  void ReleaseResources();
+	static  void FlushInputEvents();
 
 private:
 	int     DealNewCard();
diff --git a/engines/bagel/hodjnpodj/poker/uwondlg.cpp b/engines/bagel/hodjnpodj/poker/uwondlg.cpp
index 30f721e469b..ae5a671f5e8 100644
--- a/engines/bagel/hodjnpodj/poker/uwondlg.cpp
+++ b/engines/bagel/hodjnpodj/poker/uwondlg.cpp
@@ -108,13 +108,13 @@ bool CUserWonDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CDialog::OnCommand(wParam, lParam);
 }
 
-void CUserWonDlg::OnOK(void) {
+void CUserWonDlg::OnOK() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CUserWonDlg::ClearDialogImage(void) {
+void CUserWonDlg::ClearDialogImage() {
 
 	if (pOKButton != nullptr) {
 		delete pOKButton;
@@ -188,7 +188,7 @@ void CUserWonDlg::SetInitialOptions(int nWhichPhrase) {
  *  n/a
  *
  ****************************************************************/
-void CUserWonDlg::OnPaint(void) {
+void CUserWonDlg::OnPaint() {
 	CDC             *pDC;
 	int         nOldBkMode;
 
@@ -244,7 +244,7 @@ void CUserWonDlg::OnPaint(void) {
 	return;
 }
 
-bool CUserWonDlg::OnInitDialog(void) {
+bool CUserWonDlg::OnInitDialog() {
 	bool    bSuccess;
 
 	CBmpDialog::OnInitDialog();
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.cpp b/engines/bagel/hodjnpodj/riddles/riddles.cpp
index 99ec4af4b61..6079fa4706b 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.cpp
+++ b/engines/bagel/hodjnpodj/riddles/riddles.cpp
@@ -148,7 +148,7 @@ STATIC RIDDLE curRiddle;
 STATIC CSprite *aMasterSpriteList[N_SPRITECHARS];
 
 
-CRiddlesWindow::CRiddlesWindow(void) :
+CRiddlesWindow::CRiddlesWindow() :
 		cBrush(PALETTEINDEX(11)) {
 	CString  WndClass;
 	CRect    tmpRect;
@@ -331,7 +331,7 @@ void CRiddlesWindow::HandleError(ERROR_CODE errCode) {
 }
 
 
-ERROR_CODE CRiddlesWindow::LoadMasterSprites(void) {
+ERROR_CODE CRiddlesWindow::LoadMasterSprites() {
 	CBitmap *pBmp, *pFontBmp;
 	CSprite *pSprite;
 	CDC *pDC;
@@ -534,12 +534,12 @@ bool CRiddlesWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CRiddlesWindow::GamePause(void) {
+void CRiddlesWindow::GamePause() {
 	m_bPause = true;
 };
 
 
-void CRiddlesWindow::GameResume(void) {
+void CRiddlesWindow::GameResume() {
 	m_bPause = false;
 };
 
@@ -634,7 +634,7 @@ void CRiddlesWindow::LoadIniSettings() {
 }
 
 
-void CRiddlesWindow::GameReset(void) {
+void CRiddlesWindow::GameReset() {
 	CDC *pDC;
 
 	pDC = GetDC();                              // get the current device context
@@ -820,7 +820,7 @@ ERROR_CODE CRiddlesWindow::ValidateRiddle(RIDDLE *pRiddle) {
 }
 
 
-ERROR_CODE CRiddlesWindow::BuildSpriteList(void) {
+ERROR_CODE CRiddlesWindow::BuildSpriteList() {
 	char *pRiddle, *p;
 	int x, y;
 	unsigned int nCharsPerLine;
@@ -1462,7 +1462,7 @@ void CRiddlesWindow::DeleteSprite(CSprite *pSprite) {
 	delete pSprite;                                 // delete it
 }
 
-void CRiddlesWindow::FlushInputEvents(void) {
+void CRiddlesWindow::FlushInputEvents() {
 	MSG msg;
 
 	// find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/riddles/riddles.h b/engines/bagel/hodjnpodj/riddles/riddles.h
index 1e6961134dd..34c355d541a 100644
--- a/engines/bagel/hodjnpodj/riddles/riddles.h
+++ b/engines/bagel/hodjnpodj/riddles/riddles.h
@@ -125,28 +125,28 @@ private:
 	CBrush cBrush;
 
 public:
-	CRiddlesWindow(void);
-	void        PlayGame(void);
-	void        PaintScreen(void);
-	void        LoadIniSettings(void);
+	CRiddlesWindow();
+	void        PlayGame();
+	void        PaintScreen();
+	void        LoadIniSettings();
 	void        ParseAnswer(const char *);
-	void        GamePause(void);
-	void        GameResume(void);
+	void        GamePause();
+	void        GameResume();
 
 private:
 	void        OnSoundNotify(CSound *pSound);
 
 protected:
-	void        FlushInputEvents(void);
+	void        FlushInputEvents();
 	bool        CheckUserGuess(const char *);
-	ERROR_CODE  RepaintSpriteList(void);
-	ERROR_CODE  LoadRiddle(void);
-	ERROR_CODE  BuildSpriteList(void);
+	ERROR_CODE  RepaintSpriteList();
+	ERROR_CODE  LoadRiddle();
+	ERROR_CODE  BuildSpriteList();
 	ERROR_CODE  DisplayLine(const char *, int, int, int);
 	int         CharToIndex(char);
 	ERROR_CODE  ValidateRiddle(RIDDLE *);
-	ERROR_CODE  LoadMasterSprites(void);
-	void        GameReset(void);
+	ERROR_CODE  LoadMasterSprites();
+	void        GameReset();
 	virtual bool OnCommand(WPARAM wParam, LPARAM lParam) override;
 	void        HandleError(ERROR_CODE);
 	void        DeleteSprite(CSprite *);
diff --git a/engines/bagel/hodjnpodj/riddles/usercfg.cpp b/engines/bagel/hodjnpodj/riddles/usercfg.cpp
index 5a8d7e4375d..a3c44fa5c16 100644
--- a/engines/bagel/hodjnpodj/riddles/usercfg.cpp
+++ b/engines/bagel/hodjnpodj/riddles/usercfg.cpp
@@ -259,7 +259,7 @@ void CUserCfgDlg::OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar
 }
 
 
-bool CUserCfgDlg::OnInitDialog(void) {
+bool CUserCfgDlg::OnInitDialog() {
 	CRect tmpRect;
 	CDC *pDC;
 
@@ -327,7 +327,7 @@ bool CUserCfgDlg::OnInitDialog(void) {
 }
 
 
-void CUserCfgDlg::OnPaint(void) {
+void CUserCfgDlg::OnPaint() {
 	CDC *pDC;
 
 	CBmpDialog::OnPaint();
@@ -421,7 +421,7 @@ void CUserCfgDlg::OnClose() {
 	EndDialog(0);
 }
 
-void CUserCfgDlg::ClearDialogImage(void) {
+void CUserCfgDlg::ClearDialogImage() {
 	if (pOKButton != nullptr) {                          // release the button
 		delete pOKButton;
 		pOKButton = nullptr;
@@ -441,7 +441,7 @@ void CUserCfgDlg::ClearDialogImage(void) {
 	ValidateRect(nullptr);
 }
 
-void CUserCfgDlg::DispLimit(void) {
+void CUserCfgDlg::DispLimit() {
 	CDC *pDC;
 
 	if ((pDC = GetDC()) != nullptr) {
@@ -451,7 +451,7 @@ void CUserCfgDlg::DispLimit(void) {
 	}
 }
 
-void CUserCfgDlg::DispLevel(void) {
+void CUserCfgDlg::DispLevel() {
 	Common::String szBuf;
 	CDC *pDC;
 
diff --git a/engines/bagel/hodjnpodj/riddles/usercfg.h b/engines/bagel/hodjnpodj/riddles/usercfg.h
index 75ff896d607..6de4a7a1b8c 100644
--- a/engines/bagel/hodjnpodj/riddles/usercfg.h
+++ b/engines/bagel/hodjnpodj/riddles/usercfg.h
@@ -43,17 +43,17 @@ namespace Riddles {
 class CUserCfgDlg : public CBmpDialog {
 public:
 	CUserCfgDlg(CWnd *pParent = nullptr, CPalette *pPalette = nullptr, unsigned int = IDD_USERCFG);
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 protected:
 
 	virtual void DoDataExchange(CDataExchange *) override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
-	virtual bool OnInitDialog(void) override;
-	void PutDlgData(void);
-	void GetDlgData(void);
-	void DispLimit(void);
-	void DispLevel(void);
+	virtual bool OnInitDialog() override;
+	void PutDlgData();
+	void GetDlgData();
+	void DispLimit();
+	void DispLevel();
 	int GetIndex(int);
 
 	void OnHScroll(unsigned int, unsigned int, CScrollBar *);
diff --git a/engines/bagel/hodjnpodj/wordsearch/c1btndlg.h b/engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
index 531d9246d95..1dbf63850d2 100644
--- a/engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
+++ b/engines/bagel/hodjnpodj/wordsearch/c1btndlg.h
@@ -38,7 +38,7 @@ public:
 	C1ButtonDialog(CWnd *, CPalette *, char *, char *, char *pszText2 = nullptr);
 
 private:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Dialog Data
 	//{{AFX_DATA(C1ButtonDialog)
diff --git a/engines/bagel/hodjnpodj/wordsearch/clongdlg.h b/engines/bagel/hodjnpodj/wordsearch/clongdlg.h
index 864905411f4..01ca649a80e 100644
--- a/engines/bagel/hodjnpodj/wordsearch/clongdlg.h
+++ b/engines/bagel/hodjnpodj/wordsearch/clongdlg.h
@@ -38,7 +38,7 @@ public:
 	            const char *, const char *pszText2 = nullptr);
 
 private:
-	void ClearDialogImage(void);
+	void ClearDialogImage();
 
 	// Dialog Data
 	//{{AFX_DATA(C1ButtonDialog)
diff --git a/engines/bagel/hodjnpodj/wordsearch/dialogs.h b/engines/bagel/hodjnpodj/wordsearch/dialogs.h
index 1465b2b2f8e..950fe94ea1c 100644
--- a/engines/bagel/hodjnpodj/wordsearch/dialogs.h
+++ b/engines/bagel/hodjnpodj/wordsearch/dialogs.h
@@ -47,8 +47,8 @@ public:
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnCancel(void) override;
-	virtual void OnOK(void) override;
+	virtual void OnCancel() override;
+	virtual void OnOK() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnHScroll(unsigned int nSBCode, unsigned int nPos, CScrollBar* pScrollBar);
 	afx_msg void OnPaint();
@@ -73,8 +73,8 @@ public:
 
 protected:
 	//{{AFX_MSG(COptions)
-	virtual void OnCancel(void) override;
-	virtual void OnOK(void) override;
+	virtual void OnCancel() override;
+	virtual void OnOK() override;
 	virtual bool OnCommand(WPARAM, LPARAM) override;
 	afx_msg void OnPaint();
 	afx_msg void OnDestroy();
diff --git a/engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp b/engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
index eedc462d2b7..a40fa87a4ca 100644
--- a/engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/msgdlg.cpp
@@ -110,19 +110,19 @@ bool CMsgDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 	return CDialog::OnCommand(wParam, lParam);
 }
 
-void CMsgDlg::OnCancel(void) {
+void CMsgDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CMsgDlg::OnOK(void) {
+void CMsgDlg::OnOK() {
 	ClearDialogImage();
 	EndDialog(0);
 	return;
 }
 
-void CMsgDlg::ClearDialogImage(void) {
+void CMsgDlg::ClearDialogImage() {
 
 	if (pMsgOKButton != nullptr) {
 		delete pMsgOKButton;
@@ -213,7 +213,7 @@ bool CMsgDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CMsgDlg::OnPaint(void) {
+void CMsgDlg::OnPaint() {
 //      call CBmpDialog onpaint, to paint the background
 	CBmpDialog::OnPaint();
 
diff --git a/engines/bagel/hodjnpodj/wordsearch/optdlg.cpp b/engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
index 8feb657d1a9..3caf80ae88e 100644
--- a/engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/optdlg.cpp
@@ -195,19 +195,19 @@ bool CWSOptDlg::OnCommand(WPARAM wParam, LPARAM lParam) {
 }
 
 
-void CWSOptDlg::OnCancel(void) {
+void CWSOptDlg::OnCancel() {
 	ClearDialogImage();
 	EndDialog(-1);
 	return;
 }
 
-void CWSOptDlg::OnOK(void) {
+void CWSOptDlg::OnOK() {
 	ClearDialogImage();
 	EndDialog(-1);
 	return;
 }
 
-void CWSOptDlg::ClearDialogImage(void) {
+void CWSOptDlg::ClearDialogImage() {
 
 	if (pOKButton != nullptr) {
 		delete pOKButton;
@@ -358,7 +358,7 @@ bool CWSOptDlg::OnInitDialog() {
  *      n/a
  *
  ****************************************************************/
-void CWSOptDlg::OnPaint(void) {
+void CWSOptDlg::OnPaint() {
 	CDC             *pDC;
 	CString         strTime = "Time Limit:  ";
 //int             nOldBkMode;
diff --git a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
index 5b8bdaa66bf..d45a7ec3e1b 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
+++ b/engines/bagel/hodjnpodj/wordsearch/wordsearch.cpp
@@ -1351,7 +1351,7 @@ void CMainWSWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned
 		pOptionButton->ShowWindow(SW_HIDE);
 //			UpdateWindow();
 		CSound::waitWaveSounds();
-		(void) dlgRules.DoModal();      // invoke the help dialog box
+		dlgRules.DoModal();      // invoke the help dialog box
 		pOptionButton->ShowWindow(SW_SHOWNORMAL);
 		break;
 	case VK_F2:
@@ -1560,7 +1560,7 @@ void CMainWSWindow::OnDestroy() {
  *
  ****************************************************************/
 
-void CMainWSWindow::ReleaseResources(void) {
+void CMainWSWindow::ReleaseResources() {
 
 	if (pGameSound != nullptr) {
 		delete pGameSound;                      // delete the game theme song
@@ -1639,7 +1639,7 @@ void CMainWSWindow::ReleaseResources(void) {
  *
  ****************************************************************/
 
-void CMainWSWindow::FlushInputEvents(void) {
+void CMainWSWindow::FlushInputEvents() {
 	MSG msg;
 
 	while (true) {                                      // find and remove all keyboard events
diff --git a/engines/bagel/hodjnpodj/wordsearch/wordsearch.h b/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
index 47519721130..5516a359104 100644
--- a/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
+++ b/engines/bagel/hodjnpodj/wordsearch/wordsearch.h
@@ -156,8 +156,8 @@ public:
 
 	void SplashScreen();
 
-	static  void ReleaseResources(void);
-	static  void FlushInputEvents(void);
+	static  void ReleaseResources();
+	static  void FlushInputEvents();
 	void MainLoop();
 	void ResetGame();
 	void ClearGrid();
diff --git a/engines/bagel/mfc/afxmsg.h b/engines/bagel/mfc/afxmsg.h
index f288cd521ba..b31056397d9 100644
--- a/engines/bagel/mfc/afxmsg.h
+++ b/engines/bagel/mfc/afxmsg.h
@@ -288,7 +288,7 @@ namespace MFC {
 #define ON_CONTROL_REFLECT_EX(wNotifyCode, memberFxn) \
 	{ WM_COMMAND+WM_REFLECT_BASE, (uint16)wNotifyCode, 0, 0, AfxSigCmd_b, \
 		(AFX_PMSG) \
-		(static_cast<bool (AFX_MSG_CALL CCmdTarget::*)(void)> (memberFxn)) },
+		(static_cast<bool (AFX_MSG_CALL CCmdTarget::*)()> (memberFxn)) },
 
 #define ON_NOTIFY_REFLECT(wNotifyCode, memberFxn) \
 	{ WM_NOTIFY+WM_REFLECT_BASE, (uint16)(int)wNotifyCode, 0, 0, AfxSigNotify_v, \
@@ -324,7 +324,7 @@ namespace MFC {
 #define ON_WM_DESTROY() \
 	{ WM_DESTROY, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnDestroy)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnDestroy)) },
 
 #define ON_WM_MOVE() \
 	{ WM_MOVE, 0, 0, 0, AfxSig_vvii, \
@@ -364,27 +364,27 @@ namespace MFC {
 #define ON_WM_PAINT() \
 	{ WM_PAINT, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnPaint)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnPaint)) },
 
 #define ON_WM_SYNCPAINT() \
 	{ WM_SYNCPAINT, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnSyncPaint)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnSyncPaint)) },
 
 #define ON_WM_CLOSE() \
 	{ WM_CLOSE, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnClose)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnClose)) },
 
 #define ON_WM_QUERYENDSESSION() \
 	{ WM_QUERYENDSESSION, 0, 0, 0, AfxSig_bv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< bool (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnQueryEndSession)) },
+		(static_cast< bool (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnQueryEndSession)) },
 
 #define ON_WM_QUERYOPEN() \
 	{ WM_QUERYOPEN, 0, 0, 0, AfxSig_bv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< bool (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnQueryOpen)) },
+		(static_cast< bool (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnQueryOpen)) },
 
 #define ON_WM_ERASEBKGND() \
 	{ WM_ERASEBKGND, 0, 0, 0, AfxSig_bD, \
@@ -399,7 +399,7 @@ namespace MFC {
 #define ON_WM_SYSCOLORCHANGE() \
 	{ WM_SYSCOLORCHANGE, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnSysColorChange)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnSysColorChange)) },
 
 #define ON_WM_ENDSESSION() \
 	{ WM_ENDSESSION, 0, 0, 0, AfxSig_vb, \
@@ -419,7 +419,7 @@ namespace MFC {
 #define ON_WM_GETTEXTLENGTH() \
 	{ WM_GETTEXTLENGTH, 0, 0, 0, AfxSig_u_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnGetTextLength)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnGetTextLength)) },
 
 #define ON_WM_SETFONT() \
 	{ WM_SETFONT, 0, 0, 0, AfxSig_vwpb, \
@@ -429,7 +429,7 @@ namespace MFC {
 #define ON_WM_GETFONT() \
 	{ WM_GETFONT, 0, 0, 0, AfxSig_h_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< HFONT (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnGetFont)) },
+		(static_cast< HFONT (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnGetFont)) },
 
 #define ON_WM_SETICON() \
 	{ WM_SETICON, 0, 0, 0, AfxSig_h_b_h, \
@@ -444,7 +444,7 @@ namespace MFC {
 #define  ON_WM_MDIREFRESHMENU() \
 	{ WM_MDIREFRESHMENU, 0, 0, 0, AfxSig_h_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< HMENU (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnMDIRefreshMenu)) },
+		(static_cast< HMENU (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnMDIRefreshMenu)) },
 
 #define  ON_WM_MDIDESTROY() \
 	{ WM_MDIDESTROY, 0, 0, 0, AfxSig_v_W_v, \
@@ -459,22 +459,22 @@ namespace MFC {
 #define  ON_WM_CUT() \
 	{ WM_CUT, 0, 0, 0, AfxSig_v_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnCut)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnCut)) },
 
 #define  ON_WM_COPY() \
 	{ WM_COPY, 0, 0, 0, AfxSig_v_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnCopy)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnCopy)) },
 
 #define  ON_WM_PASTE() \
 	{ WM_PASTE, 0, 0, 0, AfxSig_v_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnPaste)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnPaste)) },
 
 #define  ON_WM_CLEAR() \
 	{ WM_CLEAR, 0, 0, 0, AfxSig_v_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnClear)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnClear)) },
 
 #define  ON_WM_DISPLAYCHANGE() \
 	{ WM_DISPLAYCHANGE, 0, 0, 0, AfxSig_v_u_ii, \
@@ -539,17 +539,17 @@ namespace MFC {
 #define ON_WM_FONTCHANGE() \
 	{ WM_FONTCHANGE, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnFontChange)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnFontChange)) },
 
 #define ON_WM_TIMECHANGE() \
 	{ WM_TIMECHANGE, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnTimeChange)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnTimeChange)) },
 
 #define ON_WM_CANCELMODE() \
 	{ WM_CANCELMODE, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnCancelMode)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnCancelMode)) },
 
 #define ON_WM_SETCURSOR() \
 	{ WM_SETCURSOR, 0, 0, 0, AfxSig_bWww, \
@@ -564,7 +564,7 @@ namespace MFC {
 #define ON_WM_CHILDACTIVATE() \
 	{ WM_CHILDACTIVATE, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnChildActivate)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnChildActivate)) },
 
 #define ON_WM_GETMINMAXINFO() \
 	{ WM_GETMINMAXINFO, 0, 0, 0, AfxSig_vs, \
@@ -634,7 +634,7 @@ namespace MFC {
 #define ON_WM_QUERYDRAGICON() \
 	{ WM_QUERYDRAGICON, 0, 0, 0, AfxSig_hv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< HCURSOR (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnQueryDragIcon)) },
+		(static_cast< HCURSOR (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnQueryDragIcon)) },
 
 #define ON_WM_COMPAREITEM() \
 	{ WM_COMPAREITEM, 0, 0, 0, AfxSig_iis, \
@@ -659,7 +659,7 @@ namespace MFC {
 #define ON_WM_NCDESTROY() \
 	{ WM_NCDESTROY, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnNcDestroy)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnNcDestroy)) },
 
 #define ON_WM_NCCALCSIZE() \
 	{ WM_NCCALCSIZE, 0, 0, 0, AfxSig_vCALC, \
@@ -674,7 +674,7 @@ namespace MFC {
 #define ON_WM_NCPAINT() \
 	{ WM_NCPAINT, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnNcPaint)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnNcPaint)) },
 
 #define ON_WM_NCACTIVATE() \
 	{ WM_NCACTIVATE, 0, 0, 0, AfxSig_bb, \
@@ -684,7 +684,7 @@ namespace MFC {
 #define ON_WM_GETDLGCODE() \
 	{ WM_GETDLGCODE, 0, 0, 0, AfxSig_wv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnGetDlgCode)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnGetDlgCode)) },
 
 #define ON_WM_NCMOUSEMOVE() \
 	{ WM_NCMOUSEMOVE, 0, 0, 0, AfxSig_vwp, \
@@ -699,7 +699,7 @@ namespace MFC {
 #define ON_WM_NCMOUSELEAVE() \
 	{ WM_NCMOUSELEAVE, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnNcMouseLeave)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnNcMouseLeave)) },
 
 #define ON_WM_NCLBUTTONDOWN() \
 	{ WM_NCLBUTTONDOWN, 0, 0, 0, AfxSig_vwp, \
@@ -934,7 +934,7 @@ namespace MFC {
 #define ON_WM_MOUSELEAVE() \
 	{ WM_MOUSELEAVE, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnMouseLeave)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnMouseLeave)) },
 
 #define ON_WM_MOUSEWHEEL() \
 	{ WM_MOUSEWHEEL, 0, 0, 0, AfxSig_bwsp, \
@@ -1034,17 +1034,17 @@ namespace MFC {
 #define ON_WM_RENDERALLFORMATS() \
 	{ WM_RENDERALLFORMATS, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnRenderAllFormats)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnRenderAllFormats)) },
 
 #define ON_WM_DESTROYCLIPBOARD() \
 	{ WM_DESTROYCLIPBOARD, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnDestroyClipboard)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnDestroyClipboard)) },
 
 #define ON_WM_DRAWCLIPBOARD() \
 	{ WM_DRAWCLIPBOARD, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnDrawClipboard)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnDrawClipboard)) },
 
 #define ON_WM_PAINTCLIPBOARD() \
 	{ WM_PAINTCLIPBOARD, 0, 0, 0, AfxSig_vWh, \
@@ -1084,12 +1084,12 @@ namespace MFC {
 #define ON_WM_CLIPBOARDUPDATE() \
 	{ WM_CLIPBOARDUPDATE, 0, 0, 0, AfxSig_v_v_v, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnClipboardUpdate)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnClipboardUpdate)) },
 
 #define ON_WM_QUERYNEWPALETTE() \
 	{ WM_QUERYNEWPALETTE, 0, 0, 0, AfxSig_bv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< bool (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnQueryNewPalette)) },
+		(static_cast< bool (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnQueryNewPalette)) },
 
 #define ON_WM_PALETTECHANGED() \
 	{ WM_PALETTECHANGED, 0, 0, 0, AfxSig_vW, \
@@ -1149,12 +1149,12 @@ namespace MFC {
 #define ON_WM_ENTERSIZEMOVE() \
 	{ WM_ENTERSIZEMOVE, 0, 0, 0, AfxSig_v_v_v, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnEnterSizeMove)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnEnterSizeMove)) },
 
 #define ON_WM_EXITSIZEMOVE() \
 	{ WM_EXITSIZEMOVE, 0, 0, 0, AfxSig_v_v_v, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnExitSizeMove)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnExitSizeMove)) },
 
 #define ON_WM_CAPTURECHANGED() \
 	{ WM_CAPTURECHANGED, 0, 0, 0, AfxSig_vW2, \
@@ -1174,7 +1174,7 @@ namespace MFC {
 #define ON_WM_USERCHANGED() \
 	{ WM_USERCHANGED, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnUserChanged)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnUserChanged)) },
 
 #define ON_WM_CHANGEUISTATE() \
 	{ WM_CHANGEUISTATE, 0, 0, 0, AfxSig_vww2, \
@@ -1189,17 +1189,17 @@ namespace MFC {
 #define ON_WM_QUERYUISTATE() \
 	{ WM_QUERYUISTATE, 0, 0, 0, AfxSig_wv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnQueryUIState)) },
+		(static_cast< unsigned int (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnQueryUIState)) },
 
 #define ON_WM_THEMECHANGED() \
 	{ WM_THEMECHANGED, 0, 0, 0, AfxSig_l, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< LRESULT (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnThemeChanged)) },
+		(static_cast< LRESULT (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnThemeChanged)) },
 
 #define ON_WM_DWMCOMPOSITIONCHANGED() \
 	{ WM_DWMCOMPOSITIONCHANGED, 0, 0, 0, AfxSig_vv, \
 		(AFX_PMSG)(AFX_PMSGW) \
-		(static_cast< void (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnCompositionChanged)) },
+		(static_cast< void (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnCompositionChanged)) },
 
 #define ON_WM_DWMNCRENDERINGCHANGED() \
 	{ WM_DWMNCRENDERINGCHANGED, 0, 0, 0, AfxSig_vb, \
@@ -1224,7 +1224,7 @@ namespace MFC {
 #define ON_WM_DWMSENDICONICLIVEPREVIEWBITMAP() \
 	{ WM_DWMSENDICONICLIVEPREVIEWBITMAP, 0, 0, 0, AfxSig_b_v_v, \
 		(AFX_PMSG) (AFX_PMSGW) \
-		(static_cast< bool (AFX_MSG_CALL CWnd::*)(void) > ( &ThisClass::OnSendIconicLivePreviewBitmap)) },
+		(static_cast< bool (AFX_MSG_CALL CWnd::*)() > ( &ThisClass::OnSendIconicLivePreviewBitmap)) },
 
 /////////////////////////////////////////////////////////////////////////////
 // Message map tables for Control Notification messages
diff --git a/engines/bagel/mfc/afxwin.h b/engines/bagel/mfc/afxwin.h
index bc8835ba555..c1e5508f6b8 100644
--- a/engines/bagel/mfc/afxwin.h
+++ b/engines/bagel/mfc/afxwin.h
@@ -203,7 +203,7 @@ enum AfxSig {
 	AfxSig_is = AfxSig_i_v_s,      // int (uint16 *)
 	AfxSig_lwl = AfxSig_l_w_l,     // LRESULT (WPARAM, LPARAM)
 	AfxSig_lwwM = AfxSig_l_uu_M,    // LRESULT (unsigned int, unsigned int, CMenu*)
-	AfxSig_vv = AfxSig_v_v_v,      // void (void)
+	AfxSig_vv = AfxSig_v_v_v,      // void ()
 
 	AfxSig_vw = AfxSig_v_u_v,      // void (unsigned int)
 	AfxSig_vww = AfxSig_v_u_u,     // void (unsigned int, unsigned int)
@@ -229,7 +229,7 @@ enum AfxSig {
 	AfxSig_vOWNER = AfxSig_OWNERDRAW,  // void (int, uint16 *), force return true
 	AfxSig_iis = AfxSig_i_i_s,     // int (int, uint16 *)
 	AfxSig_wp = AfxSig_u_v_p,      // unsigned int (CPoint)
-	AfxSig_wv = AfxSig_u_v_v,      // unsigned int (void)
+	AfxSig_wv = AfxSig_u_v_v,      // unsigned int ()
 	AfxSig_vPOS = AfxSig_v_v_WINDOWPOS,    // void (WINDOWPOS*)
 	AfxSig_vCALC = AfxSig_v_b_NCCALCSIZEPARAMS,   // void (bool, NCCALCSIZE_PARAMS*)
 	AfxSig_vNMHDRpl = AfxSigNotify_v,    // void (NMHDR*, LRESULT*)
@@ -252,8 +252,8 @@ enum AfxSig {
 	AfxSig_bh = AfxSig_b_h_v,      // bool (HANDLE)
 	AfxSig_iw = AfxSig_i_u_v,      // int (unsigned int)
 	AfxSig_ww = AfxSig_u_u_v,      // unsigned int (unsigned int)
-	AfxSig_bv = AfxSig_b_v_v,      // bool (void)
-	AfxSig_hv = AfxSig_C_v_v,      // HANDLE (void)
+	AfxSig_bv = AfxSig_b_v_v,      // bool ()
+	AfxSig_hv = AfxSig_C_v_v,      // HANDLE ()
 	AfxSig_vb = AfxSig_vw,      // void (bool)
 	AfxSig_vbh = AfxSig_v_b_h,    // void (bool, HANDLE)
 	AfxSig_vbw = AfxSig_vww,    // void (bool, unsigned int)
@@ -286,7 +286,7 @@ enum AfxSig {
 #define PM_NOYIELD          0x0002
 
 typedef void (CCmdTarget::*AFX_PMSG)();
-typedef void (CWnd::*AFX_PMSGW)(void);
+typedef void (CWnd::*AFX_PMSGW)();
 
 #pragma warning(disable: 4121)
 struct AFX_MSGMAP_ENTRY {
@@ -309,7 +309,7 @@ struct AFX_MSGMAP {
 #ifndef AFX_MSG_CALL
 	#define AFX_MSG_CALL
 #endif
-typedef void (AFX_MSG_CALL CCmdTarget:: *AFX_PMSG)(void);
+typedef void (AFX_MSG_CALL CCmdTarget:: *AFX_PMSG)();
 
 #define DECLARE_MESSAGE_MAP() \
 	protected: \
@@ -387,7 +387,7 @@ union MessageMapFunctions {
 	int (AFX_MSG_CALL CWnd:: *pfn_is)(uint16 *);
 	LRESULT(AFX_MSG_CALL CWnd:: *pfn_lwl)(WPARAM, LPARAM);
 	LRESULT(AFX_MSG_CALL CWnd:: *pfn_lwwM)(unsigned int, unsigned int, CMenu *);
-	void (AFX_MSG_CALL CWnd:: *pfn_vv)(void);
+	void (AFX_MSG_CALL CWnd:: *pfn_vv)();
 
 	void (AFX_MSG_CALL CWnd:: *pfn_vw)(unsigned int);
 	void (AFX_MSG_CALL CWnd:: *pfn_vww)(unsigned int, unsigned int);
@@ -412,7 +412,7 @@ union MessageMapFunctions {
 	void (AFX_MSG_CALL CWnd:: *pfn_vOWNER)(int, uint16 *);      // force return true
 	int (AFX_MSG_CALL CWnd:: *pfn_iis)(int, uint16 *);
 	unsigned int(AFX_MSG_CALL CWnd:: *pfn_wp)(CPoint);
-	unsigned int(AFX_MSG_CALL CWnd:: *pfn_wv)(void);
+	unsigned int(AFX_MSG_CALL CWnd:: *pfn_wv)();
 	void (AFX_MSG_CALL CWnd:: *pfn_vPOS)(WINDOWPOS *);
 	void (AFX_MSG_CALL CWnd:: *pfn_vCALC)(bool, NCCALCSIZE_PARAMS *);
 	void (AFX_MSG_CALL CWnd:: *pfn_vwp)(unsigned int, CPoint);
diff --git a/engines/bagel/spacebar/baglib/log_msg.cpp b/engines/bagel/spacebar/baglib/log_msg.cpp
index e951136e313..d4d5da3469e 100644
--- a/engines/bagel/spacebar/baglib/log_msg.cpp
+++ b/engines/bagel/spacebar/baglib/log_msg.cpp
@@ -840,7 +840,7 @@ ParseCodes CBagEnergyDetectorObject::setInfo(CBagIfstream &istr) {
 
 			if (!string1.find("TIME")) {
 				istr.eatWhite();
-				(void)istr.peek();
+				istr.peek();
 
 				getAlphaNumFromStream(istr, _energyTimeStr);
 				objectUpdatedFl = true;




More information about the Scummvm-git-logs mailing list