4 files changed, 14 insertions, 11 deletions
diff --git a/engines/tony/mpal/loadmpc.h b/engines/tony/mpal/loadmpc.h
index 8763fbf95b..fc03e43b40 100644
--- a/engines/tony/mpal/loadmpc.h
+++ b/engines/tony/mpal/loadmpc.h
@@ -72,7 +72,7 @@ namespace MPAL {
 *
 \****************************************************************************/
 
-bool ParseMpc(const byte *lpBuf);
+bool ParseMpc(byte *lpBuf);
 
 
 } // end of namespace MPAL
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 2fd9f3b9c3..f068f0fabf 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -153,7 +153,7 @@ uint32                    nSelectedChoice;
 
 
 /****************************************************************************\
-*       Static functions
+*       Internal functions
 \****************************************************************************/
 
 /****************************************************************************\
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
index 73e2dec50f..70b49a1fd9 100644
--- a/engines/tony/mpal/mpal.h
+++ b/engines/tony/mpal/mpal.h
@@ -114,12 +114,16 @@
  *
  */
 
-#ifndef __MPAL_H
-#define __MPAL_H
+#ifndef TONY_MPAL_H
+#define TONY_MPAL_H
 
 #include "common/scummsys.h"
 #include "common/rect.h"
 
+namespace Tony {
+
+namespace MPAL {
+
 /****************************************************************************\
 *       Macro definitions and structures
 \****************************************************************************/
@@ -765,5 +769,9 @@ extern void LockVar(void);
 
 extern void UnlockVar(void);
 
+} // end of namespace MPAL
+
+} // end of namespace Tony
+
 #endif
 
diff --git a/engines/tony/mpal/stubs.cpp b/engines/tony/mpal/stubs.cpp
index 342678b856..c25dd2ab43 100644
--- a/engines/tony/mpal/stubs.cpp
+++ b/engines/tony/mpal/stubs.cpp
@@ -1,4 +1,4 @@
-e/* ScummVM - Graphic Adventure Engine
+/* ScummVM - Graphic Adventure Engine
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
@@ -21,9 +21,6 @@ e/* ScummVM - Graphic Adventure Engine
  *
  */
 
-#ifndef TONY_MPAL_STUBS
-#define TONY_MPAL_STUBS
-
 /****************************************************************************\
 *       This file contains stubs and mappings for things used by the MPAL
 *		library that are handled differently under ScummVM
@@ -101,7 +98,7 @@ HANDLE CreateThread(void *lpThreadAttributes, size_t dwStackSize,
 	return 0;
 }
 
-void ExitThread(HANDLE ThreadId) {
+void ExitThread(int ThreadId) {
 }
 
 void TerminateThread(HANDLE ThreadId, uint32 dwExitCode) {
@@ -136,5 +133,3 @@ void ResetEvent(HANDLE hEvent) {
 } // end of namespace MPAL
 
 } // end of namespace Tony
-
-#endif