diff --git a/JuceLibraryCode/Makefile b/JuceLibraryCode/Makefile
index ac0785e..7e8dbd5 100644
--- a/JuceLibraryCode/Makefile
+++ b/JuceLibraryCode/Makefile
@@ -7,10 +7,5 @@ include config.mk
 
 CXX_SRCS := $(addprefix $(JUCE_MODULES)/, $(SOURCES))
 INCLUDES += -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I /usr/include/freetype2
-DEFINES += -DJUCE_GCC=1 -DLINUX=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000
-DEFINES += -DHAVE_LROUND
-DEFINES_debug += -DDEBUG=1 -D_DEBUG=1
-DEFINES_release += -DNDEBUG
-CXXFLAGS += -std=c++11
 
 include $(MAKE_HOME)/compile.mk
diff --git a/JuceLibraryCode/Makefile.win b/JuceLibraryCode/Makefile.win
index 6f2aae2..7df3a6d 100644
--- a/JuceLibraryCode/Makefile.win
+++ b/JuceLibraryCode/Makefile.win
@@ -7,10 +7,5 @@ include config.mk
 
 CXX_SRCS := $(addprefix $(JUCE_MODULES)/, $(SOURCES))
 INCLUDES += -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I /usr/include/freetype2
-DEFINES += -DWIN32 -D_WINDOWS -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000
-DEFINES += -DHAVE_LROUND
-DEFINES_debug += -DDEBUG=1 -D_DEBUG=1
-DEFINES_release += -DNDEBUG
-CXXFLAGS += -std=c++11
 
 include $(MAKE_HOME)/compile.mk
diff --git a/Makefile b/Makefile
index 9cd599c..67e6740 100644
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,18 @@ DEFINES += -DHAVE_LROUND
 CFLAGS += -fPIC
 CXXFLAGS += -fPIC
 CXXFLAGS += -std=c++11
-CXXFLAGS += -Wno-volatile
-CXXFLAGS += -Wno-deprecated-declarations
-CXXFLAGS += -Wno-deprecated-enum-float-conversion
-CXXFLAGS += -Wno-register
-CXXFLAGS += -Wno-address-of-packed-member
 
 LIBS := -lstdc++ -lm -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt
 LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -L/usr/X11R6/lib/ -shared
-DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS -DDISABLE_UNUSED_STATISTICS -D__cdecl=""
+
+DEFINES += -D__cdecl=""
+DEFINES += -DJUCE_GCC=1 -DLINUX=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000
+DEFINES_debug += -DDEBUG=1 -D_DEBUG=1
+DEFINES_release += -DNDEBUG
+
 INCLUDES += -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I $(LIBSRC_PATH)
 
-PACKAGES := JuceLibraryCode Source Synth Fir
+PACKAGES := JuceLibraryCode Source Synth
 
 export 
 
@@ -45,8 +45,5 @@ Source:
 JuceLibraryCode:
 	@$(MAKE) -C $@
 
-Fir:
-	@$(MAKE) -C $(LIBSRC_PATH)/fir
-
 
 include $(MAKE_HOME)/link.mk
diff --git a/Makefile.win b/Makefile.win
index a65cbb1..e6ce352 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -14,18 +14,17 @@ DEFINES += -DHAVE_LROUND
 CFLAGS += -fPIC
 CXXFLAGS += -fPIC
 CXXFLAGS += -std=c++11
-CXXFLAGS += -Wno-volatile
-CXXFLAGS += -Wno-deprecated-declarations
-CXXFLAGS += -Wno-deprecated-enum-float-conversion
-CXXFLAGS += -Wno-register
-CXXFLAGS += -Wno-address-of-packed-member
 
 LIBS := -lwininet -lwinmm -limm32 -lshlwapi -lcomdlg32 -lgdi32 -lole32 -loleaut32 -lversion -lwsock32 -liphlpapi -luuid -lws2_32 -lm -lksuser
 LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -L/usr/X11R6/lib/ -shared -static-libstdc++ -static-libgcc -mwindows -s 
+
 DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS -DDISABLE_UNUSED_STATISTICS
+DEFINES_debug += -DDEBUG=1 -D_DEBUG=1
+DEFINES_release += -DNDEBUG
+
 INCLUDES += -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I $(VST2_SDK_PATH) -I $(LIBSRC_PATH)
 
-PACKAGES := JuceLibraryCode Source Synth Fir
+PACKAGES := JuceLibraryCode Source Synth
 
 export 
 
@@ -45,8 +44,5 @@ Source:
 JuceLibraryCode:
 	@$(MAKE) -C $@ -f Makefile.win
 
-Fir:
-	@$(MAKE) -C $(LIBSRC_PATH)/fir
-
 
 include $(MAKE_HOME)/link.mk
diff --git a/Source/Makefile b/Source/Makefile
index c240773..9e9b8b1 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -7,10 +7,5 @@ VST2_SDK_PATH ?= $(realpath ../sdk/vst/vstsdk2.4)
 include config.mk
 
 INCLUDES += -I $(LIBSRC_PATH) -I $(JUCE_PATH) -I $(VST2_SDK_PATH)
-DEFINES += -Dradio_float_t=float -Dfir_float_t=float -Dsynth_float_t=float
-CXXFLAGS += -std=c++11
-# Reduce Blaze warnings
-CXXFLAGS += -Wno-volatile -Wno-deprecated-declarations
-DEFINES += -DJUCE_GCC=1 -DLINUX=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000
 
 include $(MAKE_HOME)/compile.mk
diff --git a/Source/Makefile.win b/Source/Makefile.win
index 40787c7..bfad52d 100644
--- a/Source/Makefile.win
+++ b/Source/Makefile.win
@@ -7,10 +7,5 @@ VST2_SDK_PATH ?= $(realpath ../sdk/vst/vstsdk2.4)
 include config.mk
 
 INCLUDES += -I $(LIBSRC_PATH) -I $(JUCE_PATH) -I $(VST2_SDK_PATH)
-DEFINES += -Dradio_float_t=float -Dfir_float_t=float -Dsynth_float_t=float
-CXXFLAGS += -std=c++11
-# Reduce Blaze warnings
-CXXFLAGS += -Wno-volatile -Wno-deprecated-declarations
-DEFINES += -DJUCE_GCC=1 -DLINUX=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000
 
 include $(MAKE_HOME)/compile.mk
diff --git a/Source/synth/Makefile b/Source/synth/Makefile
index 18bc221..90c3b63 100644
--- a/Source/synth/Makefile
+++ b/Source/synth/Makefile
@@ -6,6 +6,5 @@ VST2_SDK_PATH ?= $(realpath ../../sdk/vst/vstsdk2.4)
 include config.mk
 
 INCLUDES ?= -I $(LIBSRC_PATH) -I $(VST2_SDK_PATH)
-DEFINES += -Dradio_float_t=float -Dfir_float_t=float -Dsynth_float_t=float
 
 include $(MAKE_HOME)/compile.mk
diff --git a/Source/synth/Makefile.win b/Source/synth/Makefile.win
index bd50fbe..18a3bc2 100644
--- a/Source/synth/Makefile.win
+++ b/Source/synth/Makefile.win
@@ -6,6 +6,5 @@ VST2_SDK_PATH ?= $(realpath ../../sdk/vst/vstsdk2.4)
 include config.mk
 
 INCLUDES ?= -I $(LIBSRC_PATH) -I $(VST2_SDK_PATH)
-DEFINES += -Dradio_float_t=float -Dfir_float_t=float -Dsynth_float_t=float
 
 include $(MAKE_HOME)/compile.mk