diff --git a/plugins/HydrogenImport/CMakeLists.txt b/plugins/HydrogenImport/CMakeLists.txt
index 27e8d6a4de9..34f4d43aea6 100644
--- a/plugins/HydrogenImport/CMakeLists.txt
+++ b/plugins/HydrogenImport/CMakeLists.txt
@@ -1,4 +1,4 @@
 INCLUDE(BuildPlugin)
 
-BUILD_PLUGIN(hydrogenimport HydrogenImport.cpp HydrogenImport.h local_file_mgr.cpp LocalFileMng.h)
+BUILD_PLUGIN(hydrogenimport HydrogenImport.cpp HydrogenImport.h LocalFileMng.cpp LocalFileMng.h)
 
diff --git a/plugins/HydrogenImport/HydrogenImport.cpp b/plugins/HydrogenImport/HydrogenImport.cpp
index 144a2f5e75e..6a81b507ddb 100644
--- a/plugins/HydrogenImport/HydrogenImport.cpp
+++ b/plugins/HydrogenImport/HydrogenImport.cpp
@@ -1,7 +1,8 @@
+#include "HydrogenImport.h"
+
 #include <QDomDocument>
 
 #include "LocalFileMng.h"
-#include "HydrogenImport.h"
 #include "Song.h"
 #include "Engine.h"
 #include "Instrument.h"
diff --git a/plugins/HydrogenImport/local_file_mgr.cpp b/plugins/HydrogenImport/LocalFileMng.cpp
similarity index 97%
rename from plugins/HydrogenImport/local_file_mgr.cpp
rename to plugins/HydrogenImport/LocalFileMng.cpp
index 22744050157..c4d11c7e2e4 100644
--- a/plugins/HydrogenImport/local_file_mgr.cpp
+++ b/plugins/HydrogenImport/LocalFileMng.cpp
@@ -1,12 +1,11 @@
-#include <sys/stat.h>
+#include "LocalFileMng.h"
+
 #include <cctype>
 
 #include <QDomDocument>
 #include <QFile>
 #include <QLocale>
-#include <QTextCodec>
 
-#include "LocalFileMng.h"
 
 namespace lmms
 {
@@ -197,10 +196,7 @@ QDomDocument LocalFileMng::openXmlDocument( const QString& filename )
 		return QDomDocument();
 
 	if( TinyXMLCompat ) {
-	    QString enc = QTextCodec::codecForLocale()->name();
-	    if( enc == QString("System") ) {
-		    enc = "UTF-8";
-	    }
+		const QString enc = "UTF-8"; // unknown encoding, so assume utf-8 and call it a day
 	    QByteArray line;
 	    QByteArray buf = QString("<?xml version='1.0' encoding='%1' ?>\n")
 		.arg( enc )
diff --git a/plugins/HydrogenImport/LocalFileMng.h b/plugins/HydrogenImport/LocalFileMng.h
index 0aaf7d1c855..1260dbfdd82 100644
--- a/plugins/HydrogenImport/LocalFileMng.h
+++ b/plugins/HydrogenImport/LocalFileMng.h
@@ -14,12 +14,6 @@ namespace lmms
 class LocalFileMng
 {
 public:
-	LocalFileMng();
-	~LocalFileMng();
-	std::vector<QString> getallPatternList(){
-		return m_allPatternList;
-	}
-
 	static QString readXmlString( QDomNode , const QString& nodeName, const QString& defaultValue, bool bCanBeEmpty = false, bool bShouldExists = true , bool tinyXmlCompatMode = false);
 	static float readXmlFloat( QDomNode , const QString& nodeName, float defaultValue, bool bCanBeEmpty = false, bool bShouldExists = true , bool tinyXmlCompatMode = false);
 	static int readXmlInt( QDomNode , const QString& nodeName, int defaultValue, bool bCanBeEmpty = false, bool bShouldExists = true , bool tinyXmlCompatMode = false);
@@ -27,7 +21,6 @@ class LocalFileMng
 	static void convertFromTinyXMLString( QByteArray* str );
 	static bool checkTinyXMLCompatMode( const QString& filename );
 	static QDomDocument openXmlDocument( const QString& filename );
-	std::vector<QString> m_allPatternList;
 };