5 files changed, 6 insertions, 6 deletions
diff --git a/engines/m4/converse.cpp b/engines/m4/converse.cpp
index 4630d2e2d6..bdce7928ac 100644
--- a/engines/m4/converse.cpp
+++ b/engines/m4/converse.cpp
@@ -609,7 +609,7 @@ void Converse::loadConversation(const char *convName) {
 			// ----------------------------------------------------------------------------
 			// Entry action chunks
 			case CHUNK_CASN:	// Conditional assign
-			case CHUNK_ASGN:	// Assign
+			case CHUNK_ASGN: {	// Assign
 				curAction = new EntryAction();
 				if (debugFlag) debugCN(kDebugConversations, "ASGN chunk\n");
 				curAction->actionType = kAssignValue;
@@ -625,9 +625,11 @@ void Converse::loadConversation(const char *convName) {
 				}
 
 				curAction->targetOffset = convS->readUint32LE();
-				assert(convS->readUint32LE() == kOpAssign);
+				int op = convS->readUint32LE();
+				assert(op == kOpAssign);
 				curAction->value = convS->readUint32LE();
 				break;
+			}
 			case CHUNK_CCGO:	// Conditional go to entry
 			case CHUNK_CHDE:	// Conditional hide entry
 			case CHUNK_CUHD:	// Conditional unhide entry
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index 46107cb20a..b40ba0e878 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -26,7 +26,6 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 #include "common/random.h"
-#include "audio/mididrv.h"
 
 #include "engines/engine.h"
 
diff --git a/engines/m4/midi.h b/engines/m4/midi.h
index 6eef907ce3..817150fd81 100644
--- a/engines/m4/midi.h
+++ b/engines/m4/midi.h
@@ -57,4 +57,3 @@ protected:
 } // End of namespace M4
 
 #endif
-
diff --git a/engines/m4/saveload.cpp b/engines/m4/saveload.cpp
index aa35385bfe..a7615fa4b6 100644
--- a/engines/m4/saveload.cpp
+++ b/engines/m4/saveload.cpp
@@ -96,7 +96,8 @@ SaveGameList *SaveLoad::getSaves() {
 				result->push_back(Common::String());
 			} else {
 				// Skip over byte offset
-				assert(saveFile->readUint32LE() < 0x100);
+				uint32 offset = saveFile->readUint32LE();
+				assert(offset < 0x100);
 
 				// Read in savegame name
 				saveFile->read(&saveName[0], MAX_SAVEGAME_NAME);
diff --git a/engines/m4/scripttab.h b/engines/m4/scripttab.h
index b6156f0b82..3264ae743c 100644
--- a/engines/m4/scripttab.h
+++ b/engines/m4/scripttab.h
@@ -133,4 +133,3 @@
 		VARIABLE(kInterfaceVisible)
 	};
 #undef VARIABLE
-