diff --git a/src/Dialog_CueImport.h b/src/Dialog_CueImport.h
index 45cbfa9a..09b48128 100644
--- a/src/Dialog_CueImport.h
+++ b/src/Dialog_CueImport.h
@@ -47,7 +47,7 @@ public:
 	int exec(void);
 
 protected:
-	void CueImportDialog::showEvent(QShowEvent *event);
+	void showEvent(QShowEvent *event);
 
 private slots:
 	void browseButtonClicked(void);
diff --git a/src/Model_CueSheet.h b/src/Model_CueSheet.h
index a429c852..df45e960 100644
--- a/src/Model_CueSheet.h
+++ b/src/Model_CueSheet.h
@@ -61,7 +61,7 @@ public:
 	void clearData(void);
 
 	//External API
-	int CueSheetModel::getFileCount(void);
+	int getFileCount(void);
 	QString getFileName(int fileIndex);
 	int getTrackCount(int fileIndex);
 	const AudioFileModel_MetaInfo *getTrackInfo(int fileIndex, int trackIndex);
diff --git a/src/Model_Progress.h b/src/Model_Progress.h
index f0344f2d..d5faa765 100644
--- a/src/Model_Progress.h
+++ b/src/Model_Progress.h
@@ -69,7 +69,7 @@ public:
 	const QStringList &getLogFile(const QModelIndex &index) const;
 	const QUuid &getJobId(const QModelIndex &index) const;
 	const JobState getJobState(const QModelIndex &index) const;
-	const QIcon &ProgressModel::getIcon(ProgressModel::JobState state) const;
+	const QIcon &getIcon(ProgressModel::JobState state) const;
 	void restoreHiddenItems(void);
 
 public slots:
diff --git a/src/PlaylistImporter.h b/src/PlaylistImporter.h
index 9d7c2b5c..a42a2f32 100644
--- a/src/PlaylistImporter.h
+++ b/src/PlaylistImporter.h
@@ -52,5 +52,5 @@ private:
 
 	static playlist_t isPlaylist(const QString &fileName);
 	static void fixFilePath(QFileInfo &filename, const QDir &baseDir, const QDir &rootDir);
-	static QString &PlaylistImporter::unescapeXml(QString &str);
+	static QString &unescapeXml(QString &str);
 };
diff --git a/src/Registry_Decoder.h b/src/Registry_Decoder.h
index 5a267160..b7535ae4 100644
--- a/src/Registry_Decoder.h
+++ b/src/Registry_Decoder.h
@@ -36,5 +36,5 @@ class DecoderRegistry : public QObject
 public:
 	static void configureDecoders(const SettingsModel *settings);
 	static AbstractDecoder *lookup(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion);
-	static QStringList DecoderRegistry::getSupportedTypes(void);
+	static QStringList getSupportedTypes(void);
 };
diff --git a/src/Registry_Encoder.cpp b/src/Registry_Encoder.cpp
index c8fbf577..6a2e1227 100644
--- a/src/Registry_Encoder.cpp
+++ b/src/Registry_Encoder.cpp
@@ -377,7 +377,7 @@ while(0)
 } \
 while(0)
 
-void EncoderRegistry::saveEncoderCustomParams(SettingsModel *settings, const int encoderId, const QString params)
+void EncoderRegistry::saveEncoderCustomParams(SettingsModel *settings, const int encoderId, const QString &params)
 {
 	//Store the encoder bitrate/quality value
 	switch(encoderId)
diff --git a/src/Registry_Encoder.h b/src/Registry_Encoder.h
index 98664712..20f3345d 100644
--- a/src/Registry_Encoder.h
+++ b/src/Registry_Encoder.h
@@ -42,7 +42,7 @@ public:
 	static void saveEncoderValue(SettingsModel *settings, const int encoderId, const int rcMode, const int value);
 	static int loadEncoderValue(const SettingsModel *settings, const int encoderId, const int rcMode);
 
-	static void saveEncoderCustomParams(SettingsModel *settings, const int encoderId, const QString params);
+	static void saveEncoderCustomParams(SettingsModel *settings, const int encoderId, const QString &params);
 	static QString loadEncoderCustomParams(const SettingsModel *settings, const int encoderId);
 
 	static void resetAllEncoders(SettingsModel *settings);