Renamed files and minor tweaks. Thanks LordHoto :)

svn-id: r26810

25 files changed, 70 insertions, 126 deletions

diff --git a/backends/fs/AbstractFilesystemFactory.h b/backends/fs/abstract-fs-factory.h
index 4af8c6b657..41bfaaa34b 100644
--- a/backends/fs/AbstractFilesystemFactory.h
+++ b/backends/fs/abstract-fs-factory.h
@@ -1,5 +1,5 @@
-#ifndef ABSTRACTFILESYSTEMFACTORY_H_
-#define ABSTRACTFILESYSTEMFACTORY_H_
+#ifndef ABSTRACT_FILESYSTEM_FACTORY_H
+#define ABSTRACT_FILESYSTEM_FACTORY_H
 
 #include "common/str.h"
 
@@ -45,4 +45,4 @@ public:
 	virtual AbstractFilesystemNode *makeRootFileNode() const = 0;
 };
 
-#endif /*ABSTRACTFILESYSTEMFACTORY_H_*/
+#endif /*ABSTRACT_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/abstract-fs.h b/backends/fs/abstract-fs.h
index 86149dfffa..8297bf69e2 100644
--- a/backends/fs/abstract-fs.h
+++ b/backends/fs/abstract-fs.h
@@ -24,7 +24,6 @@
 
 #include "common/array.h"
 #include "common/str.h"
-
 #include "common/fs.h"
 
 class AbstractFilesystemNode;
diff --git a/backends/fs/amigaos4/AmigaOSFilesystemFactory.cpp b/backends/fs/amigaos4/amigaos4-fs-factory.cpp
index 2f26491788..abb0790c18 100644
--- a/backends/fs/amigaos4/AmigaOSFilesystemFactory.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/amigaos4/AmigaOSFilesystemFactory.h"
+#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
 #include "backends/fs/amigaos4/amigaos4-fs.cpp"
 
 AmigaOSFilesystemFactory *AmigaOSFilesystemFactory::_instance = 0;
diff --git a/backends/fs/amigaos4/AmigaOSFilesystemFactory.h b/backends/fs/amigaos4/amigaos4-fs-factory.h
index 8eea952831..4b34cc1954 100644
--- a/backends/fs/amigaos4/AmigaOSFilesystemFactory.h
+++ b/backends/fs/amigaos4/amigaos4-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef AMIGAOSFILESYSTEMFACTORY_H_
-#define AMIGAOSFILESYSTEMFACTORY_H_
+#ifndef AMIGAOS_FILESYSTEM_FACTORY_H
+#define AMIGAOS_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates AmigaOSFilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of AmigaOSFilesytemFactory.
 	 */
 	static AmigaOSFilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~AmigaOSFilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static AmigaOSFilesystemFactory *_instance;
 };
 
-#endif /*AMIGAOSFILESYSTEMFACTORY_H_*/
+#endif /*AMIGAOS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/dc/RoninCDFilesystemFactory.cpp b/backends/fs/dc/ronincd-fs-factory.cpp
index 1914745368..92b2c5f7bb 100644
--- a/backends/fs/dc/RoninCDFilesystemFactory.cpp
+++ b/backends/fs/dc/ronincd-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/dc/RoninCDFilesystemFactory.h"
+#include "backends/fs/dc/ronincd-fs-factory.h"
 #include "backends/fs/dc/dc-fs.cpp"
 
 RoninCDFilesystemFactory *RoninCDFilesystemFactory::_instance = 0;
diff --git a/backends/fs/dc/RoninCDFilesystemFactory.h b/backends/fs/dc/ronincd-fs-factory.h
index a063ce1d6a..02cfe66c82 100644
--- a/backends/fs/dc/RoninCDFilesystemFactory.h
+++ b/backends/fs/dc/ronincd-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef RONINCDFILESYSTEMFACTORY_H_
-#define RONINCDFILESYSTEMFACTORY_H_
+#ifndef RONINCD_FILESYSTEM_FACTORY_H
+#define RONINCD_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates RoninCDFilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of RoninCDFilesytemFactory.
 	 */
 	static RoninCDFilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~RoninCDFilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static RoninCDFilesystemFactory *_instance;
 };
 
-#endif /*RONINCDFILESYSTEMFACTORY_H_*/
+#endif /*RONINCD_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/ds/DSFilesystemFactory.cpp b/backends/fs/ds/ds-fs-factory.cpp
index 809dc0e5cf..1855fbc40d 100644
--- a/backends/fs/ds/DSFilesystemFactory.cpp
+++ b/backends/fs/ds/ds-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/ds/DSFilesystemFactory.h"
+#include "backends/fs/ds/ds-fs-factory.h"
 #include "backends/fs/ds/ds-fs.cpp"
 #include "dsmain.h" //for the isGBAMPAvailable() function
 
diff --git a/backends/fs/ds/DSFilesystemFactory.h b/backends/fs/ds/ds-fs-factory.h
index 6eaef1cd1e..5e96edc390 100644
--- a/backends/fs/ds/DSFilesystemFactory.h
+++ b/backends/fs/ds/ds-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef DSFILESYSTEMFACTORY_H_
-#define DSFILESYSTEMFACTORY_H_
+#ifndef DS_FILESYSTEM_FACTORY_H
+#define DS_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates DSFilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of DSFilesytemFactory.
 	 */
 	static DSFilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~DSFilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static DSFilesystemFactory *_instance;
 };
 
-#endif /*DSFILESYSTEMFACTORY_H_*/
+#endif /*DS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/FilesystemFactoryMaker.cpp b/backends/fs/fs-factory-maker.cpp
index 66a1c8c0c4..636a39b5e3 100644
--- a/backends/fs/FilesystemFactoryMaker.cpp
+++ b/backends/fs/fs-factory-maker.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /*
  * All the following includes choose, at compile time, which specific backend will be used
@@ -8,47 +8,47 @@
  * all build environments. Additionally, this results in smaller binaries.
  */
 #if defined(__amigaos4__)
-	#include "backends/fs/amigaos4/AmigaOSFilesystemFactory.cpp"
+	#include "backends/fs/amigaos4/amigaos4-fs-factory.cpp"
 #endif
  
 #if defined(__DC__)
-	#include "backends/fs/dc/RoninCDFilesystemFactory.cpp"
+	#include "backends/fs/dc/ronincd-fs-factory.cpp"
 #endif
 
 #if defined(__DS__)
-	#include "backends/fs/ds/DSFilesystemFactory.cpp"
+	#include "backends/fs/ds/ds-fs-factory.cpp"
 #endif
 
 #if defined(__GP32__)
-	#include "backends/fs/gp32/GP32FilesystemFactory.cpp"
+	#include "backends/fs/gp32/gp32-fs-factory.cpp"
 #endif
 
 #if defined(__MORPHOS__)
-	#include "backends/fs/morphos/ABoxFilesystemFactory.cpp"
+	#include "backends/fs/morphos/abox-fs-factory.cpp"
 #endif
 
 #if defined(PALMOS_MODE)
-	#include "backends/fs/palmos/PalmOSFilesystemFactory.cpp"
+	#include "backends/fs/palmos/palmos-fs-factory.cpp"
 #endif
 
 #if defined(__PLAYSTATION2__)
-	#include "backends/fs/ps2/Ps2FilesystemFactory.cpp"
+	#include "backends/fs/ps2/ps2-fs-factory.cpp"
 #endif
 
 #if defined(__PSP__)
-	#include "backends/fs/psp/PSPFilesystemFactory.cpp"
+	#include "backends/fs/psp/psp-fs-factory.cpp"
 #endif
 
 #if defined(__SYMBIAN32__)
-	#include "backends/fs/symbian/SymbianFilesystemFactory.cpp"
+	#include "backends/fs/symbian/symbian-fs-factory.cpp"
 #endif
 
 #if defined(UNIX)
-	#include "backends/fs/posix/POSIXFilesystemFactory.cpp"
+	#include "backends/fs/posix/posix-fs-factory.cpp"
 #endif
 
 #if defined(WIN32)
-	#include "backends/fs/windows/WindowsFilesystemFactory.cpp"
+	#include "backends/fs/windows/windows-fs-factory.cpp"
 #endif
 
 /**
diff --git a/backends/fs/gp32/GP32FilesystemFactory.cpp b/backends/fs/gp32/gp32-fs-factory.cpp
index fa98079a8d..fc19bdf1cf 100644
--- a/backends/fs/gp32/GP32FilesystemFactory.cpp
+++ b/backends/fs/gp32/gp32-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/gp32/GP32FilesystemFactory.h"
+#include "backends/fs/gp32/gp32-fs-factory.h"
 #include "backends/fs/gp32/gp32-fs.cpp"
 
 GP32FilesystemFactory *GP32FilesystemFactory::_instance = 0;
diff --git a/backends/fs/gp32/GP32FilesystemFactory.h b/backends/fs/gp32/gp32-fs-factory.h
index d31642acd2..1b34597d84 100644
--- a/backends/fs/gp32/GP32FilesystemFactory.h
+++ b/backends/fs/gp32/gp32-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef GP32FILESYSTEMFACTORY_H_
-#define GP32FILESYSTEMFACTORY_H_
+#ifndef GP32_FILESYSTEM_FACTORY_H
+#define GP32_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates GP32FilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of GP32FilesytemFactory.
 	 */
 	static GP32FilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~GP32FilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static GP32FilesystemFactory *_instance;
 };
 
-#endif /*GP32FILESYSTEMFACTORY_H_*/
+#endif /*GP32_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/morphos/ABoxFilesystemFactory.cpp b/backends/fs/morphos/abox-fs-factory.cpp
index 02d954ee74..4689a6a42f 100644
--- a/backends/fs/morphos/ABoxFilesystemFactory.cpp
+++ b/backends/fs/morphos/abox-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/morphos/ABoxFilesystemFactory.h"
+#include "backends/fs/morphos/abox-fs-factory.h"
 #include "backends/fs/morphos/abox-fs.cpp"
 
 ABoxFilesystemFactory *ABoxFilesystemFactory::_instance = 0;
diff --git a/backends/fs/morphos/ABoxFilesystemFactory.h b/backends/fs/morphos/abox-fs-factory.h
index c8fc0b3c19..f6cf7774c5 100644
--- a/backends/fs/morphos/ABoxFilesystemFactory.h
+++ b/backends/fs/morphos/abox-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef ABOXFILESYSTEMFACTORY_H_
-#define ABOXFILESYSTEMFACTORY_H_
+#ifndef ABOX_FILESYSTEM_FACTORY_H
+#define ABOX_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates ABoxFilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of ABoxFilesytemFactory.
 	 */
 	static ABoxFilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~ABoxFilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static ABoxFilesystemFactory *_instance;
 };
 
-#endif /*ABOXFILESYSTEMFACTORY_H_*/
+#endif /*ABOX_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/palmos/PalmOSFilesystemFactory.cpp b/backends/fs/palmos/palmos-fs-factory.cpp
index 15240d2397..6be7021f77 100644
--- a/backends/fs/palmos/PalmOSFilesystemFactory.cpp
+++ b/backends/fs/palmos/palmos-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/palmos/PalmOSFilesystemFactory.h"
+#include "backends/fs/palmos/palmos-fs-factory.h"
 #include "backends/fs/palmos/palmos-fs.cpp"
 
 PalmOSFilesystemFactory *PalmOSFilesystemFactory::_instance = 0;
diff --git a/backends/fs/palmos/PalmOSFilesystemFactory.h b/backends/fs/palmos/palmos-fs-factory.h
index dd1f31b3c8..618a1965d9 100644
--- a/backends/fs/palmos/PalmOSFilesystemFactory.h
+++ b/backends/fs/palmos/palmos-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef PALMOSFILESYSTEMFACTORY_H_
-#define PALMOSFILESYSTEMFACTORY_H_
+#ifndef PALMOS_FILESYSTEM_FACTORY_H
+#define PALMOS_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates PalmOSFilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of PalmOSFilesytemFactory.
 	 */
 	static PalmOSFilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~PalmOSFilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static PalmOSFilesystemFactory *_instance;
 };
 
-#endif /*PALMOSFILESYSTEMFACTORY_H_*/
+#endif /*PALMOS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/posix/POSIXFilesystemFactory.cpp b/backends/fs/posix/posix-fs-factory.cpp
index 9a13c37c30..b302bb31e8 100644
--- a/backends/fs/posix/POSIXFilesystemFactory.cpp
+++ b/backends/fs/posix/posix-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/posix/POSIXFilesystemFactory.h"
+#include "backends/fs/posix/posix-fs-factory.h"
 #include "backends/fs/posix/posix-fs.cpp"
 
 POSIXFilesystemFactory *POSIXFilesystemFactory::_instance = 0;
diff --git a/backends/fs/posix/POSIXFilesystemFactory.h b/backends/fs/posix/posix-fs-factory.h
index b471460445..5195491b95 100644
--- a/backends/fs/posix/POSIXFilesystemFactory.h
+++ b/backends/fs/posix/posix-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef POSIXFILESYSTEMFACTORY_H_
-#define POSIXFILESYSTEMFACTORY_H_
+#ifndef POSIX_FILESYSTEM_FACTORY_H
+#define POSIX_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates POSIXFilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of POSIXFilesytemFactory.
 	 */
 	static POSIXFilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~POSIXFilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static POSIXFilesystemFactory *_instance;
 };
 
-#endif /*POSIXFILESYSTEMFACTORY_H_*/
+#endif /*POSIX_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/ps2/Ps2FilesystemFactory.cpp b/backends/fs/ps2/ps2-fs-factory.cpp
index c07387eae1..726eb87c6f 100644
--- a/backends/fs/ps2/Ps2FilesystemFactory.cpp
+++ b/backends/fs/ps2/ps2-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/ps2/Ps2FilesystemFactory.h"
+#include "backends/fs/ps2/ps2-fs-factory.h"
 #include "backends/fs/ps2/ps2-fs.cpp"
 
 Ps2FilesystemFactory *Ps2FilesystemFactory::_instance = 0;
diff --git a/backends/fs/ps2/Ps2FilesystemFactory.h b/backends/fs/ps2/ps2-fs-factory.h
index e394865e80..de7ada6ba3 100644
--- a/backends/fs/ps2/Ps2FilesystemFactory.h
+++ b/backends/fs/ps2/ps2-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef PS2FILESYSTEMFACTORY_H_
-#define PS2FILESYSTEMFACTORY_H_
+#ifndef PS2_FILESYSTEM_FACTORY_H
+#define PS2_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates PS2FilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of Ps2FilesytemFactory.
 	 */
 	static Ps2FilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~Ps2FilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static Ps2FilesystemFactory *_instance;
 };
 
-#endif /*PS2FILESYSTEMFACTORY_H_*/
+#endif /*PS2_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/psp/PSPFilesystemFactory.cpp b/backends/fs/psp/psp-fs-factory.cpp
index 5a3802c10a..2a0307d3f4 100644
--- a/backends/fs/psp/PSPFilesystemFactory.cpp
+++ b/backends/fs/psp/psp-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/psp/PSPFilesystemFactory.h"
+#include "backends/fs/psp/psp-fs-factory.h"
 #include "backends/fs/psp/psp_fs.cpp"
 
 PSPFilesystemFactory *PSPFilesystemFactory::_instance = 0;
diff --git a/backends/fs/psp/PSPFilesystemFactory.h b/backends/fs/psp/psp-fs-factory.h
index 70358c90ed..05388fa697 100644
--- a/backends/fs/psp/PSPFilesystemFactory.h
+++ b/backends/fs/psp/psp-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef PSPFILESYSTEMFACTORY_H_
-#define PSPFILESYSTEMFACTORY_H_
+#ifndef PSP_FILESYSTEM_FACTORY_H
+#define PSP_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates PSPFilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of PSPFilesytemFactory.
 	 */
 	static PSPFilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~PSPFilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static PSPFilesystemFactory *_instance;
 };
 
-#endif /*PSPFILESYSTEMFACTORY_H_*/
+#endif /*PSP_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/symbian/SymbianFilesystemFactory.cpp b/backends/fs/symbian/symbian-fs-factory.cpp
index 07da19629c..f3eb552159 100644
--- a/backends/fs/symbian/SymbianFilesystemFactory.cpp
+++ b/backends/fs/symbian/symbian-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/symbian/SymbianFilesystemFactory.h"
+#include "backends/fs/symbian/symbian-fs-factory.h"
 #include "backends/fs/symbian/symbian-fs.cpp"
 
 SymbianFilesystemFactory *SymbianFilesystemFactory::_instance = 0;
diff --git a/backends/fs/symbian/SymbianFilesystemFactory.h b/backends/fs/symbian/symbian-fs-factory.h
index b1d4b81250..4bbac728cb 100644
--- a/backends/fs/symbian/SymbianFilesystemFactory.h
+++ b/backends/fs/symbian/symbian-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef SYMBIANFILESYSTEMFACTORY_H_
-#define SYMBIANFILESYSTEMFACTORY_H_
+#ifndef SYMBIAN_FILESYSTEM_FACTORY_H
+#define SYMBIAN_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates SymbianFilesystemNode objects.
@@ -18,11 +18,6 @@ public:
 	 * @return A unique instance of SymbianFilesytemFactory.
 	 */
 	static SymbianFilesystemFactory *instance();
-	
-	/**
-	 * Destructor.
-	 */
-	virtual ~SymbianFilesystemFactory() {};
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -35,4 +30,4 @@ private:
 	static SymbianFilesystemFactory *_instance;
 };
 
-#endif /*SYMBIANFILESYSTEMFACTORY_H_*/
+#endif /*SYMBIAN_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/windows/WindowsFilesystemFactory.cpp b/backends/fs/windows/windows-fs-factory.cpp
index a360fd1c7a..fb77b4ca07 100644
--- a/backends/fs/windows/WindowsFilesystemFactory.cpp
+++ b/backends/fs/windows/windows-fs-factory.cpp
@@ -1,4 +1,4 @@
-#include "backends/fs/windows/WindowsFilesystemFactory.h"
+#include "backends/fs/windows/windows-fs-factory.h"
 #include "backends/fs/windows/windows-fs.cpp"
 
 WindowsFilesystemFactory *WindowsFilesystemFactory::_instance = 0;
diff --git a/backends/fs/windows/WindowsFilesystemFactory.h b/backends/fs/windows/windows-fs-factory.h
index 0d965089c4..a7abf390ae 100644
--- a/backends/fs/windows/WindowsFilesystemFactory.h
+++ b/backends/fs/windows/windows-fs-factory.h
@@ -1,7 +1,7 @@
-#ifndef WINDOWSFILESYSTEMFACTORY_H_
-#define WINDOWSFILESYSTEMFACTORY_H_
+#ifndef WINDOWS_FILESYSTEM_FACTORY_H
+#define WINDOWS_FILESYSTEM_FACTORY_H
 
-#include "backends/fs/AbstractFilesystemFactory.h"
+#include "backends/fs/abstract-fs-factory.h"
 
 /**
  * Creates WindowsFilesystemNode objects.
@@ -19,11 +19,6 @@ public:
 	 */
 	static WindowsFilesystemFactory *instance();
 	
-	/**
-	 * Destructor.
-	 */
-	virtual ~WindowsFilesystemFactory() {};
-	
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
 	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
@@ -35,4 +30,4 @@ private:
 	static WindowsFilesystemFactory *_instance;
 };
 
-#endif /*WINDOWSFILESYSTEMFACTORY_H_*/
+#endif /*WINDOWS_FILESYSTEM_FACTORY_H*/