Revert irrelevant changes

plugins/FreeBoy/Gb_Apu_Buffer.h

@@ -25,7 +25,7 @@
 
 #include "Gb_Apu.h"
 #include "Multi_Buffer.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 class Gb_Apu_Buffer : public Gb_Apu {
 	MM_OPERATORS

plugins/GigPlayer/GigPlayer.h

@@ -38,7 +38,7 @@
 #include "Knob.h"
 #include "LcdSpinBox.h"
 #include "LedCheckbox.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 #include "gig.h"
 
 class GigInstrumentView;

plugins/LadspaEffect/LadspaEffect.cpp

@@ -38,7 +38,7 @@
 #include "EffectChain.h"
 #include "AutomationPattern.h"
 #include "ControllerConnection.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 #include "ValueBuffer.h"
 #include "Song.h"
 

plugins/LadspaEffect/calf/CMakeLists.txt

@@ -47,5 +47,3 @@ ENDIF()
 IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)
 	SET_TARGET_PROPERTIES(veal PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
 ENDIF()
-
-TARGET_LINK_LIBRARIES(veal lmmslib)

plugins/Xpressive/ExprSynth.h

@@ -31,7 +31,7 @@
 #include "AutomatableModel.h"
 #include "Graph.h"
 #include "Instrument.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 
 class ExprFrontData;

plugins/bit_invader/bit_invader.h

@@ -33,7 +33,7 @@
 #include "Knob.h"
 #include "PixmapButton.h"
 #include "LedCheckbox.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 class oscillator;
 class bitInvaderView;

plugins/kicker/CMakeLists.txt

@@ -1,3 +1,3 @@
 INCLUDE(BuildPlugin)
 
-BUILD_PLUGIN(kicker kicker.cpp kicker.h KickerOsc.h MOCFILES kicker.h EMBEDDED_RESOURCES artwork.png logo.png)
+BUILD_PLUGIN(kicker kicker.cpp kicker.h MOCFILES kicker.h EMBEDDED_RESOURCES artwork.png logo.png)

plugins/kicker/KickerOsc.h

@@ -31,7 +31,7 @@
 
 #include "lmms_math.h"
 #include "interpolation.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 
 template<class FX = DspEffectLibrary::StereoBypass>

plugins/nes/Nes.h

@@ -34,7 +34,7 @@
 #include "TempoSyncKnob.h"
 #include "NotePlayHandle.h"
 #include "PixmapButton.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 
 #define makeknob( name, x, y, hint, unit, oname ) 		\

plugins/patman/patman.h

@@ -30,7 +30,7 @@
 #include "InstrumentView.h"
 #include "SampleBuffer.h"
 #include "AutomatableModel.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 class PixmapButton;
 

plugins/sf2_player/sf2_player.h

@@ -37,7 +37,7 @@
 #include "LcdSpinBox.h"
 #include "LedCheckbox.h"
 #include "fluidsynthshims.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 class sf2InstrumentView;
 class sf2Font;

plugins/sfxr/sfxr.h

@@ -34,7 +34,7 @@
 #include "Graph.h"
 #include "PixmapButton.h"
 #include "LedCheckbox.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 
 enum SfxrWaves

plugins/vestige/vestige.cpp

@@ -40,6 +40,7 @@
 
 #include <string>
 
+#include "BufferManager.h"
 #include "ConfigManager.h"
 #include "Engine.h"
 #include "FileDialog.h"

plugins/vibed/string_container.h

@@ -27,7 +27,7 @@
 #include <QVector>
 
 #include "vibrating_string.h"
-#include "Memory.h"
+#include "MemoryManager.h"
 
 
 class stringContainer

plugins/watsyn/Watsyn.h

@@ -35,7 +35,7 @@
 #include "NotePlayHandle.h"
 #include "PixmapButton.h"
 #include <samplerate.h>
-#include "Memory.h"
+#include "MemoryManager.h"
 
 
 #define makeknob( name, x, y, hint, unit, oname ) 		\