diff --git a/Fir/Makefile b/Fir/Makefile
index 6d96f4f..7628acd 100644
--- a/Fir/Makefile
+++ b/Fir/Makefile
@@ -4,7 +4,7 @@ NAME := Fir
 
 GCC_SRCS := $(LIBSRC_PATH)/fir/fir2.c
 
-INCLUDES ?= -I $(LIBSRC_PATH)
-DEFINES ?= -Dradio_float_t=float -Dfir_float_t=float
+INCLUDES += -I $(LIBSRC_PATH)
+DEFINES += -Dradio_float_t=float -Dfir_float_t=float
 
 include $(MAKE_HOME)/compile.mk
diff --git a/JuceLibraryCode/Makefile b/JuceLibraryCode/Makefile
index 5468a40..a920411 100644
--- a/JuceLibraryCode/Makefile
+++ b/JuceLibraryCode/Makefile
@@ -20,10 +20,9 @@ SOURCES += juce_opengl/juce_opengl.cpp
 SOURCES += juce_video/juce_video.cpp
 
 CXX_SRCS := $(addprefix $(JUCE_MODULES)/, $(SOURCES))
-INCLUDES ?= -I . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I /usr/include/freetype2
-
-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 . -I $(JUCE_PATH) -I $(JUCE_PATH)/modules -I /usr/include/freetype2
+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
 
 include $(MAKE_HOME)/compile.mk
diff --git a/Makefile b/Makefile
index d6c0ea3..585fc74 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,12 @@ CXXFLAGS_release := -O3 -flto
 CFLAGS_release := -O3 -flto
 LDFLAGS_release := -O3 -flto
 TARGET_ARCH := -march=native
+CXXFLAGS += -std=c++17
 
 LIBS := -lstdc++ -lm -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt 
 LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -L/usr/X11R6/lib/
 DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS -DDISABLE_UNUSED_STATISTICS
+INCLUDES += -I $(BLAZE_PATH)
 
 all: app 
 app: objects link
diff --git a/Radio/Makefile b/Radio/Makefile
index 539f972..0e16bc3 100644
--- a/Radio/Makefile
+++ b/Radio/Makefile
@@ -22,7 +22,7 @@ GCC_SRCS += $(LIBSRC_PATH)/radio/statistics.c
 GCC_SRCS += $(LIBSRC_PATH)/radio/symbol.c
 GCC_SRCS += $(LIBSRC_PATH)/radio/synchronization.c
 
-INCLUDES ?= -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
-DEFINES ?= -Dradio_float_t=float -Dfir_float_t=float
+INCLUDES += -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
+DEFINES += -Dradio_float_t=float -Dfir_float_t=float
 
 include $(MAKE_HOME)/compile.mk
diff --git a/Source/Makefile b/Source/Makefile
index 9094c00..669ac15 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -12,6 +12,6 @@ CXX_SRCS += IQPlaneComponent.cpp
 CXX_SRCS += MainComponent.cpp
 CXX_SRCS += Main.cpp
 
-INCLUDES ?= -I . -I $(realpath ../JuceLibraryCode) -I $(JUCE_PATH) -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
+INCLUDES += -I . -I $(realpath ../JuceLibraryCode) -I $(JUCE_PATH) -I $(LIBSRC_PATH) -I $(EIGEN_PATH)
 
 include $(MAKE_HOME)/compile.mk
diff --git a/config.mk b/config.mk
index b78d1a4..f7811e1 100644
--- a/config.mk
+++ b/config.mk
@@ -7,5 +7,6 @@ MAKEFLAGS += --no-print-directory
 LIBSRC_PATH ?= $(realpath ../../libsrc)
 JUCE_PATH ?=  $(realpath ../../extlib/JUCE)
 EIGEN_PATH ?= $(realpath ../../extlib/eigen)
+BLAZE_PATH ?= $(realpath ../../extlib/blaze)
 
 export
\ No newline at end of file