4 files changed, 5 insertions, 5 deletions
diff --git a/backends/fs/fs.h b/backends/fs/fs.h
index be543c67c4..6a5ab500d0 100644
--- a/backends/fs/fs.h
+++ b/backends/fs/fs.h
@@ -65,7 +65,7 @@ class FSList;
  */
 class FilesystemNode {
 protected:
-	typedef ScummVM::String String;
+	typedef Common::String String;
 
 public:
 
@@ -146,7 +146,7 @@ public:
 /*
  * A sorted list of multiple file system nodes. E.g. the contents of a given directory.
  */
-class FSList : ScummVM::List<FilesystemNode *> {
+class FSList : Common::List<FilesystemNode *> {
 public:
 	~FSList() {
 		for (int i = 0; i < _size; i++)
diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp
index 5f634a8ca9..5972917784 100644
--- a/backends/fs/palmos/palmos-fs.cpp
+++ b/backends/fs/palmos/palmos-fs.cpp
@@ -124,7 +124,7 @@ FSList *PalmOSFilesystemNode::listDir(ListMode mode) const {
 	return myList;
 }
 
-const char *lastPathComponent(const ScummVM::String &str) {
+const char *lastPathComponent(const Common::String &str) {
         const char *start = str.c_str();
         const char *cur = start + str.size() - 2;
 
diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp
index d560db51c5..26b3075436 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -64,7 +64,7 @@ public:
 };
 
 
-static const char *lastPathComponent(const ScummVM::String &str) {
+static const char *lastPathComponent(const Common::String &str) {
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;
 	
diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp
index a4479adac1..6e18e6cb4c 100644
--- a/backends/fs/windows/windows-fs.cpp
+++ b/backends/fs/windows/windows-fs.cpp
@@ -184,7 +184,7 @@ FSList *WindowsFilesystemNode::listDir(ListMode mode) const {
 	return myList;
 }
 
-const char *lastPathComponent(const ScummVM::String &str) {
+const char *lastPathComponent(const Common::String &str) {
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;