diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp
index 1c36b5c4b..6567b2f58 100644
--- a/plugins/flp_import/FlpImport.cpp
+++ b/plugins/flp_import/FlpImport.cpp
@@ -2027,7 +2027,8 @@ extern "C"
 // neccessary for getting instance out of shared lib
 Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 {
-	return new FlpImport( static_cast<const char *>( _data ) );
+	return new FlpImport( QString::fromUtf8(
+									static_cast<const char *>( _data ) ) );
 }
 
 }
diff --git a/plugins/midi_import/MidiImport.cpp b/plugins/midi_import/MidiImport.cpp
index 15463c043..f2e62b058 100644
--- a/plugins/midi_import/MidiImport.cpp
+++ b/plugins/midi_import/MidiImport.cpp
@@ -572,12 +572,10 @@ extern "C"
 // neccessary for getting instance out of shared lib
 Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 {
-	return new MidiImport( static_cast<const char *>( _data ) );
+	return new MidiImport( QString::fromUtf8(
+									static_cast<const char *>( _data ) ) );
 }
 
 
 }
 
-
-#undef pos
-#undef setValue
diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp
index 3c16402d4..0bb8a887b 100644
--- a/plugins/patman/patman.cpp
+++ b/plugins/patman/patman.cpp
@@ -215,7 +215,7 @@ patmanInstrument::LoadErrors patmanInstrument::loadPatch(
 {
 	unloadCurrentPatch();
 
-	FILE * fd = fopen( _filename.toAscii().constData() , "rb" );
+	FILE * fd = fopen( _filename.toUtf8().constData() , "rb" );
 	if( !fd )
 	{
 		perror( "fopen" );
diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp
index 9c7795039..5f6c1008c 100644
--- a/src/gui/embed.cpp
+++ b/src/gui/embed.cpp
@@ -93,18 +93,18 @@ QPixmap getIconPixmap( const char * _name, int _w, int _h )
 
 		// Save to cache and return
 		s_pixmapCache.insert( _name, p );
-		return( p );
+		return p;
 	}
 
-	return( getIconPixmap( _name ).scaled( _w, _h, Qt::IgnoreAspectRatio,
-	        Qt::SmoothTransformation ) );
+	return getIconPixmap( _name ).
+			scaled( _w, _h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
 }
 
 
 QString getText( const char * _name )
 {
 	const embed::descriptor & e = findEmbeddedData( _name );
-	return( QString::fromLatin1( (const char *) e.data, e.size ) );
+	return QString::fromUtf8( (const char *) e.data, e.size );
 }