diff --git a/Source/JaySynth.cpp b/Source/JaySynth.cpp
index 388e9f3..d06ba0d 100644
--- a/Source/JaySynth.cpp
+++ b/Source/JaySynth.cpp
@@ -16,6 +16,15 @@
 #include "JaySynthMidiCC.h"
 #include "JaySynth.h"
 
+#include "synth/voice.h"
+#include "synth/vco.h"
+#include "synth/noise.h"
+#include "synth/smooth.h"
+#include "synth/vcf.h"
+#include "synth/lfo.h"
+#include "synth/env.h"
+#include "synth/param_scale.h"
+
 #ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))
 #endif
diff --git a/Source/JaySynthMidiCC.h b/Source/JaySynthMidiCC.h
index 157dea1..71412d9 100644
--- a/Source/JaySynthMidiCC.h
+++ b/Source/JaySynthMidiCC.h
@@ -14,6 +14,15 @@
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "synth/synth_defs.h"
 
+#include "synth/voice.h"
+#include "synth/vco.h"
+#include "synth/noise.h"
+#include "synth/smooth.h"
+#include "synth/vcf.h"
+#include "synth/lfo.h"
+#include "synth/env.h"
+#include "synth/param_scale.h"
+
 //==============================================================================
 #define	MIDICONTROLLER_TYPE_VELKEY		0x00000080
 
diff --git a/Source/graph_window.h b/Source/graph_window.h
index 80565f3..bfe556e 100644
--- a/Source/graph_window.h
+++ b/Source/graph_window.h
@@ -24,7 +24,16 @@
 
 //[Headers]     -- You can add your own extra header files here --
 #include "../JuceLibraryCode/JuceHeader.h"
-#include "synth/synth_defs.h"
+
+#include "synth/voice.h"
+#include "synth/vco.h"
+#include "synth/noise.h"
+#include "synth/smooth.h"
+#include "synth/vcf.h"
+#include "synth/lfo.h"
+#include "synth/env.h"
+#include "synth/param_scale.h"
+
 //[/Headers]
 
 
diff --git a/Source/synth/synth_defs.h b/Source/synth/synth_defs.h
index 0118a92..70d7df6 100644
--- a/Source/synth/synth_defs.h
+++ b/Source/synth/synth_defs.h
@@ -67,15 +67,5 @@ void SynthDebug(const char *fmtstr, ...);
 #define jsy_min(a,b)            (((a) < (b)) ? (a) : (b))
 #endif
 
-
-#include "voice.h"
-#include "vco.h"
-#include "noise.h"
-#include "smooth.h"
-#include "vcf.h"
-#include "lfo.h"
-#include "env.h"
-#include "param_scale.h"
-
 #endif // _SYNTH_DEFS_H_