1 files changed, 9 insertions, 8 deletions
diff --git a/engines/sword25/fmv/oggtheora/moviefile.h b/engines/sword25/fmv/oggtheora/moviefile.h
index bdae585d73..5aa0ef5617 100644
--- a/engines/sword25/fmv/oggtheora/moviefile.h
+++ b/engines/sword25/fmv/oggtheora/moviefile.h
@@ -41,22 +41,25 @@
 
 #include "sword25/kernel/common.h"
 
-namespace Sword25 {
+#include "sword25/kernel/memlog_off.h"
+#include <string>
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 
-class OggState;
+class BS_OggState;
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
 // -----------------------------------------------------------------------------
 
-class MovieFile {
+class BS_MovieFile
+{
 public:
-	MovieFile(const Common::String &Filename, unsigned int ReadBlockSize, bool &Success);
-	virtual ~MovieFile();
+  BS_MovieFile(const std::string & Filename, unsigned int ReadBlockSize, bool & Success);
+	virtual ~BS_MovieFile();
 
-	int		BufferData(OggState &OggState);
+	int		BufferData(BS_OggState & OggState);
 	bool	IsEOF() const;
 
 private:
@@ -66,6 +69,4 @@ private:
 	unsigned int	m_ReadBlockSize;
 };
 
-} // End of namespace Sword25
-
 #endif