diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index df2987c96..79e2a5c0d 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -72,7 +72,9 @@ configManager::configManager( void ) :
 #endif
 	m_vstDir( m_workingDir + "vst" + QDir::separator() ),
 	m_flDir( QDir::home().absolutePath() ),
+#ifdef LMMS_HAVE_FLUIDSYNTH
 	m_defaultSoundfont( NULL ),
+#endif
     m_lameLibrary( defaultLameLibrary() )
 {
 }
@@ -82,7 +84,11 @@ configManager::configManager( void ) :
 
 configManager::~configManager()
 {
+
+#ifdef LMMS_HAVE_FLUIDSYNTH
 	delete m_defaultSoundfont;
+#endif
+
 }
 
 
diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp
index 983fbd32b..7f747f676 100644
--- a/src/core/track_container.cpp
+++ b/src/core/track_container.cpp
@@ -239,3 +239,4 @@ dummyTrackContainer::dummyTrackContainer( void ) :
 
 #include "moc_track_container.cxx"
 
+/* vim: set tw=0 noexpandtab: */
diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp
index db2c80c0c..6b90b3b6e 100644
--- a/src/gui/song_editor.cpp
+++ b/src/gui/song_editor.cpp
@@ -496,3 +496,5 @@ bool songEditor::allowRubberband( void ) const
 
 
 #endif
+
+/* vim: set tw=0 noexpandtab: */