diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h
index e6d098aee..88438a105 100644
--- a/include/AudioAlsa.h
+++ b/include/AudioAlsa.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUDIO_ALSA_H
-#define _AUDIO_ALSA_H
+#ifndef AUDIO_ALSA_H
+#define AUDIO_ALSA_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/AudioDevice.h b/include/AudioDevice.h
index 13e7d8cd4..ce83c3996 100644
--- a/include/AudioDevice.h
+++ b/include/AudioDevice.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUDIO_DEVICE_H
-#define _AUDIO_DEVICE_H
+#ifndef AUDIO_DEVICE_H
+#define AUDIO_DEVICE_H
 
 #include <QtCore/QPair>
 #include <QtCore/QMutex>
diff --git a/include/AudioDummy.h b/include/AudioDummy.h
index 182d40250..31781e049 100644
--- a/include/AudioDummy.h
+++ b/include/AudioDummy.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUDIO_DUMMY_H
-#define _AUDIO_DUMMY_H
+#ifndef AUDIO_DUMMY_H
+#define AUDIO_DUMMY_H
 
 #include "AudioDevice.h"
 #include "MicroTimer.h"
diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h
index 4fddad24e..a50ff31fc 100644
--- a/include/AudioFileDevice.h
+++ b/include/AudioFileDevice.h
@@ -1,5 +1,5 @@
 /*
- * AudioFileDevice.h - base-class for audio-device-classes which write 
+ * AudioFileDevice.h - base-class for audio-device-classes which write
  *                     their output into a file
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _AUDIO_FILE_DEVICE_H
-#define _AUDIO_FILE_DEVICE_H
+#ifndef AUDIO_FILE_DEVICE_H
+#define AUDIO_FILE_DEVICE_H
 
 #include <QtCore/QFile>
 
diff --git a/include/AudioFileOgg.h b/include/AudioFileOgg.h
index 08b3905ad..bae5648de 100644
--- a/include/AudioFileOgg.h
+++ b/include/AudioFileOgg.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _AUDIO_FILE_OGG_H
-#define _AUDIO_FILE_OGG_H
+#ifndef AUDIO_FILE_OGG_H
+#define AUDIO_FILE_OGG_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/AudioFileWave.h b/include/AudioFileWave.h
index e2a7521c8..223479eb3 100644
--- a/include/AudioFileWave.h
+++ b/include/AudioFileWave.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _AUDIO_FILE_WAVE_H
-#define _AUDIO_FILE_WAVE_H
+#ifndef AUDIO_FILE_WAVE_H
+#define AUDIO_FILE_WAVE_H
 
 #include "lmmsconfig.h"
 #include "AudioFileDevice.h"
diff --git a/include/AudioJack.h b/include/AudioJack.h
index 1377fdd20..32f658399 100644
--- a/include/AudioJack.h
+++ b/include/AudioJack.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUDIO_JACK_H
-#define _AUDIO_JACK_H
+#ifndef AUDIO_JACK_H
+#define AUDIO_JACK_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/AudioOss.h b/include/AudioOss.h
index db9712b72..b40edd58e 100644
--- a/include/AudioOss.h
+++ b/include/AudioOss.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUDIO_OSS_H
-#define _AUDIO_OSS_H
+#ifndef AUDIO_OSS_H
+#define AUDIO_OSS_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h
index 110074df3..07993d434 100644
--- a/include/AudioPortAudio.h
+++ b/include/AudioPortAudio.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUDIO_PORTAUDIO_H
-#define _AUDIO_PORTAUDIO_H
+#ifndef AUDIO_PORTAUDIO_H
+#define AUDIO_PORTAUDIO_H
 
 #include <QtCore/QObject>
 
@@ -36,7 +36,7 @@ class AudioPortAudioSetupUtil : public QObject
 public slots:
 	void updateDevices();
 	void updateChannels();
-		
+
 public:
 	ComboBoxModel m_backendModel;
 	ComboBoxModel m_deviceModel;
@@ -119,7 +119,7 @@ private:
 
 	typedef double PaTime;
 	typedef PaDeviceID PaDeviceIndex;
-	
+
 	typedef struct PaStreamParameters
 	{
 		PaDeviceIndex device;
@@ -136,7 +136,7 @@ private:
 	PaStreamParameters m_inputParameters;
 
 	bool m_wasPAInitError;
- 
+
 	surroundSampleFrame * m_outBuf;
 	int m_outBufPos;
 	int m_outBufSize;
diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h
index 2a3c17a27..f8893733c 100644
--- a/include/AudioPulseAudio.h
+++ b/include/AudioPulseAudio.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUDIO_PULSEAUDIO_H
-#define _AUDIO_PULSEAUDIO_H
+#ifndef AUDIO_PULSEAUDIO_H
+#define AUDIO_PULSEAUDIO_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h
index a45c6e6c3..f6c196dd2 100644
--- a/include/AudioSampleRecorder.h
+++ b/include/AudioSampleRecorder.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _AUDIO_SAMPLE_RECORDER_H
-#define _AUDIO_SAMPLE_RECORDER_H
+#ifndef AUDIO_SAMPLE_RECORDER_H
+#define AUDIO_SAMPLE_RECORDER_H
 
 #include <QtCore/QList>
 #include <QtCore/QPair>
diff --git a/include/AudioSdl.h b/include/AudioSdl.h
index f5aac8178..15facb52a 100644
--- a/include/AudioSdl.h
+++ b/include/AudioSdl.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUDIO_SDL_H
-#define _AUDIO_SDL_H
+#ifndef AUDIO_SDL_H
+#define AUDIO_SDL_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h
index d470320a1..471106dc4 100644
--- a/include/AutomatableModelView.h
+++ b/include/AutomatableModelView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _AUTOMATABLE_MODEL_VIEW_H
-#define _AUTOMATABLE_MODEL_VIEW_H
+#ifndef AUTOMATABLE_MODEL_VIEW_H
+#define AUTOMATABLE_MODEL_VIEW_H
 
 #include "ModelView.h"
 #include "AutomatableModel.h"
diff --git a/include/Clipboard.h b/include/Clipboard.h
index a49cce3bd..8237c49c0 100644
--- a/include/Clipboard.h
+++ b/include/Clipboard.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _CLIPBOARD_H
-#define _CLIPBOARD_H
+#ifndef CLIPBOARD_H
+#define CLIPBOARD_H
 
 #include <QtCore/QMap>
 #include <QDomElement>
diff --git a/include/ComboBoxModel.h b/include/ComboBoxModel.h
index 5c3aa2062..8c1e64c83 100644
--- a/include/ComboBoxModel.h
+++ b/include/ComboBoxModel.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _COMBOBOX_MODEL_H
-#define _COMBOBOX_MODEL_H
+#ifndef COMBOBOX_MODEL_H
+#define COMBOBOX_MODEL_H
 
 #include <QtCore/QVector>
 #include <QtCore/QPair>
diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h
index 61505bc77..d28b4e305 100644
--- a/include/ControllerConnectionDialog.h
+++ b/include/ControllerConnectionDialog.h
@@ -3,7 +3,7 @@
  *	modify links between controllers and models
  *
  * Copyright (c) 2008  Paul Giblock <drfaygo/at/gmail.com>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _CONTROLLER_CONNECTION_DIALOG_H
-#define _CONTROLLER_CONNECTION_DIALOG_H
+#ifndef CONTROLLER_CONNECTION_DIALOG_H
+#define CONTROLLER_CONNECTION_DIALOG_H
 
 #include <QDialog>
 #include <QSortFilterProxyModel>
@@ -94,7 +94,7 @@ private:
 	Controller * m_controller;
 	const AutomatableModel * m_targetModel;
 
-	// Temporary midiController 
+	// Temporary midiController
 	AutoDetectMidiController * m_midiController;
 } ;
 
diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h
index bea095b70..dc28783df 100644
--- a/include/ControllerDialog.h
+++ b/include/ControllerDialog.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _CONTROLLER_DIALOG_H
-#define _CONTROLLER_DIALOG_H
+#ifndef CONTROLLER_DIALOG_H
+#define CONTROLLER_DIALOG_H
 
 #include <QWidget>
 
diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h
index c3bcfce5f..3a64ff867 100644
--- a/include/ControllerRackView.h
+++ b/include/ControllerRackView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _CONTROLLER_RACK_VIEW_H
-#define _CONTROLLER_RACK_VIEW_H
+#ifndef CONTROLLER_RACK_VIEW_H
+#define CONTROLLER_RACK_VIEW_H
 
 #include <QWidget>
 
diff --git a/include/ControllerView.h b/include/ControllerView.h
index e94f2eb0d..9e40590b2 100644
--- a/include/ControllerView.h
+++ b/include/ControllerView.h
@@ -2,7 +2,7 @@
  * ControllerView.h - view-component for an control
  *
  * Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail.com>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _CONTROLLER_VIEW_H
-#define _CONTROLLER_VIEW_H
+#ifndef CONTROLLER_VIEW_H
+#define CONTROLLER_VIEW_H
 
 #include <QWidget>
 
@@ -45,7 +45,7 @@ class ControllerView : public QWidget, public ModelView
 public:
 	ControllerView( Controller * _controller, QWidget * _parent );
 	virtual ~ControllerView();
-	
+
 	inline Controller * getController()
 	{
 		return( castModel<Controller>() );
@@ -63,7 +63,7 @@ public slots:
 	void displayHelp();
 	void closeControls();
 
-	
+
 signals:
 	void deleteController( ControllerView * _view );
 
diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h
index 76000f459..c3ba12f83 100644
--- a/include/DummyInstrument.h
+++ b/include/DummyInstrument.h
@@ -3,7 +3,7 @@
  *                     be loaded
  *
  * Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _DUMMY_INSTRUMENT_H
-#define _DUMMY_INSTRUMENT_H
+#ifndef DUMMY_INSTRUMENT_H
+#define DUMMY_INSTRUMENT_H
 
 #include "Instrument.h"
 #include "InstrumentView.h"
diff --git a/include/DummyPlugin.h b/include/DummyPlugin.h
index 550bc3899..42f57c19c 100644
--- a/include/DummyPlugin.h
+++ b/include/DummyPlugin.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _DUMMY_PLUGIN_H
-#define _DUMMY_PLUGIN_H
+#ifndef DUMMY_PLUGIN_H
+#define DUMMY_PLUGIN_H
 
 #include "Plugin.h"
 #include "PluginView.h"
diff --git a/include/EffectChain.h b/include/EffectChain.h
index 6786d200d..858938b02 100644
--- a/include/EffectChain.h
+++ b/include/EffectChain.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _EFFECT_CHAIN_H
-#define _EFFECT_CHAIN_H
+#ifndef EFFECT_CHAIN_H
+#define EFFECT_CHAIN_H
 
 #include "Model.h"
 #include "SerializingObject.h"
diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h
index 482df22bc..2338b5607 100644
--- a/include/EffectControlDialog.h
+++ b/include/EffectControlDialog.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _EFFECT_CONTROL_DIALOG_H
-#define _EFFECT_CONTROL_DIALOG_H
+#ifndef EFFECT_CONTROL_DIALOG_H
+#define EFFECT_CONTROL_DIALOG_H
 
 #include <QWidget>
 
diff --git a/include/EffectControls.h b/include/EffectControls.h
index 410bf83c2..d97bf1c99 100644
--- a/include/EffectControls.h
+++ b/include/EffectControls.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _EFFECT_CONTROLS_H
-#define _EFFECT_CONTROLS_H
+#ifndef EFFECT_CONTROLS_H
+#define EFFECT_CONTROLS_H
 
 #include "Model.h"
 #include "JournallingObject.h"
diff --git a/include/EffectRackView.h b/include/EffectRackView.h
index 28799d626..a3a82a7ab 100644
--- a/include/EffectRackView.h
+++ b/include/EffectRackView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _EFFECT_RACK_VIEW_H
-#define _EFFECT_RACK_VIEW_H
+#ifndef EFFECT_RACK_VIEW_H
+#define EFFECT_RACK_VIEW_H
 
 #include <QWidget>
 
diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h
index 815c03b57..658966bdf 100644
--- a/include/EffectSelectDialog.h
+++ b/include/EffectSelectDialog.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _EFFECT_SELECT_DIALOG_H
-#define _EFFECT_SELECT_DIALOG_H
+#ifndef EFFECT_SELECT_DIALOG_H
+#define EFFECT_SELECT_DIALOG_H
 
 #include <QDialog>
 #include <QSortFilterProxyModel>
diff --git a/include/EffectView.h b/include/EffectView.h
index feae25ad4..614a43939 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _EFFECT_VIEW_H
-#define _EFFECT_VIEW_H
+#ifndef EFFECT_VIEW_H
+#define EFFECT_VIEW_H
 
 #include "AutomatableModel.h"
 #include "PluginView.h"
@@ -47,7 +47,7 @@ class EffectView : public PluginView
 public:
 	EffectView( Effect * _model, QWidget * _parent );
 	virtual ~EffectView();
-	
+
 	inline Effect * effect()
 	{
 		return castModel<Effect>();
@@ -66,7 +66,7 @@ public slots:
 	void displayHelp();
 	void closeEffects();
 
-	
+
 signals:
 	void moveUp( EffectView * _plugin );
 	void moveDown( EffectView * _plugin );
diff --git a/include/ImportFilter.h b/include/ImportFilter.h
index be1d348e7..44078082b 100644
--- a/include/ImportFilter.h
+++ b/include/ImportFilter.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _IMPORT_FILTER_H
-#define _IMPORT_FILTER_H
+#ifndef IMPORT_FILTER_H
+#define IMPORT_FILTER_H
 
 #include <QtCore/QFile>
 
diff --git a/include/InlineAutomation.h b/include/InlineAutomation.h
index 5ccf44685..9da293574 100644
--- a/include/InlineAutomation.h
+++ b/include/InlineAutomation.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _INLINE_AUTOMATION_H
-#define _INLINE_AUTOMATION_H
+#ifndef INLINE_AUTOMATION_H
+#define INLINE_AUTOMATION_H
 
 #include "AutomationPattern.h"
 #include "shared_object.h"
diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h
index 6d0588561..05c285d18 100644
--- a/include/InstrumentFunctionViews.h
+++ b/include/InstrumentFunctionViews.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _INSTRUMENT_FUNCTION_VIEWS_H
-#define _INSTRUMENT_FUNCTION_VIEWS_H
+#ifndef INSTRUMENT_FUNCTION_VIEWS_H
+#define INSTRUMENT_FUNCTION_VIEWS_H
 
 #include "ModelView.h"
 
diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h
index 4cc5a5fee..d6abef16a 100644
--- a/include/InstrumentFunctions.h
+++ b/include/InstrumentFunctions.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _INSTRUMENT_FUNCTIONS_H
-#define _INSTRUMENT_FUNCTIONS_H
+#ifndef INSTRUMENT_FUNCTIONS_H
+#define INSTRUMENT_FUNCTIONS_H
 
 #include "JournallingObject.h"
 #include "lmms_basics.h"
diff --git a/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h
index 193f81011..90405a414 100644
--- a/include/InstrumentSoundShaping.h
+++ b/include/InstrumentSoundShaping.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _INSTRUMENT_SOUND_SHAPING_H
-#define _INSTRUMENT_SOUND_SHAPING_H
+#ifndef INSTRUMENT_SOUND_SHAPING_H
+#define INSTRUMENT_SOUND_SHAPING_H
 
 #include "Mixer.h"
 #include "ComboBoxModel.h"
diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h
index 6954d7b42..59734ce76 100644
--- a/include/InstrumentSoundShapingView.h
+++ b/include/InstrumentSoundShapingView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _INSTRUMENT_SOUND_SHAPING_VIEW_H
-#define _INSTRUMENT_SOUND_SHAPING_VIEW_H
+#ifndef INSTRUMENT_SOUND_SHAPING_VIEW_H
+#define INSTRUMENT_SOUND_SHAPING_VIEW_H
 
 #include <QWidget>
 
diff --git a/include/InstrumentView.h b/include/InstrumentView.h
index cd40ef42f..c39fc6bcd 100644
--- a/include/InstrumentView.h
+++ b/include/InstrumentView.h
@@ -2,7 +2,7 @@
  * instrument_view.h - definition of instrumentView-class
  *
  * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _INSTRUMENT_VIEW_H
-#define _INSTRUMENT_VIEW_H
+#ifndef INSTRUMENT_VIEW_H
+#define INSTRUMENT_VIEW_H
 
 #include "Instrument.h"
 #include "PluginView.h"
diff --git a/include/JournallingObject.h b/include/JournallingObject.h
index 07055d14f..9e423aa4c 100644
--- a/include/JournallingObject.h
+++ b/include/JournallingObject.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _JOURNALLING_OBJECT_H
-#define _JOURNALLING_OBJECT_H
+#ifndef JOURNALLING_OBJECT_H
+#define JOURNALLING_OBJECT_H
 
 #include <QtCore/QStack>
 
@@ -50,7 +50,7 @@ public:
 
 	void restoreJournallingState()
 	{
-		if( !isJournallingStateStackEmpty()) 
+		if( !isJournallingStateStackEmpty())
 		{
 			m_journalling = m_journallingStateStack.pop();
 		}
diff --git a/include/LadspaBase.h b/include/LadspaBase.h
index 6d6ba35fe..697b999d9 100644
--- a/include/LadspaBase.h
+++ b/include/LadspaBase.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _LADSPA_BASE_H
-#define _LADSPA_BASE_H
+#ifndef LADSPA_BASE_H
+#define LADSPA_BASE_H
 
 #include "ladspa_manager.h"
 #include "Plugin.h"
diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h
index ea7146cf9..f787768b0 100644
--- a/include/LadspaControlView.h
+++ b/include/LadspaControlView.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2006-2008 Danny McRae <khjklujn/at/users.sourceforge.net>
  * Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _LADSPA_CONTROL_VIEW_H
-#define _LADSPA_CONTROL_VIEW_H
+#ifndef LADSPA_CONTROL_VIEW_H
+#define LADSPA_CONTROL_VIEW_H
 
 #include <QWidget>
 
@@ -39,7 +39,7 @@ class EXPORT LadspaControlView : public QWidget, public ModelView
 public:
 	LadspaControlView( QWidget * _parent, LadspaControl * _ctl );
 	virtual ~LadspaControlView();
-	
+
 private:
 	LadspaControl * m_ctl;
 
diff --git a/include/LcdWidget.h b/include/LcdWidget.h
index 5b34f3855..d0105047c 100644
--- a/include/LcdWidget.h
+++ b/include/LcdWidget.h
@@ -2,7 +2,7 @@
  * LcdWidget.h - a widget for displaying numbers in LCD style
  *
  * Copyright (c) 2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _LCD_WIDGET_H
-#define _LCD_WIDGET_H
+#ifndef LCD_WIDGET_H
+#define LCD_WIDGET_H
 
 #include <QtCore/QMap>
 #include <QWidget>
@@ -61,7 +61,7 @@ public slots:
 
 protected:
 	virtual void paintEvent( QPaintEvent * _me );
-	
+
 	virtual void updateSize();
 
 	int cellHeight() const
diff --git a/include/MeterDialog.h b/include/MeterDialog.h
index c82c0e311..e53710630 100644
--- a/include/MeterDialog.h
+++ b/include/MeterDialog.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _METER_DIALOG_H
-#define _METER_DIALOG_H
+#ifndef METER_DIALOG_H
+#define METER_DIALOG_H
 
 #include <QWidget>
 
diff --git a/include/MeterModel.h b/include/MeterModel.h
index 3a3c27ad0..4c3a80409 100644
--- a/include/MeterModel.h
+++ b/include/MeterModel.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _METER_MODEL_H
-#define _METER_MODEL_H
+#ifndef METER_MODEL_H
+#define METER_MODEL_H
 
 #include "AutomatableModel.h"
 
diff --git a/include/MicroTimer.h b/include/MicroTimer.h
index e4d2a9a9f..45cd4f13b 100644
--- a/include/MicroTimer.h
+++ b/include/MicroTimer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MICRO_TIMER
-#define _MICRO_TIMER
+#ifndef MICRO_TIMER
+#define MICRO_TIMER
 
 #include "lmmsconfig.h"
 
diff --git a/include/Midi.h b/include/Midi.h
index d998a3547..70a9ab284 100644
--- a/include/Midi.h
+++ b/include/Midi.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIDI_H
-#define _MIDI_H
+#ifndef MIDI_H
+#define MIDI_H
 
 #include "lmms_basics.h"
 
diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h
index 704b9e09b..2c1a938e6 100644
--- a/include/MidiAlsaRaw.h
+++ b/include/MidiAlsaRaw.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIDI_ALSA_RAW_H
-#define _MIDI_ALSA_RAW_H
+#ifndef MIDI_ALSA_RAW_H
+#define MIDI_ALSA_RAW_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h
index fdc4f2c5b..9e399a011 100644
--- a/include/MidiAlsaSeq.h
+++ b/include/MidiAlsaSeq.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIDI_ALSA_SEQ_H
-#define _MIDI_ALSA_SEQ_H
+#ifndef MIDI_ALSA_SEQ_H
+#define MIDI_ALSA_SEQ_H
 
 #include "lmmsconfig.h"
 
@@ -71,7 +71,7 @@ public:
 	virtual void removePort( MidiPort * _port );
 
 
-	// list seq-ports from ALSA 
+	// list seq-ports from ALSA
 	virtual QStringList readablePorts() const
 	{
 		return m_readablePorts;
@@ -85,7 +85,7 @@ public:
 	// return name of port which specified MIDI event came from
 	virtual QString sourcePortName( const MidiEvent & ) const;
 
-	// (un)subscribe given MidiPort to/from destination-port 
+	// (un)subscribe given MidiPort to/from destination-port
 	virtual void subscribeReadablePort( MidiPort * _port,
 						const QString & _dest,
 						bool _subscribe = true );
diff --git a/include/MidiClient.h b/include/MidiClient.h
index 32c4a3ac3..533c2b5e0 100644
--- a/include/MidiClient.h
+++ b/include/MidiClient.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIDI_CLIENT_H
-#define _MIDI_CLIENT_H
+#ifndef MIDI_CLIENT_H
+#define MIDI_CLIENT_H
 
 #include <QtCore/QStringList>
 #include <QtCore/QVector>
diff --git a/include/MidiDummy.h b/include/MidiDummy.h
index 32eb31d66..c2c07911d 100644
--- a/include/MidiDummy.h
+++ b/include/MidiDummy.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIDI_DUMMY_H
-#define _MIDI_DUMMY_H
+#ifndef MIDI_DUMMY_H
+#define MIDI_DUMMY_H
 
 #include "MidiClient.h"
 
diff --git a/include/MidiOss.h b/include/MidiOss.h
index 468a56d31..83bc6e672 100644
--- a/include/MidiOss.h
+++ b/include/MidiOss.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIDI_OSS_H
-#define _MIDI_OSS_H
+#ifndef MIDI_OSS_H
+#define MIDI_OSS_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/MidiPort.h b/include/MidiPort.h
index 16199fd2b..9312d9272 100644
--- a/include/MidiPort.h
+++ b/include/MidiPort.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _MIDI_PORT_H
-#define _MIDI_PORT_H
+#ifndef MIDI_PORT_H
+#define MIDI_PORT_H
 
 #include <QtCore/QString>
 #include <QtCore/QList>
diff --git a/include/MidiPortMenu.h b/include/MidiPortMenu.h
index 8c6e19054..1bfb196a6 100644
--- a/include/MidiPortMenu.h
+++ b/include/MidiPortMenu.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _MIDI_PORT_MENU_H
-#define _MIDI_PORT_MENU_H
+#ifndef MIDI_PORT_MENU_H
+#define MIDI_PORT_MENU_H
 
 #include <QMenu>
 
diff --git a/include/MidiTime.h b/include/MidiTime.h
index 3523a16f5..5c49f780d 100644
--- a/include/MidiTime.h
+++ b/include/MidiTime.h
@@ -3,7 +3,7 @@
  *              position- and length-variables
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _MIDI_TIME_H
-#define _MIDI_TIME_H
+#ifndef MIDI_TIME_H
+#define MIDI_TIME_H
 
 #include "lmms_basics.h"
 #include "export.h"
diff --git a/include/MidiWinMM.h b/include/MidiWinMM.h
index 2fe7db640..9e5838034 100644
--- a/include/MidiWinMM.h
+++ b/include/MidiWinMM.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIDI_WINMM_H
-#define _MIDI_WINMM_H
+#ifndef MIDI_WINMM_H
+#define MIDI_WINMM_H
 
 #include "lmmsconfig.h"
 
@@ -77,7 +77,7 @@ public:
 	// return name of port which specified MIDI event came from
 	virtual QString sourcePortName( const MidiEvent & ) const;
 
-	// (un)subscribe given MidiPort to/from destination-port 
+	// (un)subscribe given MidiPort to/from destination-port
 	virtual void subscribeReadablePort( MidiPort * _port,
 						const QString & _dest,
 						bool _subscribe = true );
diff --git a/include/Mixer.h b/include/Mixer.h
index a17e7e7ed..508b52951 100644
--- a/include/Mixer.h
+++ b/include/Mixer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MIXER_H
-#define _MIXER_H
+#ifndef MIXER_H
+#define MIXER_H
 
 // denormals stripping
 #ifdef __SSE__
@@ -103,7 +103,7 @@ public:
 			Interpolation_SincFastest,
 			Interpolation_SincMedium,
 			Interpolation_SincBest
-		} ; 
+		} ;
 
 		enum Oversampling
 		{
@@ -309,12 +309,12 @@ public:
 	{
 		m_inputFramesMutex.unlock();
 	}
-	
+
 	void lockPlayHandleRemoval()
 	{
 		m_playHandleRemovalMutex.lock();
 	}
-	
+
 	void unlockPlayHandleRemoval()
 	{
 		m_playHandleRemovalMutex.unlock();
@@ -342,7 +342,7 @@ public:
 	}
 
 	void pushInputFrames( sampleFrame * _ab, const f_cnt_t _frames );
-	
+
 	inline const sampleFrame * inputBuffer()
 	{
 		return m_inputBuffer[ m_inputBufferRead ];
@@ -414,10 +414,10 @@ private:
 	f_cnt_t m_inputBufferSize[2];
 	int m_inputBufferRead;
 	int m_inputBufferWrite;
-	
+
 	surroundSampleFrame * m_readBuf;
 	surroundSampleFrame * m_writeBuf;
-	
+
 	QVector<surroundSampleFrame *> m_bufferPool;
 	int m_readBuffer;
 	int m_writeBuffer;
@@ -428,7 +428,7 @@ private:
 	fpp_t m_halfStart[SURROUND_CHANNELS];
 	bool m_oldBuffer[SURROUND_CHANNELS];
 	bool m_newBuffer[SURROUND_CHANNELS];
-	
+
 	QVector<MixerWorkerThread *> m_workers;
 	int m_numWorkers;
 	QWaitCondition m_queueReadyWaitCond;
@@ -454,7 +454,7 @@ private:
 
 	QMutex m_globalMutex;
 	QMutex m_inputFramesMutex;
-	
+
 	QMutex m_playHandleRemovalMutex;
 
 	fifo * m_fifo;
diff --git a/include/PianoView.h b/include/PianoView.h
index e48088543..24fb40097 100644
--- a/include/PianoView.h
+++ b/include/PianoView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _PIANO_VIEW_H
-#define _PIANO_VIEW_H
+#ifndef PIANO_VIEW_H
+#define PIANO_VIEW_H
 
 #include <QPixmap>
 #include <QScrollBar>
diff --git a/include/Pitch.h b/include/Pitch.h
index 8bb874349..a052f4c8b 100644
--- a/include/Pitch.h
+++ b/include/Pitch.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _PITCH_H
-#define _PITCH_H
+#ifndef PITCH_H
+#define PITCH_H
 
 #include "lmms_basics.h"
 #include "Midi.h"
diff --git a/include/PluginView.h b/include/PluginView.h
index 96b4b885e..9cc128a11 100644
--- a/include/PluginView.h
+++ b/include/PluginView.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _PLUGIN_VIEW_H
-#define _PLUGIN_VIEW_H
+#ifndef PLUGIN_VIEW_H
+#define PLUGIN_VIEW_H
 
 #include <QWidget>
 
diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h
index f1b902f74..04baf2771 100644
--- a/include/ProjectRenderer.h
+++ b/include/ProjectRenderer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _PROJECT_RENDERER_H
-#define _PROJECT_RENDERER_H
+#ifndef PROJECT_RENDERER_H
+#define PROJECT_RENDERER_H
 
 #include "AudioFileDevice.h"
 #include "lmmsconfig.h"
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index 000b37b87..d57a5d293 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _REMOTE_PLUGIN_H
-#define _REMOTE_PLUGIN_H
+#ifndef REMOTE_PLUGIN_H
+#define REMOTE_PLUGIN_H
 
 #include "export.h"
 #include "MidiEvent.h"
diff --git a/include/SampleRecordHandle.h b/include/SampleRecordHandle.h
index 46e0c6bd2..02f554299 100644
--- a/include/SampleRecordHandle.h
+++ b/include/SampleRecordHandle.h
@@ -2,7 +2,7 @@
  * SampleRecordHandle.h - play-handle for recording a sample
  *
  * Copyright (c) 2008 Csaba Hruska <csaba.hruska/at/gmail.com>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _SAMPLE_RECORD_HANDLE_H
-#define _SAMPLE_RECORD_HANDLE_H
+#ifndef SAMPLE_RECORD_HANDLE_H
+#define SAMPLE_RECORD_HANDLE_H
 
 #include <QtCore/QList>
 #include <QtCore/QPair>
diff --git a/include/SerializingObject.h b/include/SerializingObject.h
index 8f7861b28..deb0e08ab 100644
--- a/include/SerializingObject.h
+++ b/include/SerializingObject.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _SERIALIZING_OBJECT_H
-#define _SERIALIZING_OBJECT_H
+#ifndef SERIALIZING_OBJECT_H
+#define SERIALIZING_OBJECT_H
 
 #include <QtCore/QString>
 
diff --git a/include/SideBar.h b/include/SideBar.h
index 6ed8644eb..03c07d1b0 100644
--- a/include/SideBar.h
+++ b/include/SideBar.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _SIDE_BAR_H
-#define _SIDE_BAR_H
+#ifndef SIDE_BAR_H
+#define SIDE_BAR_H
 
 #include <QtCore/QMap>
 #include <QButtonGroup>
diff --git a/include/SideBarWidget.h b/include/SideBarWidget.h
index 7d07f9976..74fae99b3 100644
--- a/include/SideBarWidget.h
+++ b/include/SideBarWidget.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _SIDE_BAR_WIDGET_H
-#define _SIDE_BAR_WIDGET_H
+#ifndef SIDE_BAR_WIDGET_H
+#define SIDE_BAR_WIDGET_H
 
 #include <QPixmap>
 #include <QVBoxLayout>
diff --git a/include/SongEditor.h b/include/SongEditor.h
index 9ff97471e..ff540d221 100644
--- a/include/SongEditor.h
+++ b/include/SongEditor.h
@@ -3,7 +3,7 @@
  *                 setup your songs
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _SONG_EDITOR_H
-#define _SONG_EDITOR_H
+#ifndef SONG_EDITOR_H
+#define SONG_EDITOR_H
 
 #include "TrackContainerView.h"
 
diff --git a/include/SweepOscillator.h b/include/SweepOscillator.h
index 102c2a17f..5779dc6a1 100644
--- a/include/SweepOscillator.h
+++ b/include/SweepOscillator.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _SWEEP_OSCILLATOR_H
-#define _SWEEP_OSCILLATOR_H
+#ifndef SWEEP_OSCILLATOR_H
+#define SWEEP_OSCILLATOR_H
 
 #include "Oscillator.h"
 #include "DspEffectLibrary.h"
diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h
index c7b76f0ad..656e88dc5 100644
--- a/include/TempoSyncKnob.h
+++ b/include/TempoSyncKnob.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _TEMPO_SYNC_KNOB_H
-#define _TEMPO_SYNC_KNOB_H
+#ifndef TEMPO_SYNC_KNOB_H
+#define TEMPO_SYNC_KNOB_H
 
 #include <QPixmap>
 #include <QtCore/QPointer>
diff --git a/include/TempoSyncKnobModel.h b/include/TempoSyncKnobModel.h
index b80919d1f..eaec09023 100644
--- a/include/TempoSyncKnobModel.h
+++ b/include/TempoSyncKnobModel.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _TEMPO_SYNC_KNOB_MODEL_H
-#define _TEMPO_SYNC_KNOB_MODEL_H
+#ifndef TEMPO_SYNC_KNOB_MODEL_H
+#define TEMPO_SYNC_KNOB_MODEL_H
 
 #include "MeterModel.h"
 
diff --git a/include/ToolPlugin.h b/include/ToolPlugin.h
index 1e7d61f14..f692bc407 100644
--- a/include/ToolPlugin.h
+++ b/include/ToolPlugin.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef _TOOL_PLUGIN_H
-#define _TOOL_PLUGIN_H
+#ifndef TOOL_PLUGIN_H
+#define TOOL_PLUGIN_H
 
 #include "Plugin.h"
 
diff --git a/include/ToolPluginView.h b/include/ToolPluginView.h
index cd8141c33..f1eede782 100644
--- a/include/ToolPluginView.h
+++ b/include/ToolPluginView.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _TOOL_PLUGIN_VIEW_H
-#define _TOOL_PLUGIN_VIEW_H
+#ifndef TOOL_PLUGIN_VIEW_H
+#define TOOL_PLUGIN_VIEW_H
 
 #include "PluginView.h"
 
diff --git a/include/TrackContainer.h b/include/TrackContainer.h
index 6e33d6774..1ccf2de3f 100644
--- a/include/TrackContainer.h
+++ b/include/TrackContainer.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _TRACK_CONTAINER_H
-#define _TRACK_CONTAINER_H
+#ifndef TRACK_CONTAINER_H
+#define TRACK_CONTAINER_H
 
 #include <QtCore/QReadWriteLock>
 
diff --git a/include/about_dialog.h b/include/about_dialog.h
index 02a593e23..afab10727 100644
--- a/include/about_dialog.h
+++ b/include/about_dialog.h
@@ -2,7 +2,7 @@
  * about_dialog.h - declaration of class aboutDialog
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _ABOUT_DIALOG_H
-#define _ABOUT_DIALOG_H
+#ifndef ABOUT_DIALOG_H
+#define ABOUT_DIALOG_H
 
 #include <QDialog>
 
diff --git a/include/aeffectx.h b/include/aeffectx.h
index 8c602d9e2..65db7a299 100644
--- a/include/aeffectx.h
+++ b/include/aeffectx.h
@@ -2,7 +2,7 @@
  * aeffectx.h - simple header to allow VeSTige compilation and eventually work
  *
  * Copyright (c) 2006 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _AEFFECTX_H
-#define _AEFFECTX_H
+#ifndef AEFFECTX_H
+#define AEFFECTX_H
 
 #define CCONST(a, b, c, d)( ( ( (int) a ) << 24 ) |		\
 				( ( (int) b ) << 16 ) |		\
diff --git a/include/automatable_button.h b/include/automatable_button.h
index 69e3536e7..43816b62c 100644
--- a/include/automatable_button.h
+++ b/include/automatable_button.h
@@ -2,7 +2,7 @@
  * automatable_button.h - class automatableButton, the base for all buttons
  *
  * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _AUTOMATABLE_BUTTON_H
-#define _AUTOMATABLE_BUTTON_H
+#ifndef AUTOMATABLE_BUTTON_H
+#define AUTOMATABLE_BUTTON_H
 
 #include <QPushButton>
 
@@ -38,7 +38,7 @@ class EXPORT automatableButton : public QPushButton, public BoolModelView
 {
 	Q_OBJECT
 public:
-	automatableButton( QWidget * _parent, const QString & _name 
+	automatableButton( QWidget * _parent, const QString & _name
 			= QString::null );
 	virtual ~automatableButton();
 
diff --git a/include/automatable_slider.h b/include/automatable_slider.h
index 4912c131e..aac331750 100644
--- a/include/automatable_slider.h
+++ b/include/automatable_slider.h
@@ -2,7 +2,7 @@
  * automatable_slider.h - class automatableSlider, a QSlider with automation
  *
  * Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _AUTOMATABLE_SLIDER_H
-#define _AUTOMATABLE_SLIDER_H
+#ifndef AUTOMATABLE_SLIDER_H
+#define AUTOMATABLE_SLIDER_H
 
 #include <QSlider>
 
diff --git a/include/bb_track_container.h b/include/bb_track_container.h
index e879e2f65..465db8f48 100644
--- a/include/bb_track_container.h
+++ b/include/bb_track_container.h
@@ -2,7 +2,7 @@
  * bb_track_container.h - model-component of BB-Editor
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _BB_TRACK_CONTAINER_H
-#define _BB_TRACK_CONTAINER_H
+#ifndef BB_TRACK_CONTAINER_H
+#define BB_TRACK_CONTAINER_H
 
 #include "TrackContainer.h"
 #include "combobox.h"
diff --git a/include/caption_menu.h b/include/caption_menu.h
index 92b7d7695..8f5afb630 100644
--- a/include/caption_menu.h
+++ b/include/caption_menu.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _CAPTION_MENU_H
-#define _CAPTION_MENU_H
+#ifndef CAPTION_MENU_H
+#define CAPTION_MENU_H
 
 #include <QMenu>
 
diff --git a/include/combobox.h b/include/combobox.h
index 07ee1ca57..067c69a8d 100644
--- a/include/combobox.h
+++ b/include/combobox.h
@@ -2,7 +2,7 @@
  * combobox.h - class ComboBox, a combo box view for models
  *
  * Copyright (c) 2006-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _COMBOBOX_H
-#define _COMBOBOX_H
+#ifndef COMBOBOX_H
+#define COMBOBOX_H
 
 #include <QMenu>
 #include <QWidget>
diff --git a/include/cpuload_widget.h b/include/cpuload_widget.h
index 7599b61a0..b02a78c38 100644
--- a/include/cpuload_widget.h
+++ b/include/cpuload_widget.h
@@ -3,7 +3,7 @@
  *                    Hydrogen's CPU-load-widget)
  *
  * Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _CPULOAD_WIDGET_H
-#define _CPULOAD_WIDGET_H
+#ifndef CPULOAD_WIDGET_H
+#define CPULOAD_WIDGET_H
 
 #include <QtCore/QTimer>
 #include <QPixmap>
diff --git a/include/custom_events.h b/include/custom_events.h
index 2dfbd7717..08fef10b0 100644
--- a/include/custom_events.h
+++ b/include/custom_events.h
@@ -2,7 +2,7 @@
  * custom_events.h - custom event types list
  *
  * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _CUSTOM_EVENTS_H
-#define _CUSTOM_EVENTS_H
+#ifndef CUSTOM_EVENTS_H
+#define CUSTOM_EVENTS_H
 
 
 #include <QtCore/QEvent>
diff --git a/include/debug.h b/include/debug.h
index d0f206c7a..beec1c79f 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -2,7 +2,7 @@
  * debug.h - header file to be included for debugging purposes
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _DEBUG_H
-#define _DEBUG_H
+#ifndef DEBUG_H
+#define DEBUG_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/embed.h b/include/embed.h
index 732bb7ef9..3ecf307f5 100644
--- a/include/embed.h
+++ b/include/embed.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _EMBED_H
-#define _EMBED_H
+#ifndef EMBED_H
+#define EMBED_H
 
 #include <QPixmap>
 #include <QtCore/QString>
diff --git a/include/endian_handling.h b/include/endian_handling.h
index 361c24a3d..a2faa0f7c 100644
--- a/include/endian_handling.h
+++ b/include/endian_handling.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _ENDIAN_HANDLING_H
-#define _ENDIAN_HANDLING_H
+#ifndef ENDIAN_HANDLING_H
+#define ENDIAN_HANDLING_H
 
 #include <QtCore/QSysInfo>
 
diff --git a/include/export.h b/include/export.h
index 2df84ef3d..5df255e44 100644
--- a/include/export.h
+++ b/include/export.h
@@ -2,7 +2,7 @@
  * export.h - macros for export-declarations
  *
  * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _EXPORT_H
-#define _EXPORT_H
+#ifndef EXPORT_H
+#define EXPORT_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/export_project_dialog.h b/include/export_project_dialog.h
index 45aaba1b4..216395596 100644
--- a/include/export_project_dialog.h
+++ b/include/export_project_dialog.h
@@ -3,7 +3,7 @@
  *                           responsible for exporting project
  *
  * Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _EXPORT_PROJECT_DIALOG_H
-#define _EXPORT_PROJECT_DIALOG_H
+#ifndef EXPORT_PROJECT_DIALOG_H
+#define EXPORT_PROJECT_DIALOG_H
 
 #include <QDialog>
 #include <vector>
diff --git a/include/fade_button.h b/include/fade_button.h
index cb8cc5606..c16fdf23e 100644
--- a/include/fade_button.h
+++ b/include/fade_button.h
@@ -1,8 +1,8 @@
 /*
- * fade_button.h - declaration of class fadeButton 
+ * fade_button.h - declaration of class fadeButton
  *
  * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _FADE_BUTTON_H
-#define _FADE_BUTTON_H 
+#ifndef FADE_BUTTON_H
+#define FADE_BUTTON_H
 
 #include <QtCore/QTime>
 #include <QAbstractButton>
diff --git a/include/fft_helpers.h b/include/fft_helpers.h
index e70e48597..1fafb6b81 100644
--- a/include/fft_helpers.h
+++ b/include/fft_helpers.h
@@ -2,7 +2,7 @@
  * fft_helpers.h - some functions around FFT analysis
  *
  * Copyright (c) 2008-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _FFT_HELPERS_H
-#define _FFT_HELPERS_H
+#ifndef FFT_HELPERS_H
+#define FFT_HELPERS_H
 
 #include "lmmsconfig.h"
 #include "export.h"
@@ -65,7 +65,7 @@ int EXPORT absspec( fftwf_complex * _complex_buffer, float * _absspec_buffer,
 /* build fewer subbands from many absolute spectrum values
  * take care that - compressedbands[] array num_new elements long
  *                - num_old > num_new
- *                       
+ *
  *    returns 0 on success, else -1
  */
 int EXPORT compressbands( float * _absspec_buffer, float * _compressedband,
diff --git a/include/fifo_buffer.h b/include/fifo_buffer.h
index 2f56d90ac..a1983008c 100644
--- a/include/fifo_buffer.h
+++ b/include/fifo_buffer.h
@@ -2,7 +2,7 @@
  * fifo_buffer.h - FIFO fixed-size buffer
  *
  * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _FIFO_BUFFER_H
-#define _FIFO_BUFFER_H
+#ifndef FIFO_BUFFER_H
+#define FIFO_BUFFER_H
 
 #include <QtCore/QSemaphore>
 
diff --git a/include/group_box.h b/include/group_box.h
index d7ae4ff67..9fcdae618 100644
--- a/include/group_box.h
+++ b/include/group_box.h
@@ -2,7 +2,7 @@
  * group_box.h - LMMS-groupbox
  *
  * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _GROUP_BOX_H
-#define _GROUP_BOX_H
+#ifndef GROUP_BOX_H
+#define GROUP_BOX_H
 
 #include <QWidget>
 
diff --git a/include/gui_templates.h b/include/gui_templates.h
index 80974f1f3..47e88ad6f 100644
--- a/include/gui_templates.h
+++ b/include/gui_templates.h
@@ -2,7 +2,7 @@
  * gui_templates.h - GUI-specific templates
  *
  * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _GUI_TEMPLATES_H
-#define _GUI_TEMPLATES_H
+#ifndef GUI_TEMPLATES_H
+#define GUI_TEMPLATES_H
 
 #include "lmmsconfig.h"
 
diff --git a/include/ladspa_manager.h b/include/ladspa_manager.h
index 5d8e43659..1e83b65c3 100644
--- a/include/ladspa_manager.h
+++ b/include/ladspa_manager.h
@@ -6,7 +6,7 @@
  * Copyright (c) 2005-2008 Danny McRae <khjklujn@netscape.net>
  *
  * This file is part of LMMS - http://lmms.io
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
@@ -25,8 +25,8 @@
  */
 
 
-#ifndef _LADSPA_MANAGER_H
-#define _LADSPA_MANAGER_H
+#ifndef LADSPA_MANAGER_H
+#define LADSPA_MANAGER_H
 
 #include <ladspa.h>
 
@@ -52,12 +52,12 @@ it loads all of the plug-ins found in the LADSPA_PATH environmental variable
 and stores their access descriptors according in a dictionary keyed on
 the filename the plug-in was loaded from and the label of the plug-in.
 
-The can be retrieved by using ladspa_key_t.  For example, to get the 
+The can be retrieved by using ladspa_key_t.  For example, to get the
 "Phase Modulated Voice" plug-in from the cmt library, you would perform the
 calls using:
 
 	ladspa_key_t key( "cmt.so", "phasemod" )
-	
+
 as the plug-in key. */
 
 enum ladspaPluginType
@@ -83,14 +83,14 @@ typedef struct ladspaManagerStorage
 class EXPORT ladspaManager
 {
 public:
-	
+
 	ladspaManager();
 	virtual ~ladspaManager();
 
 	l_sortable_plugin_t getSortedPlugins();
-	ladspaManagerDescription * getDescription( const ladspa_key_t & 
+	ladspaManagerDescription * getDescription( const ladspa_key_t &
 								_plugin );
-	
+
 	/* This identifier can be used as a unique, case-sensitive
 	identifier for the plugin type within the plugin file. Plugin
 	types should be identified by file and label rather than by index
@@ -103,7 +103,7 @@ public:
 	be cached or subject to significant latency. */
 	bool  hasRealTimeDependency( const ladspa_key_t & _plugin );
 
-	/* Indicates that the plugin may cease to work correctly if the 
+	/* Indicates that the plugin may cease to work correctly if the
 	host elects to use the same data location for both input and output
 	(see connectPort). */
 	bool  isInplaceBroken( const ladspa_key_t & _plugin );
@@ -138,13 +138,13 @@ public:
 	/* Indicates that the port is an control. */
 	bool  isPortControl( const ladspa_key_t & _plugin, uint32_t _port );
 
-	/* Indicates that any bounds specified should be interpreted as 
-	multiples of the sample rate. For instance, a frequency range from 
-	0Hz to the Nyquist frequency (half the sample rate) could be requested 
-	by this hint in conjunction with LowerBound = 0 and UpperBound = 0.5. 
+	/* Indicates that any bounds specified should be interpreted as
+	multiples of the sample rate. For instance, a frequency range from
+	0Hz to the Nyquist frequency (half the sample rate) could be requested
+	by this hint in conjunction with LowerBound = 0 and UpperBound = 0.5.
 	Hosts that support bounds at all must support this hint to retain
 	meaning. */
-	bool  areHintsSampleRateDependent( const ladspa_key_t & _plugin, 
+	bool  areHintsSampleRateDependent( const ladspa_key_t & _plugin,
 								uint32_t _port );
 
   	/* Returns the lower boundary value for the given port. If
@@ -172,17 +172,17 @@ public:
 	particularly useful for frequencies and gains. */
 	bool  isLogarithmic( const ladspa_key_t & _plugin, uint32_t _port );
 
-	/* Indicates that a user interface would probably wish to provide a 
-	stepped control taking only integer values. Any bounds set should be 
+	/* Indicates that a user interface would probably wish to provide a
+	stepped control taking only integer values. Any bounds set should be
 	slightly wider than the actual integer range required to avoid floating
-	point rounding errors. For instance, the integer set {0,1,2,3} might 
+	point rounding errors. For instance, the integer set {0,1,2,3} might
 	be described as [-0.1, 3.1]. */
 	bool  isInteger( const ladspa_key_t & _plugin, uint32_t _port );
-	
+
 	/* Returns the name of the port. */
 	QString  getPortName( const ladspa_key_t & _plugin, uint32_t _port );
-	
-	
+
+
 	/* This may be used by the plugin developer to pass any custom
 	implementation data into an instantiate call. It must not be used
 	or interpreted by the host. It is expected that most plugin
@@ -190,24 +190,24 @@ public:
 	used to hold instance data. */
 	const void *  getImplementationData(
 						const ladspa_key_t & _plugin );
-	
-	
+
+
 	/* Returns a pointer to the plug-in's descriptor from which control
 	of the plug-in is accessible */
 	const LADSPA_Descriptor *  getDescriptor(
 						const ladspa_key_t & _plugin );
-	
-	
+
+
 	/* The following methods are convenience functions for use during
 	development.  A real instrument should use the getDescriptor()
 	method and implement the plug-in manipulations internally to avoid
 	the overhead associated with QMap lookups. */
-	
-	
+
+
 	/* Returns a handle to an instantiation of the given plug-in. */
-	LADSPA_Handle  instantiate( const ladspa_key_t & _plugin, 
+	LADSPA_Handle  instantiate( const ladspa_key_t & _plugin,
 						uint32_t _sample_rate );
-	
+
   	/* This method calls a function pointer that connects a port on an
 	instantiated plugin to a memory location at which a block of data
 	for the port will be read/written. The data location is expected
@@ -225,11 +225,11 @@ public:
 
 	connectPort() must be called at least once for each port before
 	run() or runAdding() is called. */
-	bool  connectPort( const ladspa_key_t & _plugin, 
-					LADSPA_Handle _instance, 
+	bool  connectPort( const ladspa_key_t & _plugin,
+					LADSPA_Handle _instance,
 					uint32_t _port,
 					LADSPA_Data * _data_location );
-	
+
   	/* This method calls a function pointer that initialises a plugin
 	instance and activates it for use. This is separated from
 	instantiate() to aid real-time support and so that hosts can
@@ -262,7 +262,7 @@ public:
 	before run() or run_adding(). If deactivate() is called for a
 	plugin instance then the plugin instance may not be reused until
 	activate() has been called again. */
-	bool  run( const ladspa_key_t & _plugin, 
+	bool  run( const ladspa_key_t & _plugin,
 					LADSPA_Handle _instance,
 					uint32_t _sample_count );
 
@@ -315,7 +315,7 @@ public:
 	/* Once an instance of a plugin has been finished with it can be
 	deleted using the following function. The instance handle passed
 	ceases to be valid after this call.
-  
+
 	If activate() was called for a plugin instance then a
 	corresponding call to deactivate() must be made before cleanup()
 	is called. */
@@ -327,7 +327,7 @@ private:
 						const QString & _file );
 	uint16_t  getPluginInputs( const LADSPA_Descriptor * _descriptor );
 	uint16_t  getPluginOutputs( const LADSPA_Descriptor * _descriptor );
-	
+
 	typedef QMap<ladspa_key_t, ladspaManagerDescription *>
 						ladspaManagerMapType;
 	ladspaManagerMapType m_ladspaManagerMap;
diff --git a/include/led_checkbox.h b/include/led_checkbox.h
index 687ee7cab..808774313 100644
--- a/include/led_checkbox.h
+++ b/include/led_checkbox.h
@@ -2,7 +2,7 @@
  * led_checkbox.h - class ledCheckBox, an improved QCheckBox
  *
  * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _LED_CHECKBOX_H
-#define _LED_CHECKBOX_H
+#ifndef LED_CHECKBOX_H
+#define LED_CHECKBOX_H
 
 #include "automatable_button.h"
 
@@ -70,7 +70,7 @@ protected:
 private:
 	QPixmap * m_ledOnPixmap;
 	QPixmap * m_ledOffPixmap;
-	
+
 	QString m_text;
 
 	void initUi( LedColors _color ); //!< to be called by ctors
diff --git a/include/lmms_basics.h b/include/lmms_basics.h
index daeeb824c..bdd72f4fa 100644
--- a/include/lmms_basics.h
+++ b/include/lmms_basics.h
@@ -2,7 +2,7 @@
  * types.h - typedefs for common types that are used in the whole app
  *
  * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TYPES_H
-#define _TYPES_H
+#ifndef TYPES_H
+#define TYPES_H
 
 #include <limits>
 
@@ -95,7 +95,7 @@ inline float typeInfo<float>::minEps()
 {
 	return 1.0e-10;
 }
-	
+
 template<>
 inline bool typeInfo<float>::isEqual( float _x, float _y )
 {
diff --git a/include/note.h b/include/note.h
index b591ee72a..6cf9538b5 100644
--- a/include/note.h
+++ b/include/note.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _NOTE_H
-#define _NOTE_H
+#ifndef NOTE_H
+#define NOTE_H
 
 #include <QtCore/QVector>
 
@@ -49,7 +49,7 @@ enum Keys
 	Key_GIS = 8, Key_AS = 8,
 	Key_A = 9,
 	Key_AIS = 10, Key_B = 10,
-	Key_H = 11 
+	Key_H = 11
 } ;
 
 
@@ -89,7 +89,7 @@ public:
 		DetuningHelper * _detuning = NULL );
 	note( const note & _note );
 	virtual ~note();
-	
+
 	// used by GUI
 	inline void setSelected( const bool _selected ){ m_selected = _selected; }
 	inline void setOldKey( const int _oldKey ){ m_oldKey = _oldKey; }
@@ -102,8 +102,8 @@ public:
 	{
 		m_isPlaying = _isPlaying;
 	}
-	
-	
+
+
 	void setLength( const MidiTime & _length );
 	void setPos( const MidiTime & _pos );
 	void setKey( const int _key );
@@ -216,12 +216,12 @@ protected:
 
 private:
 	// for piano roll editing
-	bool m_selected; 
+	bool m_selected;
 	int m_oldKey;
 	MidiTime m_oldPos;
 	MidiTime m_oldLength;
 	bool m_isPlaying;
-	
+
 	int m_key;
 	volume_t m_volume;
 	panning_t m_panning;
diff --git a/include/nstate_button.h b/include/nstate_button.h
index 1ccc50510..c146d63b6 100644
--- a/include/nstate_button.h
+++ b/include/nstate_button.h
@@ -2,7 +2,7 @@
  * nstate_button.h - declaration of class nStateButton
  *
  * Copyright (c) 2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _NSTATE_BUTTON_H
-#define _NSTATE_BUTTON_H
+#ifndef NSTATE_BUTTON_H
+#define NSTATE_BUTTON_H
 
 #include <QPixmap>
 #include <QtCore/QVector>
diff --git a/include/panning.h b/include/panning.h
index 00a66410b..4512bc745 100644
--- a/include/panning.h
+++ b/include/panning.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _PANNING_H
-#define _PANNING_H
+#ifndef PANNING_H
+#define PANNING_H
 
 #include "lmms_basics.h"
 #include "volume.h"
@@ -45,7 +45,7 @@ inline stereoVolumeVector panningToVolumeVector( panning_t _p,
 inline int panningToMidi( panning_t _p )
 {
 	return MidiMinPanning + (int) (
-			  ( (float)( _p - PanningLeft ) ) / 
+			  ( (float)( _p - PanningLeft ) ) /
 			  ( (float)( PanningRight - PanningLeft ) ) *
 			  ( (float)( MidiMaxPanning - MidiMinPanning ) ) );
 }
diff --git a/include/panning_constants.h b/include/panning_constants.h
index d51058739..b5395de47 100644
--- a/include/panning_constants.h
+++ b/include/panning_constants.h
@@ -3,7 +3,7 @@
  *             panning of a note
  *
  * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _PANNING_CONSTANTS_H
-#define _PANNING_CONSTANTS_H
+#ifndef PANNING_CONSTANTS_H
+#define PANNING_CONSTANTS_H
 
 const panning_t PanningRight = ( 0 + 100 );
 const panning_t PanningLeft = - PanningRight;
diff --git a/include/pixmap_button.h b/include/pixmap_button.h
index debd8c9ee..e08b91e2e 100644
--- a/include/pixmap_button.h
+++ b/include/pixmap_button.h
@@ -2,7 +2,7 @@
  * pixmap_button.h - declaration of class pixmapButton
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _PIXMAP_BUTTON_H
-#define _PIXMAP_BUTTON_H
+#ifndef PIXMAP_BUTTON_H
+#define PIXMAP_BUTTON_H
 
 #include <QPixmap>
 
diff --git a/include/project_notes.h b/include/project_notes.h
index 49b58797e..9833294c1 100644
--- a/include/project_notes.h
+++ b/include/project_notes.h
@@ -2,7 +2,7 @@
  * project_notes.h - header for project-notes-editor
  *
  * Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _PROJECT_NOTES_H
-#define _PROJECT_NOTES_H
+#ifndef PROJECT_NOTES_H
+#define PROJECT_NOTES_H
 
 #include <QMainWindow>
 
diff --git a/include/project_version.h b/include/project_version.h
index 37fac5b70..4be7f15a5 100644
--- a/include/project_version.h
+++ b/include/project_version.h
@@ -2,7 +2,7 @@
  * project_version.h - version compared in import upgrades
  *
  * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _PROJECT_VERSION_H
-#define _PROJECT_VERSION_H
+#ifndef PROJECT_VERSION_H
+#define PROJECT_VERSION_H
 
 #include <QtCore/QString>
 
diff --git a/include/rename_dialog.h b/include/rename_dialog.h
index b3796d49c..dbaea7216 100644
--- a/include/rename_dialog.h
+++ b/include/rename_dialog.h
@@ -3,7 +3,7 @@
  *                   changing the content of a string
  *
  * Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _RENAME_DIALOG_H
-#define _RENAME_DIALOG_H
+#ifndef RENAME_DIALOG_H
+#define RENAME_DIALOG_H
 
 #include <QDialog>
 
diff --git a/include/rubberband.h b/include/rubberband.h
index f319b2c79..dc437340a 100644
--- a/include/rubberband.h
+++ b/include/rubberband.h
@@ -3,7 +3,7 @@
  *                             Qt4
  *
  * Copyright (c) 2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _RUBBERBAND_H
-#define _RUBBERBAND_H
+#ifndef RUBBERBAND_H
+#define RUBBERBAND_H
 
 #include <QRubberBand>
 #include <QtCore/QVector>
diff --git a/include/setup_dialog.h b/include/setup_dialog.h
index da05011b1..8eeb06988 100644
--- a/include/setup_dialog.h
+++ b/include/setup_dialog.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _SETUP_DIALOG_H
-#define _SETUP_DIALOG_H
+#ifndef SETUP_DIALOG_H
+#define SETUP_DIALOG_H
 
 #include <QDialog>
 #include <QtCore/QMap>
@@ -77,7 +77,7 @@ private slots:
 	void setSTKDir( const QString & _sd );
 	void setDefaultSoundfont( const QString & _sf );
 	void setBackgroundArtwork( const QString & _ba );
-	
+
 	// audio settings widget
 	void audioInterfaceChanged( const QString & _driver );
 	void displayAudioHelp();
diff --git a/include/string_pair_drag.h b/include/string_pair_drag.h
index d563fdd42..733ae14d1 100644
--- a/include/string_pair_drag.h
+++ b/include/string_pair_drag.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _STRING_PAIR_DRAG_H
-#define _STRING_PAIR_DRAG_H
+#ifndef STRING_PAIR_DRAG_H
+#define STRING_PAIR_DRAG_H
 
 #include <QDrag>
 #include <QDragEnterEvent>
diff --git a/include/tab_bar.h b/include/tab_bar.h
index 37c37c5cc..e5deceb16 100644
--- a/include/tab_bar.h
+++ b/include/tab_bar.h
@@ -2,7 +2,7 @@
  * tab_bar.h - class tabBar
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TAB_BAR_H
-#define _TAB_BAR_H
+#ifndef TAB_BAR_H
+#define TAB_BAR_H
 
 #include <QtCore/QMap>
 #include <QLayout>
diff --git a/include/tab_button.h b/include/tab_button.h
index 8260f1b55..f6ae54a03 100644
--- a/include/tab_button.h
+++ b/include/tab_button.h
@@ -2,7 +2,7 @@
  * tab_button.h - declaration of class tabButton
  *
  * Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TAB_BUTTON_H
-#define _TAB_BUTTON_H
+#ifndef TAB_BUTTON_H
+#define TAB_BUTTON_H
 
 #include <QPushButton>
 
diff --git a/include/tab_widget.h b/include/tab_widget.h
index 4c69ba33e..3b4ce9d4b 100644
--- a/include/tab_widget.h
+++ b/include/tab_widget.h
@@ -2,7 +2,7 @@
  * tab_widget.h - LMMS-tabwidget
  *
  * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TAB_WIDGET_H
-#define _TAB_WIDGET_H
+#ifndef TAB_WIDGET_H
+#define TAB_WIDGET_H
 
 #include <QWidget>
 #include <QtCore/QMap>
diff --git a/include/templates.h b/include/templates.h
index 3d4eb9443..a876315b5 100644
--- a/include/templates.h
+++ b/include/templates.h
@@ -2,7 +2,7 @@
  * templates.h - miscellanous templates and algorithms
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TEMPLATES_H
-#define _TEMPLATES_H
+#ifndef TEMPLATES_H
+#define TEMPLATES_H
 
 #include <QtCore/QtAlgorithms>
 
diff --git a/include/timeline.h b/include/timeline.h
index 219ddb37d..5eb280e45 100644
--- a/include/timeline.h
+++ b/include/timeline.h
@@ -2,7 +2,7 @@
  * timeline.h - class timeLine, representing a time-line with position marker
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TIMELINE_H
-#define _TIMELINE_H
+#ifndef TIMELINE_H
+#define TIMELINE_H
 
 #include <QWidget>
 
diff --git a/include/tool_button.h b/include/tool_button.h
index 60c94b9e2..46f18569c 100644
--- a/include/tool_button.h
+++ b/include/tool_button.h
@@ -1,8 +1,8 @@
 /*
- * tool_button.h - declaration of class toolButton 
+ * tool_button.h - declaration of class toolButton
  *
  * Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TOOL_BUTTON_H
-#define _TOOL_BUTTON_H 
+#ifndef TOOL_BUTTON_H
+#define TOOL_BUTTON_H
 
 #include <QToolButton>
 #include <QColor>
diff --git a/include/tooltip.h b/include/tooltip.h
index caa0973fb..e0dfb735e 100644
--- a/include/tooltip.h
+++ b/include/tooltip.h
@@ -2,7 +2,7 @@
  * tooltip.h - namespace toolTip, a tooltip-wrapper for LMMS
  *
  * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TOOLTIP_H
-#define _TOOLTIP_H
+#ifndef TOOLTIP_H
+#define TOOLTIP_H
 
 #include <qstring.h>
 
diff --git a/include/track_label_button.h b/include/track_label_button.h
index edbd5dc5f..a5e2a0acb 100644
--- a/include/track_label_button.h
+++ b/include/track_label_button.h
@@ -2,7 +2,7 @@
  * track_label_button.h - class trackLabelButton
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TRACK_LABEL_BUTTON_H
-#define _TRACK_LABEL_BUTTON_H
+#ifndef TRACK_LABEL_BUTTON_H
+#define TRACK_LABEL_BUTTON_H
 
 #include <QToolButton>
 
diff --git a/include/transformable_auto_model.h b/include/transformable_auto_model.h
index d03aa1365..ab9862e1b 100644
--- a/include/transformable_auto_model.h
+++ b/include/transformable_auto_model.h
@@ -2,7 +2,7 @@
  * transformable_auto_model.h - template transformableAutoModel
  *
  * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _TRANSFORMABLE_AUTO_MODEL_H
-#define _TRANSFORMABLE_AUTO_MODEL_H
+#ifndef TRANSFORMABLE_AUTO_MODEL_H
+#define TRANSFORMABLE_AUTO_MODEL_H
 
 #include "AutomatableModel.h"
 //#include "automatable_model_templates.h"
diff --git a/include/update_event.h b/include/update_event.h
index 03451d5cc..1657f4cc7 100644
--- a/include/update_event.h
+++ b/include/update_event.h
@@ -2,7 +2,7 @@
  * update_event.h - signal GUI updates
  *
  * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _UPDATE_EVENT_H
-#define _UPDATE_EVENT_H
+#ifndef UPDATE_EVENT_H
+#define UPDATE_EVENT_H
 
 #include "custom_events.h"
 
diff --git a/include/volume.h b/include/volume.h
index 424227fa7..e78e22f39 100644
--- a/include/volume.h
+++ b/include/volume.h
@@ -3,7 +3,7 @@
  *            of a note
  *
  * Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of LMMS - http://lmms.io
  *
  * This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _VOLUME_H
-#define _VOLUME_H
+#ifndef VOLUME_H
+#define VOLUME_H
 
 #include "lmmsconfig.h"