diff --git a/backends/fs/fs-factory-maker.cpp b/backends/fs/abstract-fs-factory.cpp
similarity index 97%
rename from backends/fs/fs-factory-maker.cpp
rename to backends/fs/abstract-fs-factory.cpp
index 045f30cb281..6126d82737b 100644
--- a/backends/fs/fs-factory-maker.cpp
+++ b/backends/fs/abstract-fs-factory.cpp
@@ -60,7 +60,7 @@
  * 
  * @return AbstractFilesystemFactory* The specific factory for the current architecture. 
  */
-static AbstractFilesystemFactory *makeFSFactory() {
+AbstractFilesystemFactory *AbstractFilesystemFactory::makeFSFactory() {
 	#if defined(__amigaos4__)
 		return &AmigaOSFilesystemFactory::instance();
 	#elif defined(__DC__)
diff --git a/backends/fs/abstract-fs-factory.h b/backends/fs/abstract-fs-factory.h
index c826ef2745d..79ec3f75209 100644
--- a/backends/fs/abstract-fs-factory.h
+++ b/backends/fs/abstract-fs-factory.h
@@ -25,6 +25,7 @@
 #ifndef ABSTRACT_FILESYSTEM_FACTORY_H
 #define ABSTRACT_FILESYSTEM_FACTORY_H
 
+#include "common/stdafx.h"
 #include "common/str.h"
 #include "backends/fs/abstract-fs.h"
 
@@ -68,6 +69,13 @@ public:
 	 * On Windows, it will be a special node which "contains" all drives (C:, D:, E:).
 	 */
 	virtual AbstractFilesystemNode *makeRootFileNode() const = 0;
+	
+	
+	/**
+	 * Meta-factory method which returns a concrete AbstractFilesystemFactory
+	 * instance depending on the current architecture.
+	 */
+	static AbstractFilesystemFactory *makeFSFactory();
 };
 
 #endif /*ABSTRACT_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/dc/dc-fs.cpp b/backends/fs/dc/dc-fs.cpp
index bae13d37e77..0b204dc309f 100644
--- a/backends/fs/dc/dc-fs.cpp
+++ b/backends/fs/dc/dc-fs.cpp
@@ -81,7 +81,7 @@ public:
  * @param str String containing the path.
  * @return Pointer to the first char of the last component inside str.
  */
-static const char *lastPathComponent(const Common::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/gp32/gp32-fs.cpp b/backends/fs/gp32/gp32-fs.cpp
index a4af5d4fbea..1585bd22f1e 100644
--- a/backends/fs/gp32/gp32-fs.cpp
+++ b/backends/fs/gp32/gp32-fs.cpp
@@ -82,7 +82,7 @@ const char gpRootPath[] = "gp:\\";
  * @param str Path to obtain the last component from.
  * @return Pointer to the first char of the last component inside str.
  */
-static const char *lastPathComponent(const Common::String &str) {
+const char *lastPathComponent(const Common::String &str) {
 	const char *start = str.c_str();
 	const char *cur = start + str.size() - 2;
 
@@ -214,7 +214,7 @@ bool GP32FilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool
 	//listDir += "/";
 	
 	while (GpDirEnumList(listDir.c_str(), startIdx++, 1, &dirEntry, &read)  == SM_OK) {
-		if (dirEntry.name[0] == '.')
+da			if (dirEntry.name[0] == '.')
 			continue;
 			
 		entry._displayName = dirEntry.name;
diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp
index 508dff428b4..d44958254d2 100644
--- a/backends/fs/palmos/palmos-fs.cpp
+++ b/backends/fs/palmos/palmos-fs.cpp
@@ -92,7 +92,7 @@ private:
  * @param str String containing the path.
  * @return Pointer to the first char of the last component inside str.
  */
-static const char *lastPathComponent(const Common::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 2e01c551d90..5871d1ef424 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -91,7 +91,7 @@ private:
  * @param str String containing the path.
  * @return Pointer to the first char of the last component inside str.
  */
-static const char *lastPathComponent(const Common::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/psp/psp_fs.cpp b/backends/fs/psp/psp_fs.cpp
index 019b13e9e69..04f24a98cc7 100644
--- a/backends/fs/psp/psp_fs.cpp
+++ b/backends/fs/psp/psp_fs.cpp
@@ -82,7 +82,7 @@ public:
  * @param str String containing the path.
  * @return Pointer to the first char of the last component inside str.
  */
-static const char *lastPathComponent(const Common::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/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp
index d3b39f192c7..e8a95539274 100644
--- a/backends/fs/symbian/symbian-fs.cpp
+++ b/backends/fs/symbian/symbian-fs.cpp
@@ -83,7 +83,7 @@ public:
  * @param str Path to obtain the last component from.
  * @return Pointer to the first char of the last component inside str.
  */
-static const char *lastPathComponent(const Common::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/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp
index 995264f1101..da9fc59c354 100644
--- a/backends/fs/windows/windows-fs.cpp
+++ b/backends/fs/windows/windows-fs.cpp
@@ -124,7 +124,7 @@ private:
  * @param str Path to obtain the last component from.
  * @return Pointer to the first char of the last component inside str.
  */
-static const char *lastPathComponent(const Common::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/module.mk b/backends/module.mk
index 1803a6b945f..1eaeb953a90 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -2,11 +2,7 @@ MODULE := backends
 
 MODULE_OBJS := \
 	events/default/default-events.o \
-	fs/posix/posix-fs.o \
-	fs/morphos/abox-fs.o \
-	fs/windows/windows-fs.o \
-	fs/amigaos4/amigaos4-fs.o \
-	fs/dc/dc-fs.o \
+	fs/abstract-fs-factory.o \
 	midi/alsa.o \
 	midi/coreaudio.o \
 	midi/coremidi.o \
diff --git a/common/fs.cpp b/common/fs.cpp
index 86cdfe41d6e..d395686be36 100644
--- a/common/fs.cpp
+++ b/common/fs.cpp
@@ -25,9 +25,9 @@
 #include "common/stdafx.h"
 #include "common/util.h"
 #include "backends/fs/abstract-fs.h"
-#include "backends/fs/fs-factory-maker.cpp"
+#include "backends/fs/abstract-fs-factory.h"
 
-/*
+/**
  * Simple DOS-style pattern matching function (understands * and ? like used in DOS).
  * Taken from exult/files/listfiles.cc
  */
@@ -82,7 +82,7 @@ FilesystemNode::FilesystemNode(const FilesystemNode &node) {
 }
 
 FilesystemNode::FilesystemNode(const Common::String &p) {
-	AbstractFilesystemFactory *factory = makeFSFactory();
+	AbstractFilesystemFactory *factory = AbstractFilesystemFactory::makeFSFactory();
 	
 	if (p.empty() || p == ".")
 		_realNode = factory->makeCurrentDirectoryFileNode();
@@ -234,6 +234,9 @@ bool FilesystemNode::lookupFile(FSList &results, FilesystemNode &dir, Common::St
 	return ((matches > 0) ? true : false);
 }
 
+// HACK HACK HACK
+extern const char *lastPathComponent(const Common::String &str);
+
 int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const
 {
 	FSList entries;