diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5448e6..88b4b25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,41 +37,7 @@ FILE(GLOB SOURCES "${CMAKE_CURRENT_LIST_DIR}/src/*.cpp"
 "${CMAKE_CURRENT_LIST_DIR}/src/*.h"  
 "${CMAKE_CURRENT_LIST_DIR}/src/SDL2/*.c"  
 "${CMAKE_CURRENT_LIST_DIR}/src/SDL2/*.h"  
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_audiosource.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_bassboostfilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_biquadresonantfilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_bus.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_c.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_dcremovalfilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_echofilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_error.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_fader.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_fft.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_fftfilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_file_hack_off.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_file_hack_on.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_file.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_filter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_flangerfilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_freeverbfilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_internal.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_lofifilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_misc.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_monotone.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_noise.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_openmpt.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_queue.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_robotizefilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_sfxr.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_speech.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_tedsid.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_thread.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_vic.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_vizsn.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_wav.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_waveshaperfilter.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud_wavstream.h"
-"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/soloud.h"
+"${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/*.h"
 "${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/MIDI/tml.h"
 "${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/MIDI/tsf.h"
 "${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/MIDI/soloud_midi.h"
diff --git a/src/Render.hpp b/src/Render.hpp
index 1494ad5..a6e19dc 100644
--- a/src/Render.hpp
+++ b/src/Render.hpp
@@ -15,6 +15,7 @@
 #include "SoLoud/soloud.h"
 #include "SoLoud/soloud_wav.h"
 #include "SoLoud/soloud_wavstream.h"
+#include "SoLoud/soloud_modplug.h"
 #include "SoLoud/soloud_openmpt.h"
 #include "SoLoud/MIDI/soloud_midi.h"
 #include "SoLoud/soloud_speech.h"
diff --git a/src/SoLoud/soloud_audiosource.h b/src/SoLoud/soloud_audiosource.h
index 77e6156..4e4d890 100644
--- a/src/SoLoud/soloud_audiosource.h
+++ b/src/SoLoud/soloud_audiosource.h
@@ -187,9 +187,9 @@ namespace SoLoud
 		time mLoopPoint;
 
 		// Get N samples from the stream to the buffer. Report samples written.
-		virtual unsigned int getAudio(float *aBuffer, unsigned int aSamplesToRead, unsigned int aBufferSize) = 0;
+		virtual unsigned int getAudio(float *aBuffer, unsigned int aSamplesToRead, unsigned int aBufferSize);
 		// Has the stream ended?
-		virtual bool hasEnded() = 0;
+		virtual bool hasEnded();
 		// Seek to certain place in the stream. Base implementation is generic "tape" seek (and slow).
 		virtual result seek(time aSeconds, float *mScratch, unsigned int mScratchSize);
 		// Rewind stream. Base implementation returns NOT_IMPLEMENTED, meaning it can't rewind.
@@ -306,7 +306,7 @@ namespace SoLoud
 		// DTor
 		virtual ~AudioSource();
 		// Create instance from the audio source. Called from within Soloud class.
-		virtual AudioSourceInstance *createInstance() = 0;
+		virtual AudioSourceInstance *createInstance();
 		// Stop all instances of this audio source
 		void stop();
 	};