diff --git a/Makefile b/Makefile
index c72a33b..03c6e45 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ LFLAGS_release :=
 LFLAGS_debug := 
 LFLAGS := ${LFLAGS_common} ${LFLAGS_${CONFIG}} -g
 	
-INCLUDES := -I${JUCE_ROOT} -Ijuce
+INCLUDES := -I${JUCE_ROOT} -I.
 LIBS := -lstdc++ -lm -larmadillo -ljsoncpp -ljuce -lfreetype -lpthread -ldl -lrt -lX11 -lGL -lXinerama -lXext
 DEFINES := -DARMA_OPENMP_THREADS=1
 	
diff --git a/juce/JuceHeader.JUCE-3.1.1.h b/juce/JuceHeader.JUCE-3.1.1.h
index 9278cbd..1c1a197 100644
--- a/juce/JuceHeader.JUCE-3.1.1.h
+++ b/juce/JuceHeader.JUCE-3.1.1.h
@@ -14,14 +14,15 @@
 #define __APPHEADERFILE_J0FH5E__
 
 #include "AppConfig.h"
-#include "modules/juce_core/juce_core.h"
-#include "modules/juce_data_structures/juce_data_structures.h"
-#include "modules/juce_events/juce_events.h"
-#include "modules/juce_graphics/juce_graphics.h"
-#include "modules/juce_gui_basics/juce_gui_basics.h"
-#include "modules/juce_gui_extra/juce_gui_extra.h"
-#include "modules/juce_opengl/juce_opengl.h"
-#include "modules/juce_video/juce_video.h"
+#include <modules/juce_core/juce_core.h>
+#include <modules/juce_data_structures/juce_data_structures.h>
+#include <modules/juce_events/juce_events.h>
+#include <modules/juce_graphics/juce_graphics.h>
+#include <modules/juce_gui_basics/juce_gui_basics.h>
+#include <modules/juce_gui_extra/juce_gui_extra.h>
+#include <modules/juce_opengl/juce_opengl.h>
+#include <modules/juce_video/juce_video.h>
+
 
 #if ! DONT_SET_USING_JUCE_NAMESPACE
  // If your code uses a lot of JUCE classes, then this will obviously save you
diff --git a/juce/JuceHeader.JUCE-4.3.1.h b/juce/JuceHeader.JUCE-4.3.1.h
index 1b9a2a8..3d875b5 100644
--- a/juce/JuceHeader.JUCE-4.3.1.h
+++ b/juce/JuceHeader.JUCE-4.3.1.h
@@ -14,14 +14,14 @@
 #define __APPHEADERFILE_FGWBAQ__
 
 #include "AppConfig.h"
-#include "juce_core/juce_core.h"
-#include "juce_data_structures/juce_data_structures.h"
-#include "juce_events/juce_events.h"
-#include "juce_graphics/juce_graphics.h"
-#include "juce_gui_basics/juce_gui_basics.h"
-#include "juce_gui_extra/juce_gui_extra.h"
-#include "juce_opengl/juce_opengl.h"
-#include "juce_video/juce_video.h"
+#include <juce_core/juce_core.h>
+#include <juce_data_structures/juce_data_structures.h>
+#include <juce_events/juce_events.h>
+#include <juce_graphics/juce_graphics.h>
+#include <juce_gui_basics/juce_gui_basics.h>
+#include <juce_gui_extra/juce_gui_extra.h>
+#include <juce_opengl/juce_opengl.h>
+#include <juce_video/juce_video.h>
 
 #if ! DONT_SET_USING_JUCE_NAMESPACE
  // If your code uses a lot of JUCE classes, then this will obviously save you
diff --git a/source/DrawComponent.hpp b/source/DrawComponent.hpp
index a6857c6..bd68ef2 100644
--- a/source/DrawComponent.hpp
+++ b/source/DrawComponent.hpp
@@ -22,7 +22,7 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include <armadillo>
-#include "JuceHeader.h"
+#include <juce/JuceHeader.h>
 class DrawComponent;
 class DrawListener
 {
diff --git a/source/MainComponent.hpp b/source/MainComponent.hpp
index d24aafc..a721a22 100644
--- a/source/MainComponent.hpp
+++ b/source/MainComponent.hpp
@@ -22,7 +22,7 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include <armadillo>
-#include "JuceHeader.h"
+#include <juce/JuceHeader.h>
 #include "DeepStack.hpp"
 #include "RbmComponent.hpp"
 		
diff --git a/source/RbmComponent.hpp b/source/RbmComponent.hpp
index c920e8f..ed9e14a 100644
--- a/source/RbmComponent.hpp
+++ b/source/RbmComponent.hpp
@@ -21,7 +21,7 @@
 #define __RBM_COMPONENT__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "JuceHeader.h"
+#include <juce/JuceHeader.h>
 #include "DrawComponent.hpp"
 #include "Layer.hpp"
 #include "DeepStack.hpp"
diff --git a/source/RnnComponentLayer.hpp b/source/RnnComponentLayer.hpp
index bd793e2..f732d27 100644
--- a/source/RnnComponentLayer.hpp
+++ b/source/RnnComponentLayer.hpp
@@ -21,7 +21,7 @@
 #define __RNN_COMPONENT_LAYER__
 
 //[Headers]     -- You can add your own extra header files here --
-#include "JuceHeader.h"
+#include <juce/JuceHeader.h>
 #include "DrawComponent.hpp"
 #include "Layer.hpp"
 #include "DeepStack.hpp"