Replaced MKID by MID_BE in most places in the SCUMM engine

svn-id: r20862

21 files changed, 296 insertions, 296 deletions

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index ffddf7114e..289fa8356a 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1233,8 +1233,8 @@ void Actor::animateLimb(int limb, int f) {
 		byte *akos = _vm->getResourceAddress(rtCostume, _costume);
 		assert(akos);
 
-		aksq = _vm->findResourceData(MKID('AKSQ'), akos);
-		akfo = _vm->findResourceData(MKID('AKFO'), akos);
+		aksq = _vm->findResourceData(MKID_BE('AKSQ'), akos);
+		akfo = _vm->findResourceData(MKID_BE('AKFO'), akos);
 
 		size = _vm->getResourceDataSize(akfo) / 2;
 
@@ -1914,7 +1914,7 @@ void Actor::remapActorPaletteColor(int color, int new_color) {
 		return;
 	}
 
-	akpl = _vm->findResourceData(MKID('AKPL'), akos);
+	akpl = _vm->findResourceData(MKID_BE('AKPL'), akos);
 	if (!akpl) {
 		debug(0, "Can't remap actor %d, costume %d doesn't contain an AKPL block", _number, _costume);
 		return;
@@ -1952,7 +1952,7 @@ void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold)
 		return;
 	}
 
-	akpl = _vm->findResourceData(MKID('AKPL'), akos);
+	akpl = _vm->findResourceData(MKID_BE('AKPL'), akos);
 	if (!akpl) {
 		debug(0, "Can't remap actor %d, costume %d doesn't contain an AKPL block", _number, _costume);
 		return;
@@ -1961,7 +1961,7 @@ void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold)
 	// Get the number palette entries
 	akpl_size = _vm->getResourceDataSize(akpl);
 
-	rgbs = _vm->findResourceData(MKID('RGBS'), akos);
+	rgbs = _vm->findResourceData(MKID_BE('RGBS'), akos);
 
 	if (!rgbs) {
 		debugC(DEBUG_ACTORS, "Can't remap actor %d costume %d doesn't contain an RGB block", _number, _costume);
@@ -2065,19 +2065,19 @@ void ScummEngine_v71he::postProcessAuxQueue() {
 				int dy = a->_offsY + a->_pos.y - a->getElevation();
 				int dx = a->_offsX + a->_pos.x;
 
-				const uint8 *akax = findResource(MKID('AKAX'), cost);
+				const uint8 *akax = findResource(MKID_BE('AKAX'), cost);
 				assert(akax);
 				const uint8 *auxd = findPalInPals(akax, ae->subIndex) - _resourceHeaderSize;
 				assert(auxd);
-				const uint8 *frel = findResourceData(MKID('FREL'), auxd);
+				const uint8 *frel = findResourceData(MKID_BE('FREL'), auxd);
 				if (frel) {
 					error("unhandled FREL block");
 				}
-				const uint8 *disp = findResourceData(MKID('DISP'), auxd);
+				const uint8 *disp = findResourceData(MKID_BE('DISP'), auxd);
 				if (disp) {
 					error("unhandled DISP block");
 				}
-				const uint8 *axfd = findResourceData(MKID('AXFD'), auxd);
+				const uint8 *axfd = findResourceData(MKID_BE('AXFD'), auxd);
 				assert(axfd);
 
 				uint16 comp = READ_LE_UINT16(axfd);
@@ -2097,7 +2097,7 @@ void ScummEngine_v71he::postProcessAuxQueue() {
 						error("unimplemented compression type %d", comp);
 					}
 				}
-				const uint8 *axur = findResourceData(MKID('AXUR'), auxd);
+				const uint8 *axur = findResourceData(MKID_BE('AXUR'), auxd);
 				if (axur) {
 					uint16 n = READ_LE_UINT16(axur); axur += 2;
 					while (n--) {
@@ -2109,7 +2109,7 @@ void ScummEngine_v71he::postProcessAuxQueue() {
 						axur += 8;
 					}
 				}
-				const uint8 *axer = findResourceData(MKID('AXER'), auxd);
+				const uint8 *axer = findResourceData(MKID_BE('AXER'), auxd);
 				if (axer) {
 					a->_auxBlock.visible  = true;
 					a->_auxBlock.r.left   = (int16)READ_LE_UINT16(axer + 0) + dx;
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp
index 0870be7b44..a1113f7535 100644
--- a/engines/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
@@ -149,7 +149,7 @@ void AkosCostumeLoader::loadCostume(int id) {
 bool AkosCostumeLoader::hasManyDirections() {
 	const AkosHeader *akhd;
 
-	akhd = (const AkosHeader *)_vm->findResourceData(MKID('AKHD'), _akos);
+	akhd = (const AkosHeader *)_vm->findResourceData(MKID_BE('AKHD'), _akos);
 	return (akhd->flags & 2) != 0;
 }
 
@@ -173,12 +173,12 @@ void AkosCostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	else
 		anim = newDirToOldDir(a->getFacing()) + frame * 4;
 
-	akhd = (const AkosHeader *)_vm->findResourceData(MKID('AKHD'), _akos);
+	akhd = (const AkosHeader *)_vm->findResourceData(MKID_BE('AKHD'), _akos);
 
 	if (anim >= READ_LE_UINT16(&akhd->num_anims))
 		return;
 
-	r = _vm->findResourceData(MKID('AKCH'), _akos);
+	r = _vm->findResourceData(MKID_BE('AKCH'), _akos);
 	assert(r);
 
 	offs = READ_LE_UINT16(r + anim * sizeof(uint16));
@@ -186,8 +186,8 @@ void AkosCostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 		return;
 	r += offs;
 
-	const uint8 *akstPtr = _vm->findResourceData(MKID('AKST'), _akos);
-	const uint8 *aksfPtr = _vm->findResourceData(MKID('AKSF'), _akos);
+	const uint8 *akstPtr = _vm->findResourceData(MKID_BE('AKST'), _akos);
+	const uint8 *aksfPtr = _vm->findResourceData(MKID_BE('AKSF'), _akos);
 
 	i = 0;
 	mask = READ_LE_UINT16(r); r += 2;
@@ -330,20 +330,20 @@ void AkosRenderer::setCostume(int costume, int shadow) {
 	akos = _vm->getResourceAddress(rtCostume, costume);
 	assert(akos);
 
-	akhd = (const AkosHeader *) _vm->findResourceData(MKID('AKHD'), akos);
-	akof = (const AkosOffset *) _vm->findResourceData(MKID('AKOF'), akos);
-	akci = _vm->findResourceData(MKID('AKCI'), akos);
-	aksq = _vm->findResourceData(MKID('AKSQ'), akos);
-	akcd = _vm->findResourceData(MKID('AKCD'), akos);
-	akpl = _vm->findResourceData(MKID('AKPL'), akos);
+	akhd = (const AkosHeader *) _vm->findResourceData(MKID_BE('AKHD'), akos);
+	akof = (const AkosOffset *) _vm->findResourceData(MKID_BE('AKOF'), akos);
+	akci = _vm->findResourceData(MKID_BE('AKCI'), akos);
+	aksq = _vm->findResourceData(MKID_BE('AKSQ'), akos);
+	akcd = _vm->findResourceData(MKID_BE('AKCD'), akos);
+	akpl = _vm->findResourceData(MKID_BE('AKPL'), akos);
 	codec = READ_LE_UINT16(&akhd->codec);
-	akct = _vm->findResourceData(MKID('AKCT'), akos);
+	akct = _vm->findResourceData(MKID_BE('AKCT'), akos);
 
 	xmap = 0;
 	if (shadow) {
 		const uint8 *xmapPtr = _vm->getResourceAddress(rtImage, shadow);
 		assert(xmapPtr);
-		xmap = _vm->findResourceData(MKID('XMAP'), xmapPtr);
+		xmap = _vm->findResourceData(MKID_BE('XMAP'), xmapPtr);
 		assert(xmap);
 	}
 }
@@ -1343,8 +1343,8 @@ bool ScummEngine::akos_increaseAnims(const byte *akos, Actor *a) {
 	uint size;
 	bool result;
 
-	aksq = findResourceData(MKID('AKSQ'), akos);
-	akfo = findResourceData(MKID('AKFO'), akos);
+	aksq = findResourceData(MKID_BE('AKSQ'), akos);
+	akfo = findResourceData(MKID_BE('AKFO'), akos);
 
 	size = getResourceDataSize(akfo) / 2;
 
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index e6d3104de8..ccddd11803 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -228,7 +228,7 @@ void ScummEngine_v6::setCursorFromImg(uint img, uint room, uint imgindex) {
 		room = getObjectRoom(img);
 
 	findObjectInRoom(&foir, foCodeHeader | foImageHeader | foCheckAlreadyLoaded, img, room);
-	imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), foir.obim);
+	imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), foir.obim);
 
 	if (_game.version == 8) {
 		setCursorHotspot(READ_LE_UINT32(&imhd->v8.hotspot[0].x),
@@ -258,7 +258,7 @@ void ScummEngine_v6::setCursorFromImg(uint img, uint room, uint imgindex) {
 		if (size > sizeof(_grabbedCursor))
 			error("setCursorFromImg: Cursor image too large");
 
-		bomp = findResource(MKID('BOMP'), dataptr);
+		bomp = findResource(MKID_BE('BOMP'), dataptr);
 	}
 
 	if (bomp != NULL)
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 0a4772ad86..2811c2cbe9 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -703,7 +703,7 @@ void ScummEngine::initBGBuffers(int height) {
 		gdi._numZBuffer = 2;
 	} else if (_game.features & GF_SMALL_HEADER) {
 		int off;
-		ptr = findResourceData(MKID('SMAP'), room);
+		ptr = findResourceData(MKID_BE('SMAP'), room);
 		gdi._numZBuffer = 0;
 
 		if (_game.features & GF_16COLOR)
@@ -718,13 +718,13 @@ void ScummEngine::initBGBuffers(int height) {
 		}
 	} else if (_game.version == 8) {
 		// in V8 there is no RMIH and num z buffers is in RMHD
-		ptr = findResource(MKID('RMHD'), room);
+		ptr = findResource(MKID_BE('RMHD'), room);
 		gdi._numZBuffer = READ_LE_UINT32(ptr + 24) + 1;
 	} else if (_game.heversion >= 70) {
-		ptr = findResource(MKID('RMIH'), room);
+		ptr = findResource(MKID_BE('RMIH'), room);
 		gdi._numZBuffer = READ_LE_UINT16(ptr + 8) + 1;
 	} else {
-		ptr = findResource(MKID('RMIH'), findResource(MKID('RMIM'), room));
+		ptr = findResource(MKID_BE('RMIH'), findResource(MKID_BE('RMIM'), room));
 		gdi._numZBuffer = READ_LE_UINT16(ptr + 8) + 1;
 	}
 	assert(gdi._numZBuffer >= 1 && gdi._numZBuffer <= 8);
@@ -1306,9 +1306,9 @@ int Gdi::getZPlanes(const byte *ptr, const byte *zplane_list[9], bool bmapImage)
 	if ((_vm->_game.features & GF_SMALL_HEADER) || _vm->_game.version == 8)
 		zplane_list[0] = ptr;
 	else if (bmapImage)
-		zplane_list[0] = _vm->findResource(MKID('BMAP'), ptr);
+		zplane_list[0] = _vm->findResource(MKID_BE('BMAP'), ptr);
 	else
-		zplane_list[0] = _vm->findResource(MKID('SMAP'), ptr);
+		zplane_list[0] = _vm->findResource(MKID_BE('SMAP'), ptr);
 
 	if (_zbufferDisabled)
 		numzbuf = 0;
@@ -1349,11 +1349,11 @@ int Gdi::getZPlanes(const byte *ptr, const byte *zplane_list[9], bool bmapImage)
 			}
 		} else {
 			const uint32 zplane_tags[] = {
-				MKID('ZP00'),
-				MKID('ZP01'),
-				MKID('ZP02'),
-				MKID('ZP03'),
-				MKID('ZP04')
+				MKID_BE('ZP00'),
+				MKID_BE('ZP01'),
+				MKID_BE('ZP02'),
+				MKID_BE('ZP03'),
+				MKID_BE('ZP04')
 			};
 			
 			for (i = 1; i < numzbuf; i++) {
@@ -1406,7 +1406,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi
 		// Skip to the BSTR->WRAP->OFFS chunk
 		smap_ptr = ptr + 24;
 	} else
-		smap_ptr = _vm->findResource(MKID('SMAP'), ptr);
+		smap_ptr = _vm->findResource(MKID_BE('SMAP'), ptr);
 
 	assert(smap_ptr);
 
@@ -1414,7 +1414,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi
 	
 	const byte *tmsk_ptr = NULL;
 	if (_vm->_game.heversion >= 72) {
-		tmsk_ptr = _vm->findResource(MKID('TMSK'), ptr);
+		tmsk_ptr = _vm->findResource(MKID_BE('TMSK'), ptr);
 	}
 
 	bottom = y + height;
@@ -1614,7 +1614,7 @@ void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs) {
 	byte *mask_ptr;
 	const byte *zplane_list[9];
 
-	const byte *bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
+	const byte *bmap_ptr = _vm->findResourceData(MKID_BE('BMAP'), ptr);
 	assert(bmap_ptr);
 
 	byte code = *bmap_ptr++;
@@ -1674,7 +1674,7 @@ void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs) {
 
 void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y, int w, int h) {
 #ifndef DISABLE_HE
-	const byte *bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
+	const byte *bmap_ptr = _vm->findResourceData(MKID_BE('BMAP'), ptr);
 	assert(bmap_ptr);
 
 	byte code = *bmap_ptr++;
diff --git a/engines/scumm/he/floodfill_he.cpp b/engines/scumm/he/floodfill_he.cpp
index 3736cb4d36..5a1ede852a 100644
--- a/engines/scumm/he/floodfill_he.cpp
+++ b/engines/scumm/he/floodfill_he.cpp
@@ -238,7 +238,7 @@ void Wiz::fillWizFlood(const WizParameters *params) {
 			if (params->processFlags & kWPFNewState) {
 				state = params->img.state;
 			}
-			uint8 *wizh = _vm->findWrappedBlock(MKID('WIZH'), dataPtr, state, 0);
+			uint8 *wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), dataPtr, state, 0);
 			assert(wizh);
 			int c = READ_LE_UINT32(wizh + 0x0);
 			int w = READ_LE_UINT32(wizh + 0x4);
@@ -256,7 +256,7 @@ void Wiz::fillWizFlood(const WizParameters *params) {
 				color = params->fillColor;
 			}
 			if (imageRect.contains(px, py)) {
-				uint8 *wizd = _vm->findWrappedBlock(MKID('WIZD'), dataPtr, state, 0);
+				uint8 *wizd = _vm->findWrappedBlock(MKID_BE('WIZD'), dataPtr, state, 0);
 				assert(wizd);
 
 				FloodFillState *ffs = new FloodFillState;
diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp
index efe0f15017..c9217cae7b 100644
--- a/engines/scumm/he/palette_he.cpp
+++ b/engines/scumm/he/palette_he.cpp
@@ -144,7 +144,7 @@ void ScummEngine_v90he::setHEPaletteFromCostume(int palSlot, int resId) {
 	checkRange(_numPalettes, 1, palSlot, "Invalid palette %d");
 	const uint8 *data = getResourceAddress(rtCostume, resId);
 	assert(data);
-	const uint8 *rgbs = findResourceData(MKID('RGBS'), data);
+	const uint8 *rgbs = findResourceData(MKID_BE('RGBS'), data);
 	assert(rgbs);
 	setHEPaletteFromPtr(palSlot, rgbs);
 }
@@ -154,7 +154,7 @@ void ScummEngine_v90he::setHEPaletteFromImage(int palSlot, int resId, int state)
 	checkRange(_numPalettes, 1, palSlot, "Invalid palette %d");
 	uint8 *data = getResourceAddress(rtImage, resId);
 	assert(data);
-	const uint8 *rgbs = findWrappedBlock(MKID('RGBS'), data, state, 0);
+	const uint8 *rgbs = findWrappedBlock(MKID_BE('RGBS'), data, state, 0);
 	assert(rgbs);
 	setHEPaletteFromPtr(palSlot, rgbs);
 }
@@ -164,7 +164,7 @@ void ScummEngine_v90he::setHEPaletteFromRoom(int palSlot, int resId, int state)
 	checkRange(_numPalettes, 1, palSlot, "Invalid palette %d");
 	const uint8 *data = getResourceAddress(rtRoom, resId);
 	assert(data);
-	const uint8 *pals = findResourceData(MKID('PALS'), data);
+	const uint8 *pals = findResourceData(MKID_BE('PALS'), data);
 	assert(pals);
 	const uint8 *rgbs = findPalInPals(pals, state);
 	assert(rgbs);
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 8568449e6f..092309ae0e 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -1781,7 +1781,7 @@ int ScummEngine_v72he::getSoundResourceSize(int id) {
 		if (!ptr)
 			return 0;
 
-		if (READ_UINT32(ptr) == MKID('RIFF')) {
+		if (READ_BE_UINT32(ptr) == MKID_BE('RIFF')) {
 			byte flags;
 			int rate;
 
@@ -1793,11 +1793,11 @@ int ScummEngine_v72he::getSoundResourceSize(int id) {
 			}
 		} else {
 			ptr += 8 + READ_BE_UINT32(ptr + 12);
-			if (READ_UINT32(ptr) == MKID('SBNG')) {
+			if (READ_BE_UINT32(ptr) == MKID_BE('SBNG')) {
 				ptr += READ_BE_UINT32(ptr + 4);
 			}
 
-			assert(READ_UINT32(ptr) == MKID('SDAT'));
+			assert(READ_BE_UINT32(ptr) == MKID_BE('SDAT'));
 			size = READ_BE_UINT32(ptr + 4) - 8;
 		}
 	}
@@ -1837,8 +1837,8 @@ void ScummEngine_v80he::createSound(int snd1id, int snd2id) {
 			chan =  i;
 	}
 
-	sbng1Ptr = heFindResource(MKID('SBNG'), snd1Ptr);
-	sbng2Ptr = heFindResource(MKID('SBNG'), snd2Ptr);
+	sbng1Ptr = heFindResource(MKID_BE('SBNG'), snd1Ptr);
+	sbng2Ptr = heFindResource(MKID_BE('SBNG'), snd2Ptr);
 
 	if (sbng1Ptr != NULL && sbng2Ptr != NULL) {
 		if (chan != -1 && _sound->_heChannel[chan].codeOffs > 0) {
@@ -1881,9 +1881,9 @@ void ScummEngine_v80he::createSound(int snd1id, int snd2id) {
 		}
 	}
 
-	sdat1Ptr = heFindResource(MKID('SDAT'), snd1Ptr);
+	sdat1Ptr = heFindResource(MKID_BE('SDAT'), snd1Ptr);
 	assert(sdat1Ptr);
-	sdat2Ptr = heFindResource(MKID('SDAT'), snd2Ptr);
+	sdat2Ptr = heFindResource(MKID_BE('SDAT'), snd2Ptr);
 	assert(sdat2Ptr);
 
 	sdat1size = READ_BE_UINT32(sdat1Ptr + 4) - 8 - _sndPtrOffs;
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 28c7ecd77f..aaae0691f7 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -2959,7 +2959,7 @@ void ScummEngine_v100he::decodeParseString(int m, int n) {
 	case 78:
 		{
 		byte *dataPtr = getResourceAddress(rtTalkie, pop());
-		byte *text = findWrappedBlock(MKID('TEXT'), dataPtr, 0, 0);
+		byte *text = findWrappedBlock(MKID_BE('TEXT'), dataPtr, 0, 0);
 		size = getResourceDataSize(text);
 		memcpy(name, text, size);
 		printString(m, name);
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 4c56703fa1..1fc23dea9b 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -679,7 +679,7 @@ byte *ScummEngine_v70he::heFindResource(uint32 tag, byte *searchin) {
 	searchin += 4;
 
 	while (curpos < totalsize) {
-		if (READ_UINT32(searchin) == tag) {
+		if (READ_BE_UINT32(searchin) == tag) {
 			return searchin;
 		}
 
@@ -697,15 +697,15 @@ byte *ScummEngine_v70he::heFindResource(uint32 tag, byte *searchin) {
 }
 
 byte *ScummEngine_v70he::findWrappedBlock(uint32 tag, byte *ptr, int state, bool errorFlag) {
-	if (READ_UINT32(ptr) == MKID('MULT')) {
+	if (READ_BE_UINT32(ptr) == MKID_BE('MULT')) {
 		byte *offs, *wrap;
 		uint32 size;
 
-		wrap = heFindResource(MKID('WRAP'), ptr);
+		wrap = heFindResource(MKID_BE('WRAP'), ptr);
 		if (wrap == NULL)
 			return NULL;
 
-		offs = heFindResourceData(MKID('OFFS'), wrap);
+		offs = heFindResourceData(MKID_BE('OFFS'), wrap);
 		if (offs == NULL)
 			return NULL;
 
@@ -718,7 +718,7 @@ byte *ScummEngine_v70he::findWrappedBlock(uint32 tag, byte *ptr, int state, bool
 		if (offs)
 			return offs;
 
-		offs = heFindResourceData(MKID('DEFA'), ptr);
+		offs = heFindResourceData(MKID_BE('DEFA'), ptr);
 		if (offs == NULL)
 			return NULL;
 
@@ -2341,7 +2341,7 @@ void ScummEngine_v72he::decodeParseString(int m, int n) {
 	case 0xE1:
 		{
 		byte *dataPtr = getResourceAddress(rtTalkie, pop());
-		byte *text = findWrappedBlock(MKID('TEXT'), dataPtr, 0, 0);
+		byte *text = findWrappedBlock(MKID_BE('TEXT'), dataPtr, 0, 0);
 		size = getResourceDataSize(text);
 		memcpy(name, text, size);
 		printString(m, name);
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index b6f748dbba..374eafc0a2 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -395,12 +395,12 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
 	}
 
 	// Support for sound in later Backyard sports games
-	if (READ_UINT32(ptr) == MKID('RIFF') || READ_UINT32(ptr) == MKID('WSOU')) {
+	if (READ_BE_UINT32(ptr) == MKID_BE('RIFF') || READ_BE_UINT32(ptr) == MKID_BE('WSOU')) {
 		uint16 type;
 		int blockAlign;
 		char *sound;
 
-		if (READ_UINT32(ptr) == MKID('WSOU'))
+		if (READ_BE_UINT32(ptr) == MKID_BE('WSOU'))
 			ptr += 8;
 
 		size = READ_LE_UINT32(ptr + 4);
@@ -426,7 +426,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
 		_vm->_mixer->playRaw(&_heSoundChannels[heChannel], sound, size, rate, flags, soundID);
 	}
 	// Support for sound in Humongous Entertainment games
-	else if (READ_UINT32(ptr) == MKID('DIGI') || READ_UINT32(ptr) == MKID('TALK')) {
+	else if (READ_BE_UINT32(ptr) == MKID_BE('DIGI') || READ_BE_UINT32(ptr) == MKID_BE('TALK')) {
 		byte *sndPtr = ptr;
 
 		priority = (soundID > _vm->_numSounds) ? 255 : *(ptr + 18);
@@ -442,12 +442,12 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
 		}
 
 		int codeOffs = -1;
-		if (READ_UINT32(ptr) == MKID('SBNG')) {
+		if (READ_BE_UINT32(ptr) == MKID_BE('SBNG')) {
 			codeOffs = ptr - sndPtr + 8;
 			ptr += READ_BE_UINT32(ptr + 4);
 		}
 
-		assert(READ_UINT32(ptr) == MKID('SDAT'));
+		assert(READ_BE_UINT32(ptr) == MKID_BE('SDAT'));
 		size = READ_BE_UINT32(ptr+4) - 8;
 		if (heOffset < 0 || heOffset > size) {
 			// Occurs when making fireworks in puttmoon
@@ -473,12 +473,12 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
 		memset(_heChannel[heChannel].soundVars, 0, sizeof(_heChannel[heChannel].soundVars));
 	}
 	// Support for PCM music in 3DO versions of Humongous Entertainment games
-	else if (READ_UINT32(ptr) == MKID('MRAW')) {
+	else if (READ_BE_UINT32(ptr) == MKID_BE('MRAW')) {
 		priority = *(ptr + 18);
 		rate = READ_LE_UINT16(ptr + 22);
 		ptr += 8 + READ_BE_UINT32(ptr+12);
 
-		assert(READ_UINT32(ptr) == MKID('SDAT'));
+		assert(READ_BE_UINT32(ptr) == MKID_BE('SDAT'));
 		size = READ_BE_UINT32(ptr+4) - 8;
 
 		flags = Audio::Mixer::FLAG_AUTOFREE;
@@ -487,7 +487,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
 		_currentMusic = soundID;
 		_vm->_mixer->playRaw(NULL, ptr + 8, size, rate, flags, soundID);
 	}
-	else if (READ_UINT32(ptr) == MKID('MIDI')) {
+	else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) {
 		if (_vm->_imuse) {
 			_vm->_imuse->stopSound(_currentMusic);
 			_currentMusic = soundID;
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 2405bebe9f..7fc9f32913 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1112,35 +1112,35 @@ uint8 *Wiz::drawWizImage(int resNum, int state, int x1, int y1, int zorder, int
 	if (shadow) {
 		dataPtr = _vm->getResourceAddress(rtImage, shadow);
 		assert(dataPtr);
-		xmapPtr = _vm->findResourceData(MKID('XMAP'), dataPtr);
+		xmapPtr = _vm->findResourceData(MKID_BE('XMAP'), dataPtr);
 		assert(xmapPtr);
 	}
 
 	dataPtr = _vm->getResourceAddress(rtImage, resNum);
 	assert(dataPtr);
 	
-	uint8 *wizh = _vm->findWrappedBlock(MKID('WIZH'), dataPtr, state, 0);
+	uint8 *wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), dataPtr, state, 0);
 	assert(wizh);
 	uint32 comp   = READ_LE_UINT32(wizh + 0x0);
 	uint32 width  = READ_LE_UINT32(wizh + 0x4);
 	uint32 height = READ_LE_UINT32(wizh + 0x8);
 	debug(2, "wiz_header.comp = %d wiz_header.w = %d wiz_header.h = %d", comp, width, height);
 
-	uint8 *wizd = _vm->findWrappedBlock(MKID('WIZD'), dataPtr, state, 0);
+	uint8 *wizd = _vm->findWrappedBlock(MKID_BE('WIZD'), dataPtr, state, 0);
 	assert(wizd);
 
 	if (flags & kWIFHasPalette) {
-		uint8 *pal = _vm->findWrappedBlock(MKID('RGBS'), dataPtr, state, 0);
+		uint8 *pal = _vm->findWrappedBlock(MKID_BE('RGBS'), dataPtr, state, 0);
 		assert(pal);
 		_vm->setPaletteFromPtr(pal, 256);
 	}
 
 	uint8 *rmap = NULL;
 	if (flags & kWIFRemapPalette) {
-		rmap = _vm->findWrappedBlock(MKID('RMAP'), dataPtr, state, 0);
+		rmap = _vm->findWrappedBlock(MKID_BE('RMAP'), dataPtr, state, 0);
 		assert(rmap);
 		if (_vm->_game.heversion <= 80 || READ_BE_UINT32(rmap) != 0x01234567) {
-			uint8 *rgbs = _vm->findWrappedBlock(MKID('RGBS'), dataPtr, state, 0);
+			uint8 *rgbs = _vm->findWrappedBlock(MKID_BE('RGBS'), dataPtr, state, 0);
 			assert(rgbs);
 			_vm->remapHEPalette(rgbs, rmap + 4);
 		}
@@ -1161,7 +1161,7 @@ uint8 *Wiz::drawWizImage(int resNum, int state, int x1, int y1, int zorder, int
 		if (dstResNum) {
 			uint8 *dstPtr = _vm->getResourceAddress(rtImage, dstResNum);
 			assert(dstPtr);
-			dst = _vm->findWrappedBlock(MKID('WIZD'), dstPtr, 0, 0);
+			dst = _vm->findWrappedBlock(MKID_BE('WIZD'), dstPtr, 0, 0);
 			assert(dst);
 			getWizImageDim(dstResNum, 0, cw, ch);
 		} else {
@@ -1198,7 +1198,7 @@ uint8 *Wiz::drawWizImage(int resNum, int state, int x1, int y1, int zorder, int
 
 	int transColor = -1;
 	if (_vm->VAR_WIZ_TCOLOR != 0xFF) {
-		uint8 *trns = _vm->findWrappedBlock(MKID('TRNS'), dataPtr, state, 0);
+		uint8 *trns = _vm->findWrappedBlock(MKID_BE('TRNS'), dataPtr, state, 0);
 		transColor = (trns == NULL) ? _vm->VAR(_vm->VAR_WIZ_TCOLOR) : -1;
 	}
 
@@ -1366,7 +1366,7 @@ void Wiz::drawWizPolygonTransform(int resNum, int state, Common::Point *wp, int
 		if (dstResNum) {
 			uint8 *dstPtr = _vm->getResourceAddress(rtImage, dstResNum);
 			assert(dstPtr);
-			dst = _vm->findWrappedBlock(MKID('WIZD'), dstPtr, 0, 0);
+			dst = _vm->findWrappedBlock(MKID_BE('WIZD'), dstPtr, 0, 0);
 			assert(dst);
 			getWizImageDim(dstResNum, 0, dstw, dsth);
 			dstpitch = dstw;
@@ -1697,7 +1697,7 @@ void Wiz::fillWizRect(const WizParameters *params) {
 	}
 	uint8 *dataPtr = _vm->getResourceAddress(rtImage, params->img.resNum);
 	if (dataPtr) {
-		uint8 *wizh = _vm->findWrappedBlock(MKID('WIZH'), dataPtr, state, 0);
+		uint8 *wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), dataPtr, state, 0);
 		assert(wizh);
 		int c = READ_LE_UINT32(wizh + 0x0);
 		int w = READ_LE_UINT32(wizh + 0x4);
@@ -1721,7 +1721,7 @@ void Wiz::fillWizRect(const WizParameters *params) {
 		}
 		if (areaRect.intersects(imageRect)) {
 			areaRect.clip(imageRect);
-			uint8 *wizd = _vm->findWrappedBlock(MKID('WIZD'), dataPtr, state, 0);
+			uint8 *wizd = _vm->findWrappedBlock(MKID_BE('WIZD'), dataPtr, state, 0);
 			assert(wizd);
 			int dx = areaRect.width();
 			int dy = areaRect.height();
@@ -1743,7 +1743,7 @@ void Wiz::fillWizLine(const WizParameters *params) {
 		}
 		uint8 *dataPtr = _vm->getResourceAddress(rtImage, params->img.resNum);
 		if (dataPtr) {
-			uint8 *wizh = _vm->findWrappedBlock(MKID('WIZH'), dataPtr, state, 0);
+			uint8 *wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), dataPtr, state, 0);
 			assert(wizh);
 			int c = READ_LE_UINT32(wizh + 0x0);
 			int w = READ_LE_UINT32(wizh + 0x4);
@@ -1760,7 +1760,7 @@ void Wiz::fillWizLine(const WizParameters *params) {
 			if (params->processFlags & kWPFFillColor) {
 				color = params->fillColor;
 			}
-			uint8 *wizd = _vm->findWrappedBlock(MKID('WIZD'), dataPtr, state, 0);
+			uint8 *wizd = _vm->findWrappedBlock(MKID_BE('WIZD'), dataPtr, state, 0);
 			assert(wizd);
 			int x1 = params->box2.left;
 			int y1 = params->box2.top;
@@ -1837,7 +1837,7 @@ void Wiz::fillWizPixel(const WizParameters *params) {
 			if (params->processFlags & kWPFNewState) {
 				state = params->img.state;
 			}
-			uint8 *wizh = _vm->findWrappedBlock(MKID('WIZH'), dataPtr, state, 0);
+			uint8 *wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), dataPtr, state, 0);
 			assert(wizh);
 			int c = READ_LE_UINT32(wizh + 0x0);
 			int w = READ_LE_UINT32(wizh + 0x4);
@@ -1855,7 +1855,7 @@ void Wiz::fillWizPixel(const WizParameters *params) {
 				color = params->fillColor;
 			}
 			if (imageRect.contains(px, py)) {
-				uint8 *wizd = _vm->findWrappedBlock(MKID('WIZD'), dataPtr, state, 0);
+				uint8 *wizd = _vm->findWrappedBlock(MKID_BE('WIZD'), dataPtr, state, 0);
 				assert(wizd);
 				*(wizd + py * w + px) = color;
 			}
@@ -1870,7 +1870,7 @@ void Wiz::remapWizImagePal(const WizParameters *params) {
 	const uint8 *index = params->remapIndex;
 	uint8 *iwiz = _vm->getResourceAddress(rtImage, params->img.resNum);
 	assert(iwiz);
-	uint8 *rmap = _vm->findWrappedBlock(MKID('RMAP'), iwiz, st, 0) ;
+	uint8 *rmap = _vm->findWrappedBlock(MKID_BE('RMAP'), iwiz, st, 0) ;
 	assert(rmap);
 	WRITE_BE_UINT32(rmap, 0x01234567);
 	while (num--) {
@@ -1907,8 +1907,8 @@ void Wiz::processWizImage(const WizParameters *params) {
 			}
 
 			if (f.open((const char *)buf, Common::File::kFileReadMode)) {
-				uint32 id = f.readUint32LE();
-				if (id == TO_LE_32(MKID('AWIZ')) || id == TO_LE_32(MKID('MULT'))) {
+				uint32 id = f.readUint32BE();
+				if (id == MKID_BE('AWIZ') || id == MKID_BE('MULT')) {
 					uint32 size = f.readUint32BE();
 					f.seek(0, SEEK_SET);
 					byte *p = _vm->res.createResource(rtImage, params->img.resNum, size);
@@ -2028,7 +2028,7 @@ void Wiz::processWizImage(const WizParameters *params) {
 void Wiz::getWizImageDim(int resNum, int state, int32 &w, int32 &h) {
 	uint8 *dataPtr = _vm->getResourceAddress(rtImage, resNum);
 	assert(dataPtr);
-	uint8 *wizh = _vm->findWrappedBlock(MKID('WIZH'), dataPtr, state, 0);
+	uint8 *wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), dataPtr, state, 0);
 	assert(wizh);
 	w = READ_LE_UINT32(wizh + 0x4);
 	h = READ_LE_UINT32(wizh + 0x8);
@@ -2037,7 +2037,7 @@ void Wiz::getWizImageDim(int resNum, int state, int32 &w, int32 &h) {
 void Wiz::getWizImageSpot(int resId, int state, int32 &x, int32 &y) {
 	uint8 *dataPtr = _vm->getResourceAddress(rtImage, resId);
 	assert(dataPtr);
-	uint8 *spotPtr = _vm->findWrappedBlock(MKID('SPOT'), dataPtr, state, 0);
+	uint8 *spotPtr = _vm->findWrappedBlock(MKID_BE('SPOT'), dataPtr, state, 0);
 	if (spotPtr) {
 		x = READ_LE_UINT32(spotPtr + 0);
 		y = READ_LE_UINT32(spotPtr + 4);
@@ -2055,17 +2055,17 @@ int Wiz::getWizImageData(int resNum, int state, int type) {
 
 	switch (type) {
 	case 0:
-		wizh = _vm->findWrappedBlock(MKID('WIZH'), dataPtr, state, 0);
+		wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), dataPtr, state, 0);
 		assert(wizh);
 		return READ_LE_UINT32(wizh + 0x0);
 	case 1:
-		return (_vm->findWrappedBlock(MKID('RGBS'), dataPtr, state, 0) != NULL) ? 1 : 0;
+		return (_vm->findWrappedBlock(MKID_BE('RGBS'), dataPtr, state, 0) != NULL) ? 1 : 0;
 	case 2:
-		return (_vm->findWrappedBlock(MKID('RMAP'), dataPtr, state, 0) != NULL) ? 1 : 0;
+		return (_vm->findWrappedBlock(MKID_BE('RMAP'), dataPtr, state, 0) != NULL) ? 1 : 0;
 	case 3:
-		return (_vm->findWrappedBlock(MKID('TRNS'), dataPtr, state, 0) != NULL) ? 1 : 0;
+		return (_vm->findWrappedBlock(MKID_BE('TRNS'), dataPtr, state, 0) != NULL) ? 1 : 0;
 	case 4:
-		return (_vm->findWrappedBlock(MKID('XMAP'), dataPtr, state, 0) != NULL) ? 1 : 0;
+		return (_vm->findWrappedBlock(MKID_BE('XMAP'), dataPtr, state, 0) != NULL) ? 1 : 0;
 	default:
 		error("getWizImageData: Unknown type %d", type);
 	}
@@ -2074,14 +2074,14 @@ int Wiz::getWizImageData(int resNum, int state, int type) {
 int Wiz::getWizImageStates(int resNum) {
 	const uint8 *dataPtr = _vm->getResourceAddress(rtImage, resNum);
 	assert(dataPtr);
-	if (READ_UINT32(dataPtr) == MKID('MULT')) {
+	if (READ_BE_UINT32(dataPtr) == MKID_BE('MULT')) {
 		const byte *offs, *wrap;
 
-		wrap = _vm->findResource(MKID('WRAP'), dataPtr);
+		wrap = _vm->findResource(MKID_BE('WRAP'), dataPtr);
 		if (wrap == NULL)
 			return 1;
 
-		offs = _vm->findResourceData(MKID('OFFS'), wrap);
+		offs = _vm->findResourceData(MKID_BE('OFFS'), wrap);
 		if (offs == NULL)
 			return 1;
 
@@ -2095,12 +2095,12 @@ int Wiz::isWizPixelNonTransparent(int resNum, int state, int x, int y, int flags
 	int ret = 0;
 	uint8 *data = _vm->getResourceAddress(rtImage, resNum);
 	assert(data);
-	uint8 *wizh = _vm->findWrappedBlock(MKID('WIZH'), data, state, 0);
+	uint8 *wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), data, state, 0);
 	assert(wizh);
 	int c = READ_LE_UINT32(wizh + 0x0);
 	int w = READ_LE_UINT32(wizh + 0x4);
 	int h = READ_LE_UINT32(wizh + 0x8);
-	uint8 *wizd = _vm->findWrappedBlock(MKID('WIZD'), data, state, 0);
+	uint8 *wizd = _vm->findWrappedBlock(MKID_BE('WIZD'), data, state, 0);
 	assert(wizd);
 	if (x >= 0 && x < w && y >= 0 && y < h) {
 		if (flags & kWIFFlipX) {
@@ -2136,12 +2136,12 @@ uint8 Wiz::getWizPixelColor(int resNum, int state, int x, int y, int flags) {
 	uint8 color;
 	uint8 *data = _vm->getResourceAddress(rtImage, resNum);
 	assert(data);
-	uint8 *wizh = _vm->findWrappedBlock(MKID('WIZH'), data, state, 0);
+	uint8 *wizh = _vm->findWrappedBlock(MKID_BE('WIZH'), data, state, 0);
 	assert(wizh);
 	int c = READ_LE_UINT32(wizh + 0x0);
 	int w = READ_LE_UINT32(wizh + 0x4);
 	int h = READ_LE_UINT32(wizh + 0x8);
-	uint8 *wizd = _vm->findWrappedBlock(MKID('WIZD'), data, state, 0);
+	uint8 *wizd = _vm->findWrappedBlock(MKID_BE('WIZD'), data, state, 0);
 	assert(wizd);
 	switch (c) {
 	case 0:
@@ -2168,13 +2168,13 @@ int ScummEngine_v90he::computeWizHistogram(int resNum, int state, int x, int y,
 		Common::Rect rCapt(x, y, w + 1, h + 1);
 		uint8 *data = getResourceAddress(rtImage, resNum);
 		assert(data);
-		uint8 *wizh = findWrappedBlock(MKID('WIZH'), data, state, 0);
+		uint8 *wizh = findWrappedBlock(MKID_BE('WIZH'), data, state, 0);
 		assert(wizh);
 		int c = READ_LE_UINT32(wizh + 0x0);
 		w = READ_LE_UINT32(wizh + 0x4);
 		h = READ_LE_UINT32(wizh + 0x8);
 		Common::Rect rWiz(w, h);
-		uint8 *wizd = findWrappedBlock(MKID('WIZD'), data, state, 0);
+		uint8 *wizd = findWrappedBlock(MKID_BE('WIZD'), data, state, 0);
 		assert(wizd);
 		if (rCapt.intersects(rWiz)) {
 			rCapt.clip(rWiz);
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 41e4a1aa96..ba17867905 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -120,22 +120,22 @@ bool IMuseInternal::isMT32(int sound) {
 	if (ptr == NULL)
 		return false;
 
-	tag = *(((uint32 *)ptr) + 1);
+	tag = READ_BE_UINT32(ptr + 4);
 	switch (tag) {
-	case MKID('ADL '):
-	case MKID('ASFX'): // Special AD class for old Adlib sound effects
-	case MKID('SPK '):
+	case MKID_BE('ADL '):
+	case MKID_BE('ASFX'): // Special AD class for old Adlib sound effects
+	case MKID_BE('SPK '):
 		return false;
 
-	case MKID('AMI '):
-	case MKID('ROL '):
+	case MKID_BE('AMI '):
+	case MKID_BE('ROL '):
 		return true;
 
-	case MKID('MAC '):	// Occurs in the Mac version of FOA and MI2
+	case MKID_BE('MAC '):	// Occurs in the Mac version of FOA and MI2
 		return true;
 
-	case MKID('GMD '):
-	case MKID('MIDI'):	// Occurs in Sam & Max
+	case MKID_BE('GMD '):
+	case MKID_BE('MIDI'):	// Occurs in Sam & Max
 		return false;
 	}
 
@@ -161,22 +161,22 @@ bool IMuseInternal::isMIDI(int sound) {
 	if (ptr == NULL)
 		return false;
 
-	tag = *(((uint32 *)ptr) + 1);
+	tag = READ_BE_UINT32(ptr + 4);
 	switch (tag) {
-	case MKID('ADL '):
-	case MKID('ASFX'): // Special AD class for old Adlib sound effects
-	case MKID('SPK '):
+	case MKID_BE('ADL '):
+	case MKID_BE('ASFX'): // Special AD class for old Adlib sound effects
+	case MKID_BE('SPK '):
 		return false;
 
-	case MKID('AMI '):
-	case MKID('ROL '):
+	case MKID_BE('AMI '):
+	case MKID_BE('ROL '):
 		return true;
 
-	case MKID('MAC '):	// Occurs in the Mac version of FOA and MI2
+	case MKID_BE('MAC '):	// Occurs in the Mac version of FOA and MI2
 		return true;
 
-	case MKID('GMD '):
-	case MKID('MIDI'):	// Occurs in Sam & Max
+	case MKID_BE('GMD '):
+	case MKID_BE('MIDI'):	// Occurs in Sam & Max
 		return true;
 	}
 
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 61d625ec0a..29b70a4763 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -125,7 +125,7 @@ void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::File *file, soundStruct *soun
 }
 
 void ImuseDigiSndMgr::prepareSound(byte *ptr, soundStruct *sound) {
-	if (READ_UINT32(ptr) == MKID('Crea')) {
+	if (READ_BE_UINT32(ptr) == MKID_BE('Crea')) {
 		bool quit = false;
 		int len;
 
@@ -188,7 +188,7 @@ void ImuseDigiSndMgr::prepareSound(byte *ptr, soundStruct *sound) {
 			}
 			offset += len;
 		}
-	} else if (READ_UINT32(ptr) == MKID('iMUS')) {
+	} else if (READ_BE_UINT32(ptr) == MKID_BE('iMUS')) {
 		uint32 tag;
 		int32 size = 0;
 		byte *s_ptr = ptr;
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index f838d6732c..478bbbc2af 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -247,7 +247,7 @@ void ScummEngine::getObjectXYPos(int object, int &x, int &y, int &dir) {
 			debug(0, "getObjectXYPos: Can't find object %d", object);
 			return;
 		}
-		imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
+		imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), ptr);
 		assert(imhd);
 		if (_game.version == 8) {
 			switch (FROM_LE_32(imhd->v8.version)) {
@@ -415,26 +415,6 @@ void ScummEngine::drawRoomObjects(int arg) {
 	}
 }
 
-static const uint32 IMxx_tags[] = {
-	MKID('IM00'),
-	MKID('IM01'),
-	MKID('IM02'),
-	MKID('IM03'),
-	MKID('IM04'),
-	MKID('IM05'),
-	MKID('IM06'),
-	MKID('IM07'),
-	MKID('IM08'),
-	MKID('IM09'),
-	MKID('IM0A'),
-	MKID('IM0B'),
-	MKID('IM0C'),
-	MKID('IM0D'),
-	MKID('IM0E'),
-	MKID('IM0F'),
-	MKID('IM10')
-};
-
 void ScummEngine::drawObject(int obj, int arg) {
 	if (_skipDrawObject)
 		return;
@@ -498,7 +478,7 @@ void ScummEngine::drawObject(int obj, int arg) {
 		    (_game.id == GID_FT && getClass(od.obj_nr, kObjectClassPlayer)))
 			flags |= Gdi::dbDrawMaskOnAll;
 
-		if (_game.heversion >= 70 && findResource(MKID('SMAP'), ptr) == NULL)
+		if (_game.heversion >= 70 && findResource(MKID_BE('SMAP'), ptr) == NULL)
 			gdi.drawBMAPObject(ptr, &virtscr[0], obj, od.x_pos, od.y_pos, od.width, od.height);
 		else
 			gdi.drawBitmap(ptr, &virtscr[0], x, ypos, width * 8, height, x - xpos, numstrip, flags);
@@ -591,12 +571,12 @@ void ScummEngine::loadRoomObjects() {
 	for (i = 0; i < _numObjectsInRoom; i++) {
 		od = &_objs[findLocalObjectSlot()];
 
-		ptr = obcds.findNext(MKID('OBCD'));
+		ptr = obcds.findNext(MKID_BE('OBCD'));
 		if (ptr == NULL)
 			error("Room %d missing object code block(s)", _roomResource);
 
 		od->OBCDoffset = ptr - rootptr;
-		cdhd = (const CodeHeader *)findResourceData(MKID('CDHD'), ptr);
+		cdhd = (const CodeHeader *)findResourceData(MKID_BE('CDHD'), ptr);
 
 		if (_game.version >= 7)
 			od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id));
@@ -608,7 +588,7 @@ void ScummEngine::loadRoomObjects() {
 		if (_dumpScripts) {
 			char buf[32];
 			sprintf(buf, "roomobj-%d-", _roomResource);
-			ptr = findResource(MKID('VERB'), ptr);
+			ptr = findResource(MKID_BE('VERB'), ptr);
 			dumpResource(buf, od->obj_nr, ptr);
 		}
 
@@ -617,7 +597,7 @@ void ScummEngine::loadRoomObjects() {
 	searchptr = room;
 	ResourceIterator	obims(room, false);
 	for (i = 0; i < _numObjectsInRoom; i++) {
-		ptr = obims.findNext(MKID('OBIM'));
+		ptr = obims.findNext(MKID_BE('OBIM'));
 		if (ptr == NULL)
 			error("Room %d missing image blocks(s)", _roomResource);
 
@@ -695,7 +675,7 @@ void ScummEngine_v4::loadRoomObjects() {
 	for (i = 0; i < _numObjectsInRoom; i++) {
 		od = &_objs[findLocalObjectSlot()];
 
-		ptr = obcds.findNext(MKID('OBCD'));
+		ptr = obcds.findNext(MKID_BE('OBCD'));
 		if (ptr == NULL)
 			error("Room %d missing object code block(s)", _roomResource);
 
@@ -710,7 +690,7 @@ void ScummEngine_v4::loadRoomObjects() {
 
 	ResourceIterator	obims(room, true);
 	for (i = 0; i < _numObjectsInRoom; i++) {
-		ptr = obims.findNext(MKID('OBIM'));
+		ptr = obims.findNext(MKID_BE('OBIM'));
 		if (ptr == NULL)
 			error("Room %d missing image blocks(s)", _roomResource);
 
@@ -801,11 +781,11 @@ void ScummEngine::setupRoomObject(ObjectData *od, const byte *room, const byte *
 			searchptr = room;
 	}
 
-	cdhd = (const CodeHeader *)findResourceData(MKID('CDHD'), searchptr + od->OBCDoffset);
+	cdhd = (const CodeHeader *)findResourceData(MKID_BE('CDHD'), searchptr + od->OBCDoffset);
 	if (cdhd == NULL)
 		error("Room %d missing CDHD blocks(s)", _roomResource);
 	if (od->OBIMoffset)
-		imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), room + od->OBIMoffset);
+		imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), room + od->OBIMoffset);
 
 	od->flags = Gdi::dbAllowMaskOr;
 
@@ -1034,7 +1014,7 @@ const byte *ScummEngine::getObjOrActorName(int obj) {
 		return (objptr + offset);
 	}
 
-	return findResourceData(MKID('OBNA'), objptr);
+	return findResourceData(MKID_BE('OBNA'), objptr);
 }
 
 void ScummEngine::setObjectName(int obj) {
@@ -1110,7 +1090,7 @@ const byte *ScummEngine::getOBIMFromObjectData(const ObjectData &od) {
 
 	if (od.fl_object_index) {
 		ptr = getResourceAddress(rtFlObject, od.fl_object_index);
-		ptr = findResource(MKID('OBIM'), ptr);
+		ptr = findResource(MKID_BE('OBIM'), ptr);
 	} else {
 		ptr = getResourceAddress(rtRoom, _roomResource);
 		if (ptr)
@@ -1119,6 +1099,26 @@ const byte *ScummEngine::getOBIMFromObjectData(const ObjectData &od) {
 	return ptr;
 }
 
+static const uint32 IMxx_tags[] = {
+	MKID_BE('IM00'),
+	MKID_BE('IM01'),
+	MKID_BE('IM02'),
+	MKID_BE('IM03'),
+	MKID_BE('IM04'),
+	MKID_BE('IM05'),
+	MKID_BE('IM06'),
+	MKID_BE('IM07'),
+	MKID_BE('IM08'),
+	MKID_BE('IM09'),
+	MKID_BE('IM0A'),
+	MKID_BE('IM0B'),
+	MKID_BE('IM0C'),
+	MKID_BE('IM0D'),
+	MKID_BE('IM0E'),
+	MKID_BE('IM0F'),
+	MKID_BE('IM10')
+};
+
 const byte *ScummEngine::getObjectImage(const byte *ptr, int state) {
 	assert(ptr);
 	if (_game.features & GF_OLD_BUNDLE)
@@ -1129,15 +1129,15 @@ const byte *ScummEngine::getObjectImage(const byte *ptr, int state) {
 		// The OBIM contains an IMAG, which in turn contains a WRAP, which contains
 		// an OFFS chunk and multiple BOMP/SMAP chunks. To find the right BOMP/SMAP,
 		// we use the offsets in the OFFS chunk,
-		ptr = findResource(MKID('IMAG'), ptr);
+		ptr = findResource(MKID_BE('IMAG'), ptr);
 		if (!ptr)
 			return 0;
 
-		ptr = findResource(MKID('WRAP'), ptr);
+		ptr = findResource(MKID_BE('WRAP'), ptr);
 		if (!ptr)
 			return 0;
 
-		ptr = findResource(MKID('OFFS'), ptr);
+		ptr = findResource(MKID_BE('OFFS'), ptr);
 		if (!ptr)
 			return 0;
 
@@ -1160,7 +1160,7 @@ int ScummEngine::getObjectImageCount(int object) {
 		return 0;
 
 	ptr = getOBIMFromObjectData(_objs[objnum]);
-	imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), ptr);
+	imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), ptr);
 	if (!imhd)
 		return 0;
 
@@ -1177,7 +1177,7 @@ int ScummEngine::getObjectImageCount(int object) {
 int ScummEngine_v8::getObjectIdFromOBIM(const byte *obim) {
 	// In V8, IMHD has no obj_id, but rather a name string. We map the name
 	// back to an object id using a table derived from the DOBJ resource.
-	const ImageHeader *imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), obim);
+	const ImageHeader *imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), obim);
 	ObjectNameId *found = (ObjectNameId *)bsearch(imhd->v8.name, _objectIDMap, _objectIDMapSize,
 					sizeof(ObjectNameId), (int (*)(const void*, const void*))strcmp);
 	assert(found);
@@ -1185,7 +1185,7 @@ int ScummEngine_v8::getObjectIdFromOBIM(const byte *obim) {
 }
 
 int ScummEngine_v7::getObjectIdFromOBIM(const byte *obim) {
-	const ImageHeader *imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), obim);
+	const ImageHeader *imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), obim);
 	return READ_LE_UINT16(&imhd->v7.obj_id);
 }
 #endif
@@ -1194,7 +1194,7 @@ int ScummEngine::getObjectIdFromOBIM(const byte *obim) {
 	if (_game.features & GF_SMALL_HEADER)
 		return READ_LE_UINT16(obim + 6);
 
-	const ImageHeader *imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), obim);
+	const ImageHeader *imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), obim);
 	return READ_LE_UINT16(&imhd->old.obj_id);
 }
 
@@ -1247,7 +1247,7 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
 		if (findWhat & foCodeHeader) {
 			fo->obcd = obcdptr = getOBCDFromObject(id);
 			assert(obcdptr);
-			fo->cdhd = (const CodeHeader *)findResourceData(MKID('CDHD'), obcdptr);
+			fo->cdhd = (const CodeHeader *)findResourceData(MKID_BE('CDHD'), obcdptr);
 		}
 		if (findWhat & foImageHeader) {
 			fo->obim = obimptr = getOBIMFromObjectData(_objs[id2]);
@@ -1263,7 +1263,7 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
 	if (_game.features & GF_OLD_BUNDLE) {
 		numobj = roomptr[20];
 	} else {
-		const RoomHeader *roomhdr = (const RoomHeader *)findResourceData(MKID('RMHD'), roomptr);
+		const RoomHeader *roomhdr = (const RoomHeader *)findResourceData(MKID_BE('RMHD'), roomptr);
 
 		if (_game.version == 8)
 			numobj = READ_LE_UINT32(&(roomhdr->v8.numObjects));
@@ -1312,10 +1312,10 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
 		assert(searchptr);
 		ResourceIterator	obcds(searchptr, (_game.features & GF_SMALL_HEADER) != 0);
 		for (i = 0; i < numobj; i++) {
-			obcdptr = obcds.findNext(MKID('OBCD'));
+			obcdptr = obcds.findNext(MKID_BE('OBCD'));
 			if (obcdptr == NULL)
 				error("findObjectInRoom: Not enough code blocks in room %d", room);
-			cdhd = (const CodeHeader *)findResourceData(MKID('CDHD'), obcdptr);
+			cdhd = (const CodeHeader *)findResourceData(MKID_BE('CDHD'), obcdptr);
 
 			if (_game.features & GF_SMALL_HEADER)
 				id2 = READ_LE_UINT16(obcdptr + 6);
@@ -1340,7 +1340,7 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
 	if (findWhat & foImageHeader) {
 		ResourceIterator	obims(roomptr, (_game.features & GF_SMALL_HEADER) != 0);
 		for (i = 0; i < numobj; i++) {
-			obimptr = obims.findNext(MKID('OBIM'));
+			obimptr = obims.findNext(MKID_BE('OBIM'));
 			if (obimptr == NULL)
 				error("findObjectInRoom: Not enough image blocks in room %d", room);
 			obim_id = getObjectIdFromOBIM(obimptr);
@@ -1600,7 +1600,7 @@ void ScummEngine_v6::drawBlastObject(BlastObject *eo) {
 		if (!img)
 			img = getObjectImage(ptr, 1);	// Backward compatibility with samnmax blast objects
 		assert(img);
-		bomp = findResourceData(MKID('BOMP'), img);
+		bomp = findResourceData(MKID_BE('BOMP'), img);
 	}
 
 	if (!bomp)
@@ -1732,7 +1732,7 @@ void ScummEngine::loadFlObject(uint object, uint room) {
 		char buf[32];
 		const byte *ptr = foir.obcd;
 		sprintf(buf, "roomobj-%d-", room);
-		ptr = findResource(MKID('VERB'), ptr);
+		ptr = findResource(MKID_BE('VERB'), ptr);
 		dumpResource(buf, object, ptr);
 	}
 
@@ -1758,7 +1758,7 @@ void ScummEngine::loadFlObject(uint object, uint room) {
 	assert(flob);
 
 	// Copy object code + object image to floating object
-	((uint32 *)flob)[0] = MKID('FLOB');
+	((uint32 *)flob)[0] = MKID_BE('FLOB');
 	((uint32 *)flob)[1] = TO_BE_32(flob_size);
 
 	memcpy(flob + 8, foir.obcd, obcd_size);
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index c4d23dcd5d..bb53e788c7 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -875,7 +875,7 @@ void ScummEngine::setPalette(int palindex) {
 void ScummEngine::setRoomPalette(int palindex, int room) {
 	const byte *roomptr = getResourceAddress(rtRoom, room);
 	assert(roomptr);
-	const byte *pals = findResource(MKID('PALS'), roomptr);
+	const byte *pals = findResource(MKID_BE('PALS'), roomptr);
 	assert(pals);
 	const byte *rgbs = findPalInPals(pals, palindex);
 	assert(rgbs);
@@ -886,11 +886,11 @@ const byte *ScummEngine::findPalInPals(const byte *pal, int idx) {
 	const byte *offs;
 	uint32 size;
 
-	pal = findResource(MKID('WRAP'), pal);
+	pal = findResource(MKID_BE('WRAP'), pal);
 	if (pal == NULL)
 		return NULL;
 
-	offs = findResourceData(MKID('OFFS'), pal);
+	offs = findResourceData(MKID_BE('OFFS'), pal);
 	if (offs == NULL)
 		return NULL;
 
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index c4e606a9c4..2d088f5abd 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -339,31 +339,31 @@ void ScummEngine::readIndexFile() {
 	if (_game.version <= 5) {
 		// Figure out the sizes of various resources
 		while (!_fileHandle->eof()) {
-			blocktype = fileReadDword();
+			blocktype = _fileHandle->readUint32BE();
 			itemsize = _fileHandle->readUint32BE();
 			if (_fileHandle->ioFailed())
 				break;
 			switch (blocktype) {
-			case MKID('DOBJ'):
+			case MKID_BE('DOBJ'):
 				_numGlobalObjects = _fileHandle->readUint16LE();
 				itemsize -= 2;
 				break;
-			case MKID('DROO'):
+			case MKID_BE('DROO'):
 				_numRooms = _fileHandle->readUint16LE();
 				itemsize -= 2;
 				break;
 
-			case MKID('DSCR'):
+			case MKID_BE('DSCR'):
 				_numScripts = _fileHandle->readUint16LE();
 				itemsize -= 2;
 				break;
 
-			case MKID('DCOS'):
+			case MKID_BE('DCOS'):
 				_numCostumes = _fileHandle->readUint16LE();
 				itemsize -= 2;
 				break;
 
-			case MKID('DSOU'):
+			case MKID_BE('DSOU'):
 				_numSounds = _fileHandle->readUint16LE();
 				itemsize -= 2;
 				break;
@@ -384,7 +384,7 @@ void ScummEngine::readIndexFile() {
 #endif
 
 	while (true) {
-		blocktype = fileReadDword();
+		blocktype = _fileHandle->readUint32BE();
 		itemsize = _fileHandle->readUint32BE();
 
 		if (_fileHandle->ioFailed())
@@ -441,7 +441,7 @@ void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	int num;
 	char *ptr;
 	switch (blocktype) {
-	case MKID('ANAM'):		// Used by: The Dig, FT
+	case MKID_BE('ANAM'):		// Used by: The Dig, FT
 		debug(9, "found ANAM block, reading audio names");
 		num = _fileHandle->readUint16LE();
 		ptr = (char*)malloc(num * 9);
@@ -449,7 +449,7 @@ void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 		_imuseDigital->setAudioNames(num, ptr);
 		break;
 
-	case MKID('DRSC'):		// Used by: COMI
+	case MKID_BE('DRSC'):		// Used by: COMI
 		readResTypeList(rtRoomScripts, MKID('RMSC'), "room script");
 		break;
 
@@ -463,37 +463,37 @@ void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	int i;
 	switch (blocktype) {
-	case MKID('DIRI'):
+	case MKID_BE('DIRI'):
 		readResTypeList(rtRoomImage, MKID('RMIM'), "room image");
 		break;
 
-	case MKID('DIRM'):
+	case MKID_BE('DIRM'):
 		readResTypeList(rtImage, MKID('AWIZ'), "images");
 		break;
 
-	case MKID('DIRT'):
+	case MKID_BE('DIRT'):
 		readResTypeList(rtTalkie, MKID('TLKE'), "talkie");
 		break;
 
-	case MKID('DLFL'):
+	case MKID_BE('DLFL'):
 		i = _fileHandle->readUint16LE();
 		_fileHandle->seek(-2, SEEK_CUR);
 		_heV7RoomOffsets = (byte *)calloc(2 + (i * 4), 1);
 		_fileHandle->read(_heV7RoomOffsets, (2 + (i * 4)) );
 		break;
 
-	case MKID('DISK'):
+	case MKID_BE('DISK'):
 		i = _fileHandle->readUint16LE();
 		_heV7DiskOffsets = (byte *)calloc(i, 1);
 		_fileHandle->read(_heV7DiskOffsets, i);
 		break;
 
-	case MKID('SVER'):
+	case MKID_BE('SVER'):
 		// Index version number
 		_fileHandle->seek(itemsize - 8, SEEK_CUR);
 		break;
 
-	case MKID('INIB'):
+	case MKID_BE('INIB'):
 		_fileHandle->seek(itemsize - 8, SEEK_CUR);
 		debug(2, "INIB index block not yet handled, skipping");
 		break;
@@ -507,17 +507,17 @@ void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	int i;
 	switch (blocktype) {
-	case MKID('DCHR'):
-	case MKID('DIRF'):
+	case MKID_BE('DCHR'):
+	case MKID_BE('DIRF'):
 		readResTypeList(rtCharset, MKID('CHAR'), "charset");
 		break;
 
-	case MKID('DOBJ'):
+	case MKID_BE('DOBJ'):
 		debug(9, "found DOBJ block, reading object table");
 		readGlobalObjects();
 		break;
 
-	case MKID('RNAM'):
+	case MKID_BE('RNAM'):
 		// Names of rooms. Maybe we should put them into a table, for use by the debugger?
 		if (_game.heversion >= 80) {
 			for (int room; (room = _fileHandle->readUint16LE()); ) {
@@ -541,32 +541,32 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 		}
 		break;
 
-	case MKID('DROO'):
-	case MKID('DIRR'):
+	case MKID_BE('DROO'):
+	case MKID_BE('DIRR'):
 		readResTypeList(rtRoom, MKID('ROOM'), "room");
 		break;
 
-	case MKID('DSCR'):
-	case MKID('DIRS'):
+	case MKID_BE('DSCR'):
+	case MKID_BE('DIRS'):
 		readResTypeList(rtScript, MKID('SCRP'), "script");
 		break;
 
-	case MKID('DCOS'):
-	case MKID('DIRC'):
+	case MKID_BE('DCOS'):
+	case MKID_BE('DIRC'):
 		readResTypeList(rtCostume, MKID('COST'), "costume");
 		break;
 
-	case MKID('MAXS'):
+	case MKID_BE('MAXS'):
 		readMAXS(itemsize);
 		allocateArrays();
 		break;
 
-	case MKID('DIRN'):
-	case MKID('DSOU'):
+	case MKID_BE('DIRN'):
+	case MKID_BE('DSOU'):
 		readResTypeList(rtSound, MKID('SOUN'), "sound");
 		break;
 
-	case MKID('AARY'):
+	case MKID_BE('AARY'):
 		readArrayFromIndexFile();
 		break;
 
@@ -1450,7 +1450,7 @@ const byte *ResourceIterator::findNext(uint32 tag) {
 
 			_pos += size;
 			_ptr += size;
-		} while (READ_UINT32(result) != tag);
+		} while (READ_BE_UINT32(result) != tag);
 	}
 
 	return result;
@@ -1478,7 +1478,7 @@ const byte *ScummEngine::findResource(uint32 tag, const byte *searchin) {
 	}
 
 	while (curpos < totalsize) {
-		if (READ_UINT32(searchin) == tag) {
+		if (READ_BE_UINT32(searchin) == tag) {
 			_resourceLastSearchBuf = searchin;
 			return searchin;
 		}
@@ -1530,31 +1530,31 @@ const byte *findResourceSmall(uint32 tag, const byte *searchin) {
 
 uint16 newTag2Old(uint32 newTag) {
 	switch (newTag) {
-	case (MKID('RMHD')):
+	case (MKID_BE('RMHD')):
 		return (0x4448);	// HD
-	case (MKID('IM00')):
+	case (MKID_BE('IM00')):
 		return (0x4D42);	// BM
-	case (MKID('EXCD')):
+	case (MKID_BE('EXCD')):
 		return (0x5845);	// EX
-	case (MKID('ENCD')):
+	case (MKID_BE('ENCD')):
 		return (0x4E45);	// EN
-	case (MKID('SCAL')):
+	case (MKID_BE('SCAL')):
 		return (0x4153);	// SA
-	case (MKID('LSCR')):
+	case (MKID_BE('LSCR')):
 		return (0x534C);	// LS
-	case (MKID('OBCD')):
+	case (MKID_BE('OBCD')):
 		return (0x434F);	// OC
-	case (MKID('OBIM')):
+	case (MKID_BE('OBIM')):
 		return (0x494F);	// OI
-	case (MKID('SMAP')):
+	case (MKID_BE('SMAP')):
 		return (0x4D42);	// BM
-	case (MKID('CLUT')):
+	case (MKID_BE('CLUT')):
 		return (0x4150);	// PA
-	case (MKID('BOXD')):
+	case (MKID_BE('BOXD')):
 		return (0x5842);	// BX
-	case (MKID('CYCL')):
+	case (MKID_BE('CYCL')):
 		return (0x4343);	// CC
-	case (MKID('EPAL')):
+	case (MKID_BE('EPAL')):
 		return (0x5053);	// SP
 	default:
 		return (0);
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index f8b737c5ef..1c972fa299 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -237,7 +237,7 @@ void ScummEngine::loadRoomSubBlocks() {
 	//
 	// Determine the room dimensions (width/height)
 	//
-	rmhd = (const RoomHeader *)findResourceData(MKID('RMHD'), roomptr);
+	rmhd = (const RoomHeader *)findResourceData(MKID_BE('RMHD'), roomptr);
 
 	if (_game.version == 8) {
 		_roomWidth = READ_LE_UINT32(&(rmhd->v8.width));
@@ -259,18 +259,18 @@ void ScummEngine::loadRoomSubBlocks() {
 	if (_game.version == 8) {
 		_IM00_offs = getObjectImage(roomptr, 1) - roomptr;
 	} else if (_game.features & GF_SMALL_HEADER) {
-		_IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr;
+		_IM00_offs = findResourceData(MKID_BE('IM00'), roomptr) - roomptr;
 	} else if (_game.heversion >= 70) {
 		byte *roomImagePtr = getResourceAddress(rtRoomImage, _roomResource);
-		_IM00_offs = findResource(MKID('IM00'), roomImagePtr) - roomImagePtr;
+		_IM00_offs = findResource(MKID_BE('IM00'), roomImagePtr) - roomImagePtr;
 	} else {
-		_IM00_offs = findResource(MKID('IM00'), findResource(MKID('RMIM'), roomptr)) - roomptr;
+		_IM00_offs = findResource(MKID_BE('IM00'), findResource(MKID_BE('RMIM'), roomptr)) - roomptr;
 	}
 
 	//
 	// Look for an exit script
 	//
-	ptr = findResourceData(MKID('EXCD'), roomResPtr);
+	ptr = findResourceData(MKID_BE('EXCD'), roomResPtr);
 	if (ptr)
 		_EXCD_offs = ptr - roomResPtr;
 	if (_dumpScripts && _EXCD_offs)
@@ -279,7 +279,7 @@ void ScummEngine::loadRoomSubBlocks() {
 	//
 	// Look for an entry script
 	//
-	ptr = findResourceData(MKID('ENCD'), roomResPtr);
+	ptr = findResourceData(MKID_BE('ENCD'), roomResPtr);
 	if (ptr)
 		_ENCD_offs = ptr - roomResPtr;
 	if (_dumpScripts && _ENCD_offs)
@@ -299,7 +299,7 @@ void ScummEngine::loadRoomSubBlocks() {
 
 	if (_game.features & GF_SMALL_HEADER) {
 		ResourceIterator localScriptIterator(searchptr, true);
-		while ((ptr = localScriptIterator.findNext(MKID('LSCR'))) != NULL) {
+		while ((ptr = localScriptIterator.findNext(MKID_BE('LSCR'))) != NULL) {
 			int id = 0;
 			ptr += _resourceHeaderSize;	/* skip tag & size */
 			id = ptr[0];
@@ -314,7 +314,7 @@ void ScummEngine::loadRoomSubBlocks() {
 		}
 	} else if (_game.heversion >= 90) {
 		ResourceIterator localScriptIterator2(searchptr, false);
-		while ((ptr = localScriptIterator2.findNext(MKID('LSC2'))) != NULL) {
+		while ((ptr = localScriptIterator2.findNext(MKID_BE('LSC2'))) != NULL) {
 			int id = 0;
 
 			ptr += _resourceHeaderSize;	/* skip tag & size */
@@ -332,7 +332,7 @@ void ScummEngine::loadRoomSubBlocks() {
 		}
 
 		ResourceIterator localScriptIterator(searchptr, false);
-		while ((ptr = localScriptIterator.findNext(MKID('LSCR'))) != NULL) {
+		while ((ptr = localScriptIterator.findNext(MKID_BE('LSCR'))) != NULL) {
 			int id = 0;
 
 			ptr += _resourceHeaderSize;	/* skip tag & size */
@@ -349,7 +349,7 @@ void ScummEngine::loadRoomSubBlocks() {
 
 	} else {
 		ResourceIterator localScriptIterator(searchptr, false);
-		while ((ptr = localScriptIterator.findNext(MKID('LSCR'))) != NULL) {
+		while ((ptr = localScriptIterator.findNext(MKID_BE('LSCR'))) != NULL) {
 			int id = 0;
 
 			ptr += _resourceHeaderSize;	/* skip tag & size */
@@ -376,18 +376,18 @@ void ScummEngine::loadRoomSubBlocks() {
 	}
 
 	// Locate the EGA palette (currently unused).
-	ptr = findResourceData(MKID('EPAL'), roomptr);
+	ptr = findResourceData(MKID_BE('EPAL'), roomptr);
 	if (ptr)
 		_EPAL_offs = ptr - roomptr;
 
 	// Locate the standard room palette (for V3-V5 games).
-	ptr = findResourceData(MKID('CLUT'), roomptr);
+	ptr = findResourceData(MKID_BE('CLUT'), roomptr);
 	if (ptr)
 		_CLUT_offs = ptr - roomptr;
 
 	// Locate the standard room palettes (for V6+ games).
 	if (_game.version >= 6) {
-		ptr = findResource(MKID('PALS'), roomptr);
+		ptr = findResource(MKID_BE('PALS'), roomptr);
 		if (ptr) {
 			_PALS_offs = ptr - roomptr;
 		}
@@ -398,7 +398,7 @@ void ScummEngine::loadRoomSubBlocks() {
 	if (_game.version == 8)
 		trans = (byte)READ_LE_UINT32(&(rmhd->v8.transparency));
 	else {
-		ptr = findResourceData(MKID('TRNS'), roomptr);
+		ptr = findResourceData(MKID_BE('TRNS'), roomptr);
 		if (ptr)
 			trans = ptr[0];
 		else
@@ -407,7 +407,7 @@ void ScummEngine::loadRoomSubBlocks() {
 
 	// Actor Palette in HE 70 games
 	if (_game.heversion == 70) {
-		ptr = findResourceData(MKID('REMP'), roomptr);
+		ptr = findResourceData(MKID_BE('REMP'), roomptr);
 		if (ptr) {
 			for (i = 0; i < 256; i++)
 				_HEV7ActorPalette[i] = *ptr++;
@@ -457,7 +457,7 @@ void ScummEngine::initRoomSubBlocks() {
 	res.nukeResource(rtMatrix, 1);
 	res.nukeResource(rtMatrix, 2);
 	if (_game.features & GF_SMALL_HEADER) {
-		ptr = findResourceData(MKID('BOXD'), roomptr);
+		ptr = findResourceData(MKID_BE('BOXD'), roomptr);
 		if (ptr) {
 			byte numOfBoxes = *ptr;
 			int size;
@@ -478,21 +478,21 @@ void ScummEngine::initRoomSubBlocks() {
 
 		}
 	} else {
-		ptr = findResourceData(MKID('BOXD'), roomptr);
+		ptr = findResourceData(MKID_BE('BOXD'), roomptr);
 		if (ptr) {
 			int size = getResourceDataSize(ptr);
 			res.createResource(rtMatrix, 2, size);
 			roomptr = getResourceAddress(rtRoom, _roomResource);
-			ptr = findResourceData(MKID('BOXD'), roomptr);
+			ptr = findResourceData(MKID_BE('BOXD'), roomptr);
 			memcpy(getResourceAddress(rtMatrix, 2), ptr, size);
 		}
 
-		ptr = findResourceData(MKID('BOXM'), roomptr);
+		ptr = findResourceData(MKID_BE('BOXM'), roomptr);
 		if (ptr) {
 			int size = getResourceDataSize(ptr);
 			res.createResource(rtMatrix, 1, size);
 			roomptr = getResourceAddress(rtRoom, _roomResource);
-			ptr = findResourceData(MKID('BOXM'), roomptr);
+			ptr = findResourceData(MKID_BE('BOXM'), roomptr);
 			memcpy(getResourceAddress(rtMatrix, 1), ptr, size);
 		}
 	}
@@ -503,7 +503,7 @@ void ScummEngine::initRoomSubBlocks() {
 	for (i = 1; i < res.num[rtScaleTable]; i++)
 		res.nukeResource(rtScaleTable, i);
 
-	ptr = findResourceData(MKID('SCAL'), roomptr);
+	ptr = findResourceData(MKID_BE('SCAL'), roomptr);
 	if (ptr) {
 		int s1, s2, y1, y2;
 		if (_game.version == 8) {
@@ -530,7 +530,7 @@ void ScummEngine::initRoomSubBlocks() {
 	// Color cycling
 	// HE 7.0 games load resources but don't use them.
 	if (_game.version >= 4 && _game.heversion <= 61) {
-		ptr = findResourceData(MKID('CYCL'), roomptr);
+		ptr = findResourceData(MKID_BE('CYCL'), roomptr);
 		if (ptr) {
 			initCycl(ptr);
 		}
@@ -539,7 +539,7 @@ void ScummEngine::initRoomSubBlocks() {
 #ifndef DISABLE_HE
 	// Polygons in HE 80+ games
 	if (_game.heversion >= 80) {
-		ptr = findResourceData(MKID('POLD'), roomptr);
+		ptr = findResourceData(MKID_BE('POLD'), roomptr);
 		if (ptr) {
 			((ScummEngine_v70he *)this)->_wiz->polygonLoad(ptr);
 		}
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 3b5b25c714..f91a72b91d 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -164,7 +164,7 @@ int ScummEngine::getVerbEntrypoint(int obj, int entry) {
 	else if (_game.features & GF_SMALL_HEADER)
 		verbptr = objptr + 19;
 	else
-		verbptr = findResource(MKID('VERB'), objptr);
+		verbptr = findResource(MKID_BE('VERB'), objptr);
 
 	assert(verbptr);
 
@@ -941,7 +941,7 @@ void ScummEngine::runExitScript() {
 		// be limiting ourselves to strictly reading the size from the header?
 		if (_game.id == GID_INDY3 && !(_game.features & GF_OLD_BUNDLE)) {
 			byte *roomptr = getResourceAddress(rtRoom, _roomResource);
-			const byte *excd = findResourceData(MKID('EXCD'), roomptr) - _resourceHeaderSize;
+			const byte *excd = findResourceData(MKID_BE('EXCD'), roomptr) - _resourceHeaderSize;
 			if (!excd || (getResourceDataSize(excd) < 1)) {
 				debug(2, "Exit-%d is empty", _roomResource);
 				return;
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 6cf6e008f4..538a4f5285 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -3107,7 +3107,7 @@ void ScummEngine_v6::o6_setBoxSet() {
 
 	ResourceIterator boxds(room, false);
 	for (i = 0; i < arg; i++)
-		boxd = boxds.findNext(MKID('BOXD'));
+		boxd = boxds.findNext(MKID_BE('BOXD'));
 
 	if (!boxd)
 		error("ScummEngine_v6::o6_setBoxSet: Can't find dboxes for set %d", arg);
@@ -3120,7 +3120,7 @@ void ScummEngine_v6::o6_setBoxSet() {
 
 	ResourceIterator boxms(room, false);
 	for (i = 0; i < arg; i++)
-		boxm = boxms.findNext(MKID('BOXM'));
+		boxm = boxms.findNext(MKID_BE('BOXM'));
 
 	if (!boxm)
 		error("ScummEngine_v6::o6_setBoxSet: Can't find mboxes for set %d", arg);
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index b46b2c94f9..fdc7d5eb0d 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -221,7 +221,7 @@ void Sound::playSound(int soundID) {
 	// Support for SFX in Monkey Island 1, Mac version
 	// This is rather hackish right now, but works OK. SFX are not sounding
 	// 100% correct, though, not sure right now what is causing this.
-	else if (READ_UINT32(ptr) == MKID('Mac1')) {
+	else if (READ_BE_UINT32(ptr) == MKID_BE('Mac1')) {
 		// Read info from the header
 		size = READ_BE_UINT32(ptr+0x60);
 		rate = READ_BE_UINT16(ptr+0x64);
@@ -235,7 +235,7 @@ void Sound::playSound(int soundID) {
 		_vm->_mixer->playRaw(NULL, sound, size, rate, flags, soundID);
 	}
 	// WORKAROUND bug # 1311447
-	else if (READ_UINT32(ptr) == MKID(0x460e200d)) {
+	else if (READ_BE_UINT32(ptr) == 0x460e200d) {
 		// This sound resource occurs in the Macintosh version of Monkey Island.
 		// I do now know whether it is used in any place other than the one
 		// mentioned in the bug report above; in case it is, I put a check here. 
@@ -257,7 +257,7 @@ void Sound::playSound(int soundID) {
 		_vm->_mixer->playRaw(NULL, sound, size, rate, flags, soundID);
 	}
 	// Support for sampled sound effects in Monkey Island 1 and 2
-	else if (READ_UINT32(ptr) == MKID('SBL ')) {
+	else if (READ_BE_UINT32(ptr) == MKID_BE('SBL ')) {
 		debugC(DEBUG_SOUND, "Using SBL sound effect");
 
 		// SBL resources essentially contain VOC sound data.
@@ -327,9 +327,9 @@ void Sound::playSound(int soundID) {
 		memcpy(sound, ptr + 6, size);
 		_vm->_mixer->playRaw(NULL, sound, size, rate, flags, soundID);
 	}
-	else if ((_vm->_game.platform == Common::kPlatformFMTowns && _vm->_game.version == 3) || READ_UINT32(ptr) == MKID('SOUN') || READ_UINT32(ptr) == MKID('TOWS')) {
+	else if ((_vm->_game.platform == Common::kPlatformFMTowns && _vm->_game.version == 3) || READ_BE_UINT32(ptr) == MKID_BE('SOUN') || READ_BE_UINT32(ptr) == MKID_BE('TOWS')) {
 
-		bool tows = READ_UINT32(ptr) == MKID('TOWS');
+		bool tows = READ_BE_UINT32(ptr) == MKID_BE('TOWS');
 		if (_vm->_game.version == 3) {
 			size = READ_LE_UINT32(ptr);
 		} else {
@@ -470,7 +470,7 @@ void Sound::playSound(int soundID) {
 			// Rather it seems that starting a new music is supposed to
 			// automatically stop the old song.
 			if (_vm->_imuse) {
-				if (READ_UINT32(ptr) != MKID('ASFX'))
+				if (READ_BE_UINT32(ptr) != MKID_BE('ASFX'))
 					_vm->_imuse->stopAllSounds();
 			}
 		}
@@ -1176,56 +1176,56 @@ int ScummEngine::readSoundResource(int type, int idx) {
 
 	_fileHandle->readUint32LE();
 	max_total_size = _fileHandle->readUint32BE() - 8;
-	basetag = fileReadDword();
+	basetag = _fileHandle->readUint32BE();
 	total_size = _fileHandle->readUint32BE();
 
-	debugC(DEBUG_RESOURCE, "  basetag: %s, total_size=%d", tag2str(TO_BE_32(basetag)), total_size);
+	debugC(DEBUG_RESOURCE, "  basetag: %s, total_size=%d", tag2str(basetag), total_size);
 
 	switch (basetag) {
-	case MKID('MIDI'):
-	case MKID('iMUS'):
+	case MKID_BE('MIDI'):
+	case MKID_BE('iMUS'):
 		if (_musicType != MDT_PCSPK) {
 			_fileHandle->seek(-8, SEEK_CUR);
 			_fileHandle->read(res.createResource(type, idx, total_size + 8), total_size + 8);
 			return 1;
 		}
 		break;
-	case MKID('SOU '):
+	case MKID_BE('SOU '):
 		best_pri = -1;
 		while (pos < total_size) {
-			tag = fileReadDword();
+			tag = _fileHandle->readUint32BE();
 			size = _fileHandle->readUint32BE() + 8;
 			pos += size;
 
 			pri = -1;
 
 			switch (tag) {
-			case MKID('TOWS'):
+			case MKID_BE('TOWS'):
 				pri = 16;
 				break;
-			case MKID('SBL '):
+			case MKID_BE('SBL '):
 				pri = 15;
 				break;
-			case MKID('ADL '):
+			case MKID_BE('ADL '):
 				pri = 1;
 				if (_musicType == MDT_ADLIB)
 					pri = 10;
 				break;
-			case MKID('AMI '):
+			case MKID_BE('AMI '):
 				pri = 3;
 				break;
-			case MKID('ROL '):
+			case MKID_BE('ROL '):
 				pri = 3;
 				if (_native_mt32)
 					pri = 5;
 				break;
-			case MKID('GMD '):
+			case MKID_BE('GMD '):
 				pri = 4;
 				break;
-			case MKID('MAC '):	// Occurs in Mac MI2, FOA
+			case MKID_BE('MAC '):	// Occurs in Mac MI2, FOA
 				pri = 2;
 				break;
-			case MKID('SPK '):
+			case MKID_BE('SPK '):
 				pri = -1;
 //				if (_musicType == MDT_PCSPK)
 //					pri = 11;
@@ -1235,7 +1235,7 @@ int ScummEngine::readSoundResource(int type, int idx) {
 			if ((_musicType == MDT_PCSPK) && pri != 11)
 				pri = -1;
 
-			debugC(DEBUG_RESOURCE, "    tag: %s, total_size=%d, pri=%d", tag2str(TO_BE_32(tag)), size, pri);
+			debugC(DEBUG_RESOURCE, "    tag: %s, total_size=%d, pri=%d", tag2str(tag), size, pri);
 
 
 			if (pri > best_pri) {
@@ -1255,7 +1255,7 @@ int ScummEngine::readSoundResource(int type, int idx) {
 			return 1;
 		}
 		break;
-	case MKID('Mac0'):
+	case MKID_BE('Mac0'):
 		_fileHandle->seek(-12, SEEK_CUR);
 		total_size = _fileHandle->readUint32BE() - 8;
 		ptr = (byte *)calloc(total_size, 1);
@@ -1265,12 +1265,12 @@ int ScummEngine::readSoundResource(int type, int idx) {
 		free(ptr);
 		return 1;
 
-	case MKID('Mac1'):
-	case MKID('RIFF'):
-	case MKID('TALK'):
-	case MKID('DIGI'):
-	case MKID('Crea'):
-	case MKID(0x460e200d):	// WORKAROUND bug # 1311447
+	case MKID_BE('Mac1'):
+	case MKID_BE('RIFF'):
+	case MKID_BE('TALK'):
+	case MKID_BE('DIGI'):
+	case MKID_BE('Crea'):
+	case 0x460e200d:	// WORKAROUND bug # 1311447
 		_fileHandle->seek(-12, SEEK_CUR);
 		total_size = _fileHandle->readUint32BE();
 		ptr = res.createResource(type, idx, total_size);
@@ -1278,7 +1278,7 @@ int ScummEngine::readSoundResource(int type, int idx) {
 		//dumpResource("sound-", idx, ptr);
 		return 1;
 
-	case MKID('HSHD'):
+	case MKID_BE('HSHD'):
 		// HE sound type without SOUN header
 		_fileHandle->seek(-16, SEEK_CUR);
 		total_size = max_total_size + 8;
@@ -1287,7 +1287,7 @@ int ScummEngine::readSoundResource(int type, int idx) {
 		//dumpResource("sound-", idx, ptr);
 		return 1;
 
-	case MKID('FMUS'): {
+	case MKID_BE('FMUS'): {
 		// Used in 3DO version of puttputt joins the parade and probably others
 		// Specifies a separate file to be used for music from what I gather.
 		int tmpsize;
@@ -1325,7 +1325,7 @@ int ScummEngine::readSoundResource(int type, int idx) {
 		return 1;
 
 	default:
-		if (FROM_LE_32(basetag) == max_total_size) {
+		if (SWAP_BYTES_32(basetag) == max_total_size) {
 			_fileHandle->seek(-12, SEEK_CUR);
 			total_size = _fileHandle->readUint32BE();
 			_fileHandle->seek(-8, SEEK_CUR);
@@ -1334,7 +1334,7 @@ int ScummEngine::readSoundResource(int type, int idx) {
 			//dumpResource("sound-", idx, ptr);
 			return 1;
 		}
-		error("Unrecognized base tag 0x%08x in sound %d", TO_BE_32(basetag), idx);
+		error("Unrecognized base tag 0x%08x in sound %d", basetag, idx);
 	}
 	res.roomoffs[type][idx] = 0xFFFFFFFF;
 	return 0;
@@ -1496,20 +1496,20 @@ static inline byte *writeVLQ(byte *ptr, int value) {
 static inline byte Mac0ToGMInstrument(uint32 type, int &transpose) {
 	transpose = 0;
 	switch (type) {
-	case MKID('MARI'): return 12;
-	case MKID('PLUC'): return 45;
-	case MKID('HARM'): return 22;
-	case MKID('PIPE'): return 19;
-	case MKID('TROM'): transpose = -12; return 57;
-	case MKID('STRI'): return 48;
-	case MKID('HORN'): return 60;
-	case MKID('VIBE'): return 11;
-	case MKID('SHAK'): return 77;
-	case MKID('PANP'): return 75;
-	case MKID('WHIS'): return 76;
-	case MKID('ORGA'): return 17;
-	case MKID('BONG'): return 115;
-	case MKID('BASS'): transpose = -24; return 35;
+	case MKID_BE('MARI'): return 12;
+	case MKID_BE('PLUC'): return 45;
+	case MKID_BE('HARM'): return 22;
+	case MKID_BE('PIPE'): return 19;
+	case MKID_BE('TROM'): transpose = -12; return 57;
+	case MKID_BE('STRI'): return 48;
+	case MKID_BE('HORN'): return 60;
+	case MKID_BE('VIBE'): return 11;
+	case MKID_BE('SHAK'): return 77;
+	case MKID_BE('PANP'): return 75;
+	case MKID_BE('WHIS'): return 76;
+	case MKID_BE('ORGA'): return 17;
+	case MKID_BE('BONG'): return 115;
+	case MKID_BE('BASS'): transpose = -24; return 35;
 	default:
 		error("Unknown Mac0 instrument %s found", tag2str(type));
 	}
@@ -1594,13 +1594,13 @@ void ScummEngine::convertMac0Resource(int type, int idx, byte *src_ptr, int size
 
 	// Parse the three channels
 	for (i = 0; i < 3; i++) {
-		assert(*((uint32*)src_ptr) == MKID('Chan'));
+		assert(READ_BE_UINT32(src_ptr) == MKID_BE('Chan'));
 		len = READ_BE_UINT32(src_ptr + 4);
 		track_len[i] = len - 24;
-		track_instr[i] = Mac0ToGMInstrument(*(uint32*)(src_ptr + 8), track_transpose[i]);
+		track_instr[i] = Mac0ToGMInstrument(READ_BE_UINT32(src_ptr + 8), track_transpose[i]);
 		track_data[i] = src_ptr + 12;
 		src_ptr += len;
-		looped = (*((uint32*)(src_ptr - 8)) == MKID('Loop'));
+		looped = (READ_BE_UINT32(src_ptr - 8) == MKID_BE('Loop'));
 
 		// For each note event, we need up to 6 bytes for the
 		// Note On (3 VLQ, 3 event), and 6 bytes for the Note
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 21a83510bc..9164398558 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -742,7 +742,7 @@ void ScummEngine::drawVerbBitmap(int verb, int x, int y) {
 		imgh = (*(obim + size + 17)) / 8;
 		imptr = getObjectImage(obim, 1);
 	} else {
-		imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), obim);
+		imhd = (const ImageHeader *)findResourceData(MKID_BE('IMHD'), obim);
 		if (_game.version >= 7) {
 			imgw = READ_LE_UINT16(&imhd->v7.width) / 8;
 			imgh = READ_LE_UINT16(&imhd->v7.height) / 8;