diff --git a/include/DrumSynth.h b/include/DrumSynth.h
index 79383a6d49..27941f67d1 100644
--- a/include/DrumSynth.h
+++ b/include/DrumSynth.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _DRUMSYNTH_H__
-#define _DRUMSYNTH_H__
+#ifndef DRUMSYNTH_H
+#define DRUMSYNTH_H
 
 #include <stdint.h>
 #include "lmms_basics.h"
@@ -57,4 +57,4 @@ class DrumSynth {
 
 } // namespace lmms
 
-#endif
+#endif // DRUMSYNTH_H
diff --git a/include/MicroTimer.h b/include/MicroTimer.h
index 2eaf28b97a..4daf28edd8 100644
--- a/include/MicroTimer.h
+++ b/include/MicroTimer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef MICRO_TIMER
-#define MICRO_TIMER
+#ifndef MICRO_TIMER_H
+#define MICRO_TIMER_H
 
 #include <chrono>
 
@@ -48,4 +48,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // MICRO_TIMER_H
diff --git a/include/RemotePluginBase.h b/include/RemotePluginBase.h
index 4d5627a92a..2abe591327 100644
--- a/include/RemotePluginBase.h
+++ b/include/RemotePluginBase.h
@@ -38,7 +38,6 @@
 
 #if !(defined(LMMS_HAVE_SYS_IPC_H) && defined(LMMS_HAVE_SEMAPHORE_H))
 #define SYNC_WITH_SHM_FIFO
-#define USE_QT_SEMAPHORES
 
 #ifdef LMMS_HAVE_PROCESS_H
 #include <process.h>
diff --git a/include/embed.h b/include/embed.h
index 23aebccec9..d26fd643a5 100644
--- a/include/embed.h
+++ b/include/embed.h
@@ -61,7 +61,7 @@ namespace PLUGIN_NAME
 inline QPixmap getIconPixmap( const QString&  _name,
 	int _w = -1, int _h = -1, const char** xpm = nullptr )
 {
-	return embed::getIconPixmap(QString("%1/%2").arg(STRINGIFY(PLUGIN_NAME), _name), _w, _h, xpm);
+	return embed::getIconPixmap(QString("%1/%2").arg(LMMS_STRINGIFY(PLUGIN_NAME), _name), _w, _h, xpm);
 }
 //QString getText( const char * _name );
 
@@ -132,7 +132,7 @@ public:
 
 	QString pixmapName() const override
 	{
-		return QString( STRINGIFY(PLUGIN_NAME) ) + "::" + m_name;
+		return QString( LMMS_STRINGIFY(PLUGIN_NAME) ) + "::" + m_name;
 	}
 
 } ;
diff --git a/include/lmms_basics.h b/include/lmms_basics.h
index 3f7057ef7d..31c231c1b1 100644
--- a/include/lmms_basics.h
+++ b/include/lmms_basics.h
@@ -136,8 +136,8 @@ using surroundSampleFrame = std::array<sample_t, SURROUND_CHANNELS>;
 constexpr std::size_t LMMS_ALIGN_SIZE = 16;
 
 
-#define STRINGIFY(s) STR(s)
-#define STR(PN)	#PN
+#define LMMS_STRINGIFY(s) LMMS_STR(s)
+#define LMMS_STR(PN)	#PN
 
 // Abstract away GUI CTRL key (linux/windows) vs ⌘ (apple)
 constexpr const char* UI_CTRL_KEY =
diff --git a/include/versioninfo.h b/include/versioninfo.h
index 1faab68043..2bb74a5701 100644
--- a/include/versioninfo.h
+++ b/include/versioninfo.h
@@ -3,7 +3,7 @@
 #ifdef __GNUC__
 constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "GCC " __VERSION__;
 #elif defined(_MSC_VER)
-constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "MSVC " STRINGIFY(_MSC_FULL_VER);
+constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "MSVC " LMMS_STRINGIFY(_MSC_FULL_VER);
 #else
 constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "unknown compiler";
 #endif
diff --git a/plugins/Amplifier/Amplifier.cpp b/plugins/Amplifier/Amplifier.cpp
index ced43f1e26..1212bcd6aa 100644
--- a/plugins/Amplifier/Amplifier.cpp
+++ b/plugins/Amplifier/Amplifier.cpp
@@ -36,7 +36,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT amplifier_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Amplifier",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "A native amplifier plugin" ),
 	"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",
diff --git a/plugins/AudioFileProcessor/AudioFileProcessor.cpp b/plugins/AudioFileProcessor/AudioFileProcessor.cpp
index b5e991a2ca..4ff93132b5 100644
--- a/plugins/AudioFileProcessor/AudioFileProcessor.cpp
+++ b/plugins/AudioFileProcessor/AudioFileProcessor.cpp
@@ -57,7 +57,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT audiofileprocessor_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"AudioFileProcessor",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Simple sampler with various settings for "
diff --git a/plugins/BassBooster/BassBooster.cpp b/plugins/BassBooster/BassBooster.cpp
index b8ea271ee3..280accddbf 100644
--- a/plugins/BassBooster/BassBooster.cpp
+++ b/plugins/BassBooster/BassBooster.cpp
@@ -36,7 +36,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT bassbooster_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"BassBooster",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "Boost your bass the fast and simple way" ),
 	"Tobias Doerffel <tobydox/at/users.sf.net>",
diff --git a/plugins/BitInvader/BitInvader.cpp b/plugins/BitInvader/BitInvader.cpp
index 55dd973863..0168031fc4 100644
--- a/plugins/BitInvader/BitInvader.cpp
+++ b/plugins/BitInvader/BitInvader.cpp
@@ -54,7 +54,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT bitinvader_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"BitInvader",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Customizable wavetable synthesizer" ),
diff --git a/plugins/Bitcrush/Bitcrush.cpp b/plugins/Bitcrush/Bitcrush.cpp
index 13f8806232..68724eccde 100644
--- a/plugins/Bitcrush/Bitcrush.cpp
+++ b/plugins/Bitcrush/Bitcrush.cpp
@@ -43,7 +43,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT bitcrush_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Bitcrush",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "An oversampling bitcrusher" ),
 	"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",
diff --git a/plugins/CarlaPatchbay/CarlaPatchbay.cpp b/plugins/CarlaPatchbay/CarlaPatchbay.cpp
index 7f5b2060ed..e440d4e3f1 100644
--- a/plugins/CarlaPatchbay/CarlaPatchbay.cpp
+++ b/plugins/CarlaPatchbay/CarlaPatchbay.cpp
@@ -37,7 +37,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT carlapatchbay_plugin_descriptor =
 {
-    STRINGIFY( PLUGIN_NAME ),
+    LMMS_STRINGIFY( PLUGIN_NAME ),
     "Carla Patchbay",
     QT_TRANSLATE_NOOP( "PluginBrowser",
                        "Carla Patchbay Instrument" ),
diff --git a/plugins/CarlaRack/CarlaRack.cpp b/plugins/CarlaRack/CarlaRack.cpp
index ad2dd00b8b..5360baf96a 100644
--- a/plugins/CarlaRack/CarlaRack.cpp
+++ b/plugins/CarlaRack/CarlaRack.cpp
@@ -37,7 +37,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT carlarack_plugin_descriptor =
 {
-    STRINGIFY( PLUGIN_NAME ),
+    LMMS_STRINGIFY( PLUGIN_NAME ),
     "Carla Rack",
     QT_TRANSLATE_NOOP( "PluginBrowser",
                        "Carla Rack Instrument" ),
diff --git a/plugins/Compressor/Compressor.cpp b/plugins/Compressor/Compressor.cpp
index 6068886333..bf6928e210 100755
--- a/plugins/Compressor/Compressor.cpp
+++ b/plugins/Compressor/Compressor.cpp
@@ -38,7 +38,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT compressor_plugin_descriptor =
 {
-	STRINGIFY(PLUGIN_NAME),
+	LMMS_STRINGIFY(PLUGIN_NAME),
 	"Compressor",
 	QT_TRANSLATE_NOOP("PluginBrowser", "A dynamic range compressor."),
 	"Lost Robot <r94231@gmail.com>",
diff --git a/plugins/CrossoverEQ/CrossoverEQ.cpp b/plugins/CrossoverEQ/CrossoverEQ.cpp
index d915afc23a..641e06b4e4 100644
--- a/plugins/CrossoverEQ/CrossoverEQ.cpp
+++ b/plugins/CrossoverEQ/CrossoverEQ.cpp
@@ -38,7 +38,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT crossovereq_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Crossover Equalizer",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "A 4-band Crossover Equalizer" ),
 	"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",
diff --git a/plugins/Delay/DelayEffect.cpp b/plugins/Delay/DelayEffect.cpp
index 5ce29f8ec4..1c6a74b863 100644
--- a/plugins/Delay/DelayEffect.cpp
+++ b/plugins/Delay/DelayEffect.cpp
@@ -39,7 +39,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT delay_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Delay",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "A native delay plugin" ),
 	"Dave French <contact/dot/dave/dot/french3/at/googlemail/dot/com>",
diff --git a/plugins/DualFilter/DualFilter.cpp b/plugins/DualFilter/DualFilter.cpp
index 2279ae37de..75a2ab532c 100644
--- a/plugins/DualFilter/DualFilter.cpp
+++ b/plugins/DualFilter/DualFilter.cpp
@@ -38,7 +38,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT dualfilter_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Dual Filter",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "A Dual filter plugin" ),
 	"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",
diff --git a/plugins/DynamicsProcessor/DynamicsProcessor.cpp b/plugins/DynamicsProcessor/DynamicsProcessor.cpp
index 85f1d94f47..c8ad9a029c 100644
--- a/plugins/DynamicsProcessor/DynamicsProcessor.cpp
+++ b/plugins/DynamicsProcessor/DynamicsProcessor.cpp
@@ -41,7 +41,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT dynamicsprocessor_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Dynamics Processor",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"plugin for processing dynamics in a flexible way" ),
diff --git a/plugins/Eq/EqEffect.cpp b/plugins/Eq/EqEffect.cpp
index 7a9b5b15e3..12a10061ba 100644
--- a/plugins/Eq/EqEffect.cpp
+++ b/plugins/Eq/EqEffect.cpp
@@ -39,7 +39,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT eq_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Equalizer",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "A native eq plugin" ),
 	"Dave French <contact/dot/dave/dot/french3/at/googlemail/dot/com>",
diff --git a/plugins/Flanger/FlangerEffect.cpp b/plugins/Flanger/FlangerEffect.cpp
index 71cf96e186..982702ebe8 100644
--- a/plugins/Flanger/FlangerEffect.cpp
+++ b/plugins/Flanger/FlangerEffect.cpp
@@ -37,7 +37,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT flanger_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Flanger",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "A native flanger plugin" ),
 	"Dave French <contact/dot/dave/dot/french3/at/googlemail/dot/com>",
diff --git a/plugins/FreeBoy/FreeBoy.cpp b/plugins/FreeBoy/FreeBoy.cpp
index 67a7ac019a..9f70854447 100644
--- a/plugins/FreeBoy/FreeBoy.cpp
+++ b/plugins/FreeBoy/FreeBoy.cpp
@@ -52,7 +52,7 @@ extern "C"
 {
 Plugin::Descriptor PLUGIN_EXPORT freeboy_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"FreeBoy",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "Emulation of GameBoy (TM) APU" ),
 
diff --git a/plugins/GigPlayer/GigPlayer.cpp b/plugins/GigPlayer/GigPlayer.cpp
index e3d37baa90..81a571ac70 100644
--- a/plugins/GigPlayer/GigPlayer.cpp
+++ b/plugins/GigPlayer/GigPlayer.cpp
@@ -64,7 +64,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT gigplayer_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"GIG Player",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "Player for GIG files" ),
 	"Garrett Wilson <g/at/floft/dot/net>",
diff --git a/plugins/HydrogenImport/HydrogenImport.cpp b/plugins/HydrogenImport/HydrogenImport.cpp
index 9dc0950fba..6575974710 100644
--- a/plugins/HydrogenImport/HydrogenImport.cpp
+++ b/plugins/HydrogenImport/HydrogenImport.cpp
@@ -24,7 +24,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT hydrogenimport_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Hydrogen Import",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Filter for importing Hydrogen files into LMMS" ),
diff --git a/plugins/Kicker/Kicker.cpp b/plugins/Kicker/Kicker.cpp
index 4c5fa77f89..6a3c0823ae 100644
--- a/plugins/Kicker/Kicker.cpp
+++ b/plugins/Kicker/Kicker.cpp
@@ -49,7 +49,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT kicker_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Kicker",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Versatile drum synthesizer" ),
diff --git a/plugins/LadspaBrowser/LadspaBrowser.cpp b/plugins/LadspaBrowser/LadspaBrowser.cpp
index d40b855fd3..cd10b47fd9 100644
--- a/plugins/LadspaBrowser/LadspaBrowser.cpp
+++ b/plugins/LadspaBrowser/LadspaBrowser.cpp
@@ -50,7 +50,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT ladspabrowser_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"LADSPA Plugin Browser",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"List installed LADSPA plugins" ),
diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp
index a26e35eb72..c722dbaf3f 100644
--- a/plugins/LadspaEffect/LadspaEffect.cpp
+++ b/plugins/LadspaEffect/LadspaEffect.cpp
@@ -53,7 +53,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT ladspaeffect_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"LADSPA",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"plugin for using arbitrary LADSPA-effects "
diff --git a/plugins/Lb302/Lb302.cpp b/plugins/Lb302/Lb302.cpp
index 999b661512..c600285208 100644
--- a/plugins/Lb302/Lb302.cpp
+++ b/plugins/Lb302/Lb302.cpp
@@ -80,7 +80,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT lb302_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"LB302",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 			"Incomplete monophonic imitation TB-303" ),
diff --git a/plugins/Lb302/Lb302.h b/plugins/Lb302/Lb302.h
index 770fb451e2..57acb9ef3d 100644
--- a/plugins/Lb302/Lb302.h
+++ b/plugins/Lb302/Lb302.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef LB302_H_
-#define LB302_H_
+#ifndef LB302_H
+#define LB302_H
 
 #include "DspEffectLibrary.h"
 #include "Instrument.h"
@@ -303,4 +303,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // LB302_H
diff --git a/plugins/Lv2Effect/Lv2Effect.cpp b/plugins/Lv2Effect/Lv2Effect.cpp
index d3755a2c9e..f69ea4a384 100644
--- a/plugins/Lv2Effect/Lv2Effect.cpp
+++ b/plugins/Lv2Effect/Lv2Effect.cpp
@@ -40,7 +40,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT lv2effect_plugin_descriptor =
 {
-	STRINGIFY(PLUGIN_NAME),
+	LMMS_STRINGIFY(PLUGIN_NAME),
 	"LV2",
 	QT_TRANSLATE_NOOP("PluginBrowser",
 		"plugin for using arbitrary LV2-effects inside LMMS."),
diff --git a/plugins/Lv2Instrument/Lv2Instrument.cpp b/plugins/Lv2Instrument/Lv2Instrument.cpp
index f7e0a2b37e..01ccce15de 100644
--- a/plugins/Lv2Instrument/Lv2Instrument.cpp
+++ b/plugins/Lv2Instrument/Lv2Instrument.cpp
@@ -49,7 +49,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT lv2instrument_plugin_descriptor =
 {
-	STRINGIFY(PLUGIN_NAME),
+	LMMS_STRINGIFY(PLUGIN_NAME),
 	"LV2",
 	QT_TRANSLATE_NOOP("PluginBrowser",
 		"plugin for using arbitrary LV2 instruments inside LMMS."),
diff --git a/plugins/MidiExport/MidiExport.cpp b/plugins/MidiExport/MidiExport.cpp
index 6f0f5a11ee..1fde83f069 100644
--- a/plugins/MidiExport/MidiExport.cpp
+++ b/plugins/MidiExport/MidiExport.cpp
@@ -44,7 +44,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT midiexport_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"MIDI Export",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Filter for exporting MIDI-files from LMMS" ),
diff --git a/plugins/MidiImport/MidiImport.cpp b/plugins/MidiImport/MidiImport.cpp
index e6cf644cf3..e9962838c9 100644
--- a/plugins/MidiImport/MidiImport.cpp
+++ b/plugins/MidiImport/MidiImport.cpp
@@ -65,7 +65,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT midiimport_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"MIDI Import",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Filter for importing MIDI-files into LMMS" ),
diff --git a/plugins/Monstro/Monstro.cpp b/plugins/Monstro/Monstro.cpp
index 889a89fb01..d5ad851ee4 100644
--- a/plugins/Monstro/Monstro.cpp
+++ b/plugins/Monstro/Monstro.cpp
@@ -47,7 +47,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT monstro_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Monstro",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Monstrous 3-oscillator synth with modulation matrix" ),
diff --git a/plugins/MultitapEcho/MultitapEcho.cpp b/plugins/MultitapEcho/MultitapEcho.cpp
index f3d03740c2..05c3f30fe3 100644
--- a/plugins/MultitapEcho/MultitapEcho.cpp
+++ b/plugins/MultitapEcho/MultitapEcho.cpp
@@ -36,7 +36,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT multitapecho_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Multitap Echo",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "A multitap echo delay plugin" ),
 	"Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>",
diff --git a/plugins/Nes/Nes.cpp b/plugins/Nes/Nes.cpp
index b774f7efaf..f3537d88c3 100644
--- a/plugins/Nes/Nes.cpp
+++ b/plugins/Nes/Nes.cpp
@@ -45,7 +45,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT nes_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Nescaline",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"A NES-like synthesizer" ),
diff --git a/plugins/OpulenZ/OpulenZ.cpp b/plugins/OpulenZ/OpulenZ.cpp
index 6abfb4e19d..beec8841b9 100644
--- a/plugins/OpulenZ/OpulenZ.cpp
+++ b/plugins/OpulenZ/OpulenZ.cpp
@@ -67,7 +67,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT opulenz_plugin_descriptor =
 {
-        STRINGIFY( PLUGIN_NAME ),
+        LMMS_STRINGIFY( PLUGIN_NAME ),
         "OpulenZ",
         QT_TRANSLATE_NOOP( "PluginBrowser",
 			   "2-operator FM Synth" ),
diff --git a/plugins/Organic/Organic.cpp b/plugins/Organic/Organic.cpp
index 3207692002..6271f6c40e 100644
--- a/plugins/Organic/Organic.cpp
+++ b/plugins/Organic/Organic.cpp
@@ -50,7 +50,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT organic_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Organic",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Additive Synthesizer for organ-like sounds" ),
diff --git a/plugins/Patman/Patman.cpp b/plugins/Patman/Patman.cpp
index 25b055b9c8..c6fb202c93 100644
--- a/plugins/Patman/Patman.cpp
+++ b/plugins/Patman/Patman.cpp
@@ -55,7 +55,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT patman_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"PatMan",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"GUS-compatible patch instrument" ),
diff --git a/plugins/Patman/Patman.h b/plugins/Patman/Patman.h
index 206c2e5039..eee122129b 100644
--- a/plugins/Patman/Patman.h
+++ b/plugins/Patman/Patman.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef PATMAN_H_
-#define PATMAN_H_
+#ifndef PATMAN_H
+#define PATMAN_H
 
 #include "Instrument.h"
 #include "InstrumentView.h"
@@ -162,4 +162,4 @@ private:
 
 } // namespace lmms
 
-#endif
+#endif // PATMAN_H
diff --git a/plugins/PeakControllerEffect/PeakControllerEffect.cpp b/plugins/PeakControllerEffect/PeakControllerEffect.cpp
index 529437d6ea..d32a22320d 100644
--- a/plugins/PeakControllerEffect/PeakControllerEffect.cpp
+++ b/plugins/PeakControllerEffect/PeakControllerEffect.cpp
@@ -42,7 +42,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT peakcontrollereffect_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Peak Controller",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 			"Plugin for controlling knobs with sound peaks" ),
diff --git a/plugins/ReverbSC/ReverbSC.cpp b/plugins/ReverbSC/ReverbSC.cpp
index 6faea8c9a2..4d72dc3190 100644
--- a/plugins/ReverbSC/ReverbSC.cpp
+++ b/plugins/ReverbSC/ReverbSC.cpp
@@ -37,7 +37,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT reverbsc_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"ReverbSC",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "Reverb algorithm by Sean Costello" ),
 	"Paul Batchelor",
diff --git a/plugins/Sf2Player/Sf2Player.cpp b/plugins/Sf2Player/Sf2Player.cpp
index 8b17f0bb0e..291f7fb760 100644
--- a/plugins/Sf2Player/Sf2Player.cpp
+++ b/plugins/Sf2Player/Sf2Player.cpp
@@ -58,7 +58,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT sf2player_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Sf2 Player",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "Player for SoundFont files" ),
 	"Paul Giblock <drfaygo/at/gmail/dot/com>",
diff --git a/plugins/Sfxr/Sfxr.cpp b/plugins/Sfxr/Sfxr.cpp
index ad7dd26a7b..a8bb81219c 100644
--- a/plugins/Sfxr/Sfxr.cpp
+++ b/plugins/Sfxr/Sfxr.cpp
@@ -61,7 +61,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT sfxr_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"sfxr",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"LMMS port of sfxr" ),
diff --git a/plugins/Sid/SidInstrument.cpp b/plugins/Sid/SidInstrument.cpp
index 450d172cfd..e075ed0495 100644
--- a/plugins/Sid/SidInstrument.cpp
+++ b/plugins/Sid/SidInstrument.cpp
@@ -75,7 +75,7 @@ extern "C"
 {
 Plugin::Descriptor PLUGIN_EXPORT sid_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"SID",
 	QT_TRANSLATE_NOOP( "PluginBrowser", "Emulation of the MOS6581 and MOS8580 "
 					"SID.\nThis chip was used in the Commodore 64 computer." ),
diff --git a/plugins/StereoEnhancer/StereoEnhancer.cpp b/plugins/StereoEnhancer/StereoEnhancer.cpp
index bda9c80868..1351ab8857 100644
--- a/plugins/StereoEnhancer/StereoEnhancer.cpp
+++ b/plugins/StereoEnhancer/StereoEnhancer.cpp
@@ -37,7 +37,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT stereoenhancer_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"StereoEnhancer Effect",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Plugin for enhancing stereo separation of a stereo input file" ),
diff --git a/plugins/StereoMatrix/StereoMatrix.cpp b/plugins/StereoMatrix/StereoMatrix.cpp
index de15d83701..34b2fc86b7 100644
--- a/plugins/StereoMatrix/StereoMatrix.cpp
+++ b/plugins/StereoMatrix/StereoMatrix.cpp
@@ -37,7 +37,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT stereomatrix_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Stereo Matrix",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Plugin for freely manipulating stereo output" ),
diff --git a/plugins/Stk/Mallets/Mallets.cpp b/plugins/Stk/Mallets/Mallets.cpp
index 37ab3f6f19..4adfb53476 100644
--- a/plugins/Stk/Mallets/Mallets.cpp
+++ b/plugins/Stk/Mallets/Mallets.cpp
@@ -53,7 +53,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT malletsstk_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Mallets",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Tuneful things to bang on" ),
diff --git a/plugins/TripleOscillator/TripleOscillator.cpp b/plugins/TripleOscillator/TripleOscillator.cpp
index 2931c3b85d..f197540192 100644
--- a/plugins/TripleOscillator/TripleOscillator.cpp
+++ b/plugins/TripleOscillator/TripleOscillator.cpp
@@ -50,7 +50,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT tripleoscillator_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"TripleOscillator",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"Three powerful oscillators you can modulate "
diff --git a/plugins/Vectorscope/Vectorscope.cpp b/plugins/Vectorscope/Vectorscope.cpp
index df093f6715..b9880691c6 100644
--- a/plugins/Vectorscope/Vectorscope.cpp
+++ b/plugins/Vectorscope/Vectorscope.cpp
@@ -34,7 +34,7 @@ namespace lmms
 extern "C" {
 	Plugin::Descriptor PLUGIN_EXPORT vectorscope_plugin_descriptor =
 	{
-		STRINGIFY(PLUGIN_NAME),
+		LMMS_STRINGIFY(PLUGIN_NAME),
 		"Vectorscope",
 		QT_TRANSLATE_NOOP("PluginBrowser", "A stereo field visualizer."),
 		"Martin Pavelek <he29/dot/HS/at/gmail/dot/com>",
diff --git a/plugins/Vestige/Vestige.cpp b/plugins/Vestige/Vestige.cpp
index 150a4f1e45..f5ac06e6d2 100644
--- a/plugins/Vestige/Vestige.cpp
+++ b/plugins/Vestige/Vestige.cpp
@@ -71,7 +71,7 @@ extern "C"
 
 Plugin::Descriptor Q_DECL_EXPORT  vestige_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"VeSTige",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 			"VST-host for using VST(i)-plugins within LMMS" ),
diff --git a/plugins/Vibed/Vibed.cpp b/plugins/Vibed/Vibed.cpp
index 87c42b187a..b9bcd9f1bb 100644
--- a/plugins/Vibed/Vibed.cpp
+++ b/plugins/Vibed/Vibed.cpp
@@ -52,7 +52,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT vibedstrings_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Vibed",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 					"Vibrating string modeler" ),
diff --git a/plugins/VstBase/vst_base.cpp b/plugins/VstBase/vst_base.cpp
index 6885feb970..80cb9d7362 100644
--- a/plugins/VstBase/vst_base.cpp
+++ b/plugins/VstBase/vst_base.cpp
@@ -36,7 +36,7 @@ extern "C"
 
 Plugin::Descriptor VSTBASE_EXPORT vstbase_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"VST Base",
 	"library for all LMMS plugins dealing with VST-plugins",
 	"Tobias Doerffel <tobydox/at/users/dot/sf/dot/net>",
diff --git a/plugins/VstEffect/VstEffect.cpp b/plugins/VstEffect/VstEffect.cpp
index 4fd66dbb50..eee3919c40 100644
--- a/plugins/VstEffect/VstEffect.cpp
+++ b/plugins/VstEffect/VstEffect.cpp
@@ -43,7 +43,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT vsteffect_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"VST",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"plugin for using arbitrary VST effects inside LMMS." ),
diff --git a/plugins/Watsyn/Watsyn.cpp b/plugins/Watsyn/Watsyn.cpp
index 7978dc1205..1c363d417c 100644
--- a/plugins/Watsyn/Watsyn.cpp
+++ b/plugins/Watsyn/Watsyn.cpp
@@ -46,7 +46,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT watsyn_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Watsyn",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"4-oscillator modulatable wavetable synth" ),
diff --git a/plugins/WaveShaper/WaveShaper.cpp b/plugins/WaveShaper/WaveShaper.cpp
index ededa2e0fc..7f0cf732fc 100644
--- a/plugins/WaveShaper/WaveShaper.cpp
+++ b/plugins/WaveShaper/WaveShaper.cpp
@@ -40,7 +40,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT waveshaper_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"Waveshaper Effect",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 				"plugin for waveshaping" ),
diff --git a/plugins/Xpressive/Xpressive.cpp b/plugins/Xpressive/Xpressive.cpp
index a69343e07f..de1140ed1d 100644
--- a/plugins/Xpressive/Xpressive.cpp
+++ b/plugins/Xpressive/Xpressive.cpp
@@ -54,7 +54,7 @@ namespace lmms
 
 extern "C" {
 
-Plugin::Descriptor PLUGIN_EXPORT xpressive_plugin_descriptor = { STRINGIFY(
+Plugin::Descriptor PLUGIN_EXPORT xpressive_plugin_descriptor = { LMMS_STRINGIFY(
 	PLUGIN_NAME), "Xpressive", QT_TRANSLATE_NOOP("PluginBrowser",
 	"Mathematical expression parser"), "Orr Dvori", 0x0100,
 	Plugin::Instrument, new PluginPixmapLoader("logo"), nullptr, nullptr };
diff --git a/plugins/ZynAddSubFx/ZynAddSubFx.cpp b/plugins/ZynAddSubFx/ZynAddSubFx.cpp
index 27cb4728e3..d3b1a90ed3 100644
--- a/plugins/ZynAddSubFx/ZynAddSubFx.cpp
+++ b/plugins/ZynAddSubFx/ZynAddSubFx.cpp
@@ -60,7 +60,7 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT zynaddsubfx_plugin_descriptor =
 {
-	STRINGIFY( PLUGIN_NAME ),
+	LMMS_STRINGIFY( PLUGIN_NAME ),
 	"ZynAddSubFX",
 	QT_TRANSLATE_NOOP( "PluginBrowser",
 			"Embedded ZynAddSubFX" ),
diff --git a/src/gui/instrument/InstrumentMidiIOView.cpp b/src/gui/instrument/InstrumentMidiIOView.cpp
index f42208b517..f98f58f5a7 100644
--- a/src/gui/instrument/InstrumentMidiIOView.cpp
+++ b/src/gui/instrument/InstrumentMidiIOView.cpp
@@ -144,8 +144,6 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
 		midiOutputLayout->insertWidget( 0, m_wpBtn );
 	}
 
-#define PROVIDE_CUSTOM_BASE_VELOCITY_UI
-#ifdef PROVIDE_CUSTOM_BASE_VELOCITY_UI
 	GroupBox* baseVelocityGroupBox = new GroupBox( tr( "CUSTOM BASE VELOCITY" ) );
 	layout->addWidget( baseVelocityGroupBox );
 
@@ -166,7 +164,6 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
 
 	connect( baseVelocityGroupBox->ledButton(), SIGNAL( toggled( bool ) ),
 			m_baseVelocitySpinBox, SLOT( setEnabled( bool ) ) );
-#endif
 
 	layout->addStretch();
 }
@@ -195,9 +192,7 @@ void InstrumentMidiIOView::modelChanged()
 	m_fixedOutputNoteSpinBox->setModel( &mp->m_fixedOutputNoteModel );
 	m_outputProgramSpinBox->setModel( &mp->m_outputProgramModel );
 
-#ifdef PROVIDE_CUSTOM_BASE_VELOCITY_UI
 	m_baseVelocitySpinBox->setModel( &mp->m_baseVelocityModel );
-#endif
 
 	if( m_rpBtn )
 	{
diff --git a/src/lmmsconfig.h.in b/src/lmmsconfig.h.in
index 30fbfdf3ff..d130d6fc25 100644
--- a/src/lmmsconfig.h.in
+++ b/src/lmmsconfig.h.in
@@ -53,25 +53,3 @@
 #cmakedefine LMMS_HAVE_STRING_H
 #cmakedefine LMMS_HAVE_PROCESS_H
 #cmakedefine LMMS_HAVE_LOCALE_H
-
-/* defines for libsamplerate */
-
-
-/* Target processor clips on negative float to int conversion. */
-#cmakedefine CPU_CLIPS_NEGATIVE 1
-#ifndef CPU_CLIPS_NEGATIVE
-#define CPU_CLIPS_NEGATIVE 0
-#endif
-
-/* Target processor clips on positive float to int conversion. */
-#cmakedefine CPU_CLIPS_POSITIVE 1
-#ifndef CPU_CLIPS_POSITIVE
-#define CPU_CLIPS_POSITIVE 0
-#endif
-
-/* Define if you have C99's lrint function. */
-#cmakedefine HAVE_LRINT 1
-
-/* Define if you have C99's lrintf function. */
-#cmakedefine HAVE_LRINTF 1
-