diff --git a/GUI/Widgets/Fl_Canvas.h b/GUI/Widgets/Fl_Canvas.h
index 6f37f20..9b41321 100644
--- a/GUI/Widgets/Fl_Canvas.h
+++ b/GUI/Widgets/Fl_Canvas.h
@@ -16,10 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <Fl/Fl_Group.H>
-#include <Fl/Fl_Output.H>
-#include <Fl/Fl_Image.H>
-#include <Fl/Fl_Menu_Button.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Output.H>
+#include <FL/Fl_Image.H>
+#include <FL/Fl_Menu_Button.H>
 #include <vector>
 #include <string>
 #include "../../GraphSort.h"
diff --git a/GUI/Widgets/Fl_CommentGUI.h b/GUI/Widgets/Fl_CommentGUI.h
index 2e45828..ed3bd14 100644
--- a/GUI/Widgets/Fl_CommentGUI.h
+++ b/GUI/Widgets/Fl_CommentGUI.h
@@ -19,7 +19,7 @@
 #ifndef COMMENTGUI
 #define COMMENTGUI
 
-#include <Fl/Fl_Input.H>
+#include <FL/Fl_Input.H>
 #include "Fl_DeviceGUI.h"
 
 class Fl_CommentGUI : public Fl_DeviceGUI
diff --git a/GUI/Widgets/Fl_DeviceGUI.h b/GUI/Widgets/Fl_DeviceGUI.h
index 11d5c67..400db89 100644
--- a/GUI/Widgets/Fl_DeviceGUI.h
+++ b/GUI/Widgets/Fl_DeviceGUI.h
@@ -22,9 +22,9 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Button.H>
-#include <Fl/Fl_Pixmap.H>
-#include <Fl/Fl_Menu_Button.H>
-#include <Fl/Fl_Box.H>
+#include <FL/Fl_Pixmap.H>
+#include <FL/Fl_Menu_Button.H>
+#include <FL/Fl_Box.H>
 #include "Fl_DragBar.H"
 #include "SpiralGUI.H"
 #include <iostream>
diff --git a/SpiralSound/PluginManager.h b/SpiralSound/PluginManager.h
index 16ba9fe..8926093 100644
--- a/SpiralSound/PluginManager.h
+++ b/SpiralSound/PluginManager.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 
 
-#include <Fl/Fl_Double_Window.H>
-#include <Fl/Fl_Pixmap.H>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Pixmap.H>
 #include <iostream>
 #include <vector>
 #include "Plugins/SpiralPlugin.h"
diff --git a/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C b/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C
index f6809a4..3fcfbf3 100644
--- a/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C
+++ b/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "AmpPlugin.h"
 #include "AmpPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 #define PI 3.141592654
diff --git a/SpiralSound/Plugins/AmpPlugin/AmpPlugin.h b/SpiralSound/Plugins/AmpPlugin/AmpPlugin.h
index 9b83fd2..eb52492 100644
--- a/SpiralSound/Plugins/AmpPlugin/AmpPlugin.h
+++ b/SpiralSound/Plugins/AmpPlugin/AmpPlugin.h
@@ -20,7 +20,7 @@
 #define AMPPLUGIN
 
 #include "../SpiralPlugin.h"
-#include <Fl/Fl.H>
+#include <FL/Fl.H>
 
 class AmpPlugin : public SpiralPlugin
 {
diff --git a/SpiralSound/Plugins/AmpPlugin/AmpPluginGUI.C b/SpiralSound/Plugins/AmpPlugin/AmpPluginGUI.C
index dd99160..405b559 100644
--- a/SpiralSound/Plugins/AmpPlugin/AmpPluginGUI.C
+++ b/SpiralSound/Plugins/AmpPlugin/AmpPluginGUI.C
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include "AmpPluginGUI.h"
 
diff --git a/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C b/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C
index 34fecbf..2e46715 100644
--- a/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C
+++ b/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "AnotherFilterPlugin.h"
 #include "AnotherFilterPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 #define PI 3.141592654
diff --git a/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPluginGUI.C b/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPluginGUI.C
index a490f26..bb78ca8 100644
--- a/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPluginGUI.C
+++ b/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "AnotherFilterPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C
index c817857..e314655 100644
--- a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C
+++ b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "BeatMatchPlugin.h"
 #include "BeatMatchPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C
index 021d931..334f741 100644
--- a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C
+++ b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "BeatMatchPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePlugin.C b/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePlugin.C
index 6f38293..fcf4330 100644
--- a/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePlugin.C
+++ b/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "ComplexEnvelopePlugin.h"
 #include "ComplexEnvelopePluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 extern "C" {
diff --git a/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePluginGUI.C b/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePluginGUI.C
index c956715..1e49e09 100644
--- a/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePluginGUI.C
+++ b/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePluginGUI.C
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include "ComplexEnvelopePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 static const float TIMED_SLIDER_MAX = 3.0f;
diff --git a/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C b/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
index 2294a48..0060c82 100644
--- a/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
+++ b/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include "ControllerPlugin.h"
 #include "ControllerPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C b/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C
index 4c0b192..6b398c0 100644
--- a/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C
+++ b/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include "ControllerPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C b/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C
index 0740b53..b32a933 100644
--- a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C
+++ b/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "CounterPlugin.h"
 #include "CounterPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C b/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C
index 4e80d6e..315a3f7 100644
--- a/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C
+++ b/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "CounterPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include <stdio.h>
 
diff --git a/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C b/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C
index 2ec4115..c302b7c 100644
--- a/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C
+++ b/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "DelayPlugin.h"
 #include "DelayPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/DelayPlugin/DelayPluginGUI.C b/SpiralSound/Plugins/DelayPlugin/DelayPluginGUI.C
index 1f8ed29..2bb3db7 100644
--- a/SpiralSound/Plugins/DelayPlugin/DelayPluginGUI.C
+++ b/SpiralSound/Plugins/DelayPlugin/DelayPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "DelayPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C
index 3616424..5c3d2f2 100644
--- a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C
+++ b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "DiskWriterPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C b/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C
index 10a626d..7b9764c 100644
--- a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C
+++ b/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C
@@ -22,7 +22,7 @@
 
 #include "DistributorPlugin.h"
 #include "DistributorPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C b/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C
index 10a696a..0c8aaa1 100644
--- a/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C
+++ b/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "DistributorPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C b/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C
index a9392a6..f04fa80 100644
--- a/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C
+++ b/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "EchoPlugin.h"
 #include "EchoPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/EchoPlugin/EchoPluginGUI.C b/SpiralSound/Plugins/EchoPlugin/EchoPluginGUI.C
index 35928cd..bf0b54f 100644
--- a/SpiralSound/Plugins/EchoPlugin/EchoPluginGUI.C
+++ b/SpiralSound/Plugins/EchoPlugin/EchoPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "EchoPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C b/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C
index 882b5b3..cbf544a 100644
--- a/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C
+++ b/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "EnvFollowerPlugin.h"
 #include "EnvFollowerPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPluginGUI.C b/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPluginGUI.C
index cafca30..a29ae00 100644
--- a/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPluginGUI.C
+++ b/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "EnvFollowerPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C b/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C
index d161f9c..beadbe5 100644
--- a/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C
+++ b/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "EnvelopePlugin.h"
 #include "EnvelopePluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/EnvelopePlugin/EnvelopePluginGUI.C b/SpiralSound/Plugins/EnvelopePlugin/EnvelopePluginGUI.C
index 90c3a88..1e0749d 100644
--- a/SpiralSound/Plugins/EnvelopePlugin/EnvelopePluginGUI.C
+++ b/SpiralSound/Plugins/EnvelopePlugin/EnvelopePluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "EnvelopePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C b/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C
index ba0d377..90a304e 100644
--- a/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C
+++ b/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "FilterPlugin.h"
 #include "FilterPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/FilterPlugin/FilterPluginGUI.C b/SpiralSound/Plugins/FilterPlugin/FilterPluginGUI.C
index ab311f9..06d55be 100644
--- a/SpiralSound/Plugins/FilterPlugin/FilterPluginGUI.C
+++ b/SpiralSound/Plugins/FilterPlugin/FilterPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "FilterPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C b/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C
index ceffe72..ed60978 100644
--- a/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C
+++ b/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "FlipflopPlugin.h"
 #include "FlipflopPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/FlipflopPlugin/FlipflopPluginGUI.C b/SpiralSound/Plugins/FlipflopPlugin/FlipflopPluginGUI.C
index 959c1e9..7b352ec 100644
--- a/SpiralSound/Plugins/FlipflopPlugin/FlipflopPluginGUI.C
+++ b/SpiralSound/Plugins/FlipflopPlugin/FlipflopPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "FlipflopPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C b/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C
index c62f9d3..21629e8 100644
--- a/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C
+++ b/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "FormantFilterPlugin.h"
 #include "FormantFilterPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPluginGUI.C b/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPluginGUI.C
index ab20995..a71a4c2 100644
--- a/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPluginGUI.C
+++ b/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "FormantFilterPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C b/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C
index 0ed6ac5..09e141c 100644
--- a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C
+++ b/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C
@@ -18,7 +18,7 @@
 
 #include "JackPlugin.h"
 #include "JackPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 #include <FL/Fl_Hold_Browser.H>
 #include <algorithm>
diff --git a/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C b/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C
index 76b5caa..c0bc6bf 100644
--- a/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C
+++ b/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C
@@ -26,7 +26,7 @@
 
 #include "JoystickPlugin.h"
 #include "JoystickPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.C b/SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.C
index 258cc18..3c7a3f2 100644
--- a/SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.C
+++ b/SpiralSound/Plugins/JoystickPlugin/JoystickPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "JoystickPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 
 using namespace std;
 
diff --git a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C
index 357532e..4afb44f 100644
--- a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C
+++ b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "KeyboardPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 #include <FL/Fl_Hold_Browser.H>
 #include <FL/Fl_Double_Window.H>
diff --git a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C b/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C
index 7eff2f2..4711036 100644
--- a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C
+++ b/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C
@@ -18,7 +18,7 @@
 
 #include "LFOPlugin.h"
 #include "LFOPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C b/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C
index 5b728df..ea9d209 100644
--- a/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C
+++ b/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C
@@ -17,7 +17,7 @@
  */
 
 #include "LFOPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include "../GUI/WS_Sine.h"
 #include "../GUI/WS_Tri.h"
diff --git a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C b/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C
index b2a6433..617ac34 100644
--- a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C
+++ b/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include "LogicPlugin.h"
 #include "LogicPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C b/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C
index dbcf2e2..cdd7a32 100644
--- a/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C
+++ b/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "LogicPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include <stdio.h>
 
diff --git a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C
index 904ac15..a585f28 100644
--- a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C
+++ b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "MasherPlugin.h"
 #include "MasherPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 #define PI 3.141592654
diff --git a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h
index baaa8e5..1f3dde0 100644
--- a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h
+++ b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h
@@ -17,7 +17,7 @@
 */ 
 
 #include "../SpiralPlugin.h"
-#include <Fl/Fl.H>
+#include <FL/Fl.H>
 
 #ifndef MasherPLUGIN
 #define MasherPLUGIN
diff --git a/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C b/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C
index 51d72de..7ff1e27 100644
--- a/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C
+++ b/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "MasherPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C b/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
index 0d615ec..a0e8cbb 100644
--- a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
+++ b/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "MatrixPlugin.h"
 #include "MatrixPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C b/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C
index f48b05a..e35380c 100644
--- a/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C
+++ b/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C
@@ -17,9 +17,9 @@
 */
 
 #include "MatrixPluginGUI.h"
-#include <Fl/fl_draw.H>
 #include <FL/fl_draw.H>
-//#include <Fl/fl_file_chooser.H>
+#include <FL/fl_draw.H>
+//#include <FL/fl_file_chooser.H>
 
 using namespace std;
 
diff --git a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C b/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C
index 5372f17..5281055 100644
--- a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C
+++ b/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C
@@ -18,7 +18,7 @@
 
 #include "MidiPlugin.h"
 #include "MidiPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "../../NoteTable.h"
 #include "../../Midi.h"
 #include "SpiralIcon.xpm"
diff --git a/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C b/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C
index e73afcc..76b36db 100644
--- a/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C
+++ b/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "MidiPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 #include <FL/Fl_Hold_Browser.H>
 #include <FL/Fl_Double_Window.H>
diff --git a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C
index 92c1f1d..59b3c23 100644
--- a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C
+++ b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "MixSwitchPlugin.h"
 #include "MixSwitchPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include <stdio.h>
 #include "SpiralIcon.xpm"
 
diff --git a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C
index 06b5019..e2ea52c 100644
--- a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C
+++ b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "MixSwitchPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C b/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
index e46ca5e..bf43eef 100644
--- a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
+++ b/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include "MixerPlugin.h"
 #include "MixerPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C b/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C
index 103f4b4..97fe62d 100644
--- a/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C
+++ b/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "MixerPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C
index e48a8c0..6889e14 100644
--- a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C
+++ b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "MoogFilterPlugin.h"
 #include "MoogFilterPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 #define PI 3.141592654
diff --git a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C
index d856cb8..f825b2d 100644
--- a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C
+++ b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "MoogFilterPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/MousePlugin/MousePluginGUI.C b/SpiralSound/Plugins/MousePlugin/MousePluginGUI.C
index aff0afc..5a7eb20 100644
--- a/SpiralSound/Plugins/MousePlugin/MousePluginGUI.C
+++ b/SpiralSound/Plugins/MousePlugin/MousePluginGUI.C
@@ -18,7 +18,7 @@
 */
 
 #include "MousePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 ScratchWidget::ScratchWidget (int x, int y, int w, int h, const char *l) :
diff --git a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C
index 3d4685b..7796da4 100644
--- a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C
+++ b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C
@@ -17,7 +17,7 @@
 */
 #include "NoisePlugin.h"
 #include "NoisePluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include <limits.h>
 #include "SpiralIcon.xpm"
 #include <stdlib.h>
diff --git a/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C b/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C
index fb641d7..e2c790d 100644
--- a/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C
+++ b/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "NoisePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C
index c12dc95..8e523fc 100644
--- a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C
+++ b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "NoteSnapPlugin.h"
 #include "NoteSnapPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C
index 2726bd3..8f98838 100644
--- a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C
+++ b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "NoteSnapPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C b/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C
index 1c76546..ff75768 100644
--- a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C
+++ b/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "OperatorPlugin.h"
 #include "OperatorPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C b/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C
index 29c67f4..38c4571 100644
--- a/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C
+++ b/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "OperatorPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 //#include <stdio.h>
 
diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C
index 1be0048..948ca51 100644
--- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C
+++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "OscillatorPlugin.h"
 #include "OscillatorPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include <limits.h>
 #include "SpiralIcon.xpm"
 #include <stdlib.h>
diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C
index ad47e46..8420ff6 100644
--- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C
+++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "OscillatorPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include "../GUI/WS_Square.h"
 #include "../GUI/WS_Noise.h"
diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h
index 83a323c..f99c708 100644
--- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h
+++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h
@@ -22,9 +22,9 @@
 #include <FL/Fl_Pixmap.H>
 #include <FL/Fl_Slider.H>
 #include <FL/Fl_Counter.H>
-#include <Fl/Fl_Tabs.H>
-#include <Fl/Fl_Group.H>
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Tabs.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Button.H>
 #include "../Widgets/Fl_LED_Button.H"
 #include "../Widgets/Fl_Knob.H"
 #include "../SpiralPluginGUI.h"
diff --git a/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C b/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C
index cb56cf2..32bd09f 100644
--- a/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C
+++ b/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "OutputPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C
index 8b62ec4..613108f 100644
--- a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C
+++ b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "PoshSamplerPlugin.h"
 #include "PoshSamplerPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 #include "../../RiffWav.h"
diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C
index 0d3f13f..70ac1a7 100644
--- a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C
+++ b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C
@@ -17,10 +17,10 @@
 */
 
 #include "PoshSamplerPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include "../GUI/WaveChooser.h"
-#include <Fl/fl_file_chooser.H>
+#include <FL/fl_file_chooser.H>
 
 using namespace std;
 
diff --git a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C b/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C
index e21045c..1f1f985 100644
--- a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C
+++ b/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "RingModPlugin.h"
 #include "RingModPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C b/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C
index d4f7f99..52e0ae8 100644
--- a/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C
+++ b/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "RingModPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C
index a016c18..222bc0c 100644
--- a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C
+++ b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "SVFilterPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C
index 97537e0..67f0824 100644
--- a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C
+++ b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SampleHoldPlugin.h"
 #include "SampleHoldPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C
index 134dda8..5159d22 100644
--- a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C
+++ b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "SampleHoldPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C b/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C
index cbc812e..3de8622 100644
--- a/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C
+++ b/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SamplerPlugin.h"
 #include "SamplerPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../RiffWav.h"
 #include "../../NoteTable.h"
diff --git a/SpiralSound/Plugins/SamplerPlugin/SamplerPluginGUI.C b/SpiralSound/Plugins/SamplerPlugin/SamplerPluginGUI.C
index 72a1277..a865b12 100644
--- a/SpiralSound/Plugins/SamplerPlugin/SamplerPluginGUI.C
+++ b/SpiralSound/Plugins/SamplerPlugin/SamplerPluginGUI.C
@@ -17,9 +17,9 @@
 */ 
 
 #include "SamplerPluginGUI.h"
-#include <Fl/fl_draw.H>
 #include <FL/fl_draw.H>
-#include <Fl/fl_file_chooser.H>
+#include <FL/fl_draw.H>
+#include <FL/fl_file_chooser.H>
 
 using namespace std;
 
diff --git a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C b/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C
index cc495ce..3db9d4a 100644
--- a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C
+++ b/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C
@@ -17,7 +17,7 @@
 */
 #include "ScopePlugin.h"
 #include "ScopePluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C b/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C
index ef18b96..c002cbc 100644
--- a/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C
+++ b/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "ScopePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C b/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C
index 87e40ca..8dcc005 100644
--- a/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C
+++ b/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SeqPlugin.h"
 #include "SeqPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/SeqPlugin/SeqPluginGUI.C b/SpiralSound/Plugins/SeqPlugin/SeqPluginGUI.C
index 1ec39e0..5a6ed51 100644
--- a/SpiralSound/Plugins/SeqPlugin/SeqPluginGUI.C
+++ b/SpiralSound/Plugins/SeqPlugin/SeqPluginGUI.C
@@ -18,9 +18,9 @@
 
 #include <stdio.h>
 #include "SeqPluginGUI.h"
-#include <Fl/fl_draw.H>
 #include <FL/fl_draw.H>
-#include <Fl/fl_file_chooser.H>
+#include <FL/fl_draw.H>
+#include <FL/fl_file_chooser.H>
 
 using namespace std;
 
diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C
index 7fee255..34e2dbc 100644
--- a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C
+++ b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SeqSelectorPlugin.h"
 #include "SeqSelectorPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C
index 9e2219a..2a3120b 100644
--- a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C
+++ b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include "SeqSelectorPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Box.H>
 
diff --git a/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C b/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C
index 826a61f..93523df 100644
--- a/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C
+++ b/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SequencerPlugin.h"
 #include "SequencerPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/SequencerPlugin/SequencerPluginGUI.C b/SpiralSound/Plugins/SequencerPlugin/SequencerPluginGUI.C
index 64e2389..f6095c2 100644
--- a/SpiralSound/Plugins/SequencerPlugin/SequencerPluginGUI.C
+++ b/SpiralSound/Plugins/SequencerPlugin/SequencerPluginGUI.C
@@ -18,9 +18,9 @@
 
 #include <stdio.h>
 #include "SequencerPluginGUI.h"
-#include <Fl/fl_draw.H>
 #include <FL/fl_draw.H>
-#include <Fl/fl_file_chooser.H>
+#include <FL/fl_draw.H>
+#include <FL/fl_file_chooser.H>
 #include <FL/Fl_Color_Chooser.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C b/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C
index f2057d7..3cd637c 100644
--- a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C
+++ b/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SmoothPlugin.h"
 #include "SmoothPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C b/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C
index 66e0fee..71f64b6 100644
--- a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C
+++ b/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "SmoothPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/GUI/LoopGUI.C b/SpiralSound/Plugins/SpiralLoopPlugin/GUI/LoopGUI.C
index 0b77e16..d9b8f29 100644
--- a/SpiralSound/Plugins/SpiralLoopPlugin/GUI/LoopGUI.C
+++ b/SpiralSound/Plugins/SpiralLoopPlugin/GUI/LoopGUI.C
@@ -20,7 +20,7 @@
 #include "Widgets/Fl_Loop.h"
 #include "LoopGUI.h"
 #include "../Loop.h"
-#include <Fl/fl_file_chooser.H>
+#include <FL/fl_file_chooser.H>
 
 static const int EFFECT_ADDITION = 130;
 static const int GUI_COLOUR = 154;
diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C
index 0e70185..8717930 100644
--- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C
+++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SpiralLoopPlugin.h"
 #include "SpiralLoopPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C
index be80e65..9023a51 100644
--- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C
+++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C
@@ -17,9 +17,9 @@
 */
 
 #include "SpiralLoopPluginGUI.h"
-#include <Fl/fl_draw.H>
 #include <FL/fl_draw.H>
-#include <Fl/fl_file_chooser.H>
+#include <FL/fl_draw.H>
+#include <FL/fl_file_chooser.H>
 #include "../GUI/WaveChooser.h"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SpiralPlugin.h b/SpiralSound/Plugins/SpiralPlugin.h
index f63e6b4..bbf3827 100644
--- a/SpiralSound/Plugins/SpiralPlugin.h
+++ b/SpiralSound/Plugins/SpiralPlugin.h
@@ -25,8 +25,8 @@
 #include <iostream>
 #include <math.h>
 #include <stdlib.h>
-#include <Fl/Fl.H>
-#include <Fl/Fl_Group.H>
+#include <FL/Fl.H>
+#include <FL/Fl_Group.H>
 #include "../Sample.h"
 #include "../ChannelHandler.h"
 #include "../../GUI/Widgets/SpiralGUI.H"
diff --git a/SpiralSound/Plugins/SpiralPluginGUI.C b/SpiralSound/Plugins/SpiralPluginGUI.C
index bf6d3d6..dd1a07c 100644
--- a/SpiralSound/Plugins/SpiralPluginGUI.C
+++ b/SpiralSound/Plugins/SpiralPluginGUI.C
@@ -19,11 +19,11 @@
 #include "SpiralPluginGUI.h"
 #include "SpiralPlugin.h"
 #include "../SpiralInfo.h"
-#include <Fl/fl_draw.H>
 #include <FL/fl_draw.H>
-#include <Fl/Fl_Multiline_Output.H>
-#include <Fl/Fl_Text_Display.H>
-#include <Fl/Fl_Text_Buffer.H>
+#include <FL/fl_draw.H>
+#include <FL/Fl_Multiline_Output.H>
+#include <FL/Fl_Text_Display.H>
+#include <FL/Fl_Text_Buffer.H>
 
 using namespace std;
 
diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C
index 2d157d8..2d63d40 100644
--- a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C
+++ b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SplitSwitchPlugin.h"
 #include "SplitSwitchPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include <stdio.h>
 #include "SpiralIcon.xpm"
 
diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C
index 5ce74a8..6a8db9b 100644
--- a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C
+++ b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "SplitSwitchPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C b/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C
index 3e7299c..b29ef5f 100644
--- a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C
+++ b/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C
@@ -21,7 +21,7 @@
 
 #include "SplitterPlugin.h"
 #include "SplitterPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C b/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C
index 12c8ba6..536d8ae 100644
--- a/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C
+++ b/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "SplitterPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C
index d6ffb93..4b85470 100644
--- a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C
+++ b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "StereoMixerPlugin.h"
 #include "StereoMixerPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C
index 730d5d2..2a235b1 100644
--- a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C
+++ b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "StereoMixerPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C b/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C
index 29f11fe..6e0eb08 100644
--- a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C
+++ b/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "StreamPlugin.h"
 #include "StreamPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 #include <stdio.h>
diff --git a/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C b/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C
index 24afe18..f1c8d60 100644
--- a/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C
+++ b/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "StreamPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include "../GUI/WaveChooser.h"
 
diff --git a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C b/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C
index 49bb10a..bbca661 100644
--- a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C
+++ b/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SwitchPlugin.h"
 #include "SwitchPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C b/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C
index 3ce6c48..d73e6a3 100644
--- a/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C
+++ b/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "SwitchPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSound/Plugins/TranslatePlugin/TranslatePluginGUI.C b/SpiralSound/Plugins/TranslatePlugin/TranslatePluginGUI.C
index 309d8ea..ef18c02 100644
--- a/SpiralSound/Plugins/TranslatePlugin/TranslatePluginGUI.C
+++ b/SpiralSound/Plugins/TranslatePlugin/TranslatePluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "TranslatePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 
 using namespace std;
 
diff --git a/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C b/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C
index 63f1d53..ab8f65f 100644
--- a/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C
+++ b/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "TransposePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 
 using namespace std;
 
diff --git a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C b/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C
index cf596da..c18ff57 100644
--- a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C
+++ b/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "TrigPlugin.h"
 #include "TrigPluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
diff --git a/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C b/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C
index 4e0a582..fc52a9b 100644
--- a/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C
+++ b/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "TrigPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include <stdio.h>
 
diff --git a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C
index d1bcc62..13aa819 100644
--- a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C
+++ b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C
@@ -18,7 +18,7 @@
 */
 
 #include "WaveShaperPluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Box.H>
 
diff --git a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C
index 4790ee5..94e1d88 100644
--- a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C
+++ b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C
@@ -17,7 +17,7 @@
 */
 #include "WaveTablePlugin.h"
 #include "WaveTablePluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C
index ca7660d..11f723b 100644
--- a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C
+++ b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "WaveTablePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 #include "../GUI/WS_Square.h"
 #include "../GUI/WS_Saw.h"
diff --git a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h
index 50cf18a..e8d10bc 100644
--- a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h
+++ b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h
@@ -21,9 +21,9 @@
 
 #include <FL/Fl_Pixmap.H>
 #include <FL/Fl_Counter.H>
-#include <Fl/Fl_Tabs.H>
-#include <Fl/Fl_Group.H>
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Tabs.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Button.H>
 #include "../Widgets/Fl_LED_Button.H"
 #include "../Widgets/Fl_Knob.H"
 #include "../SpiralPluginGUI.h"
diff --git a/SpiralSound/Plugins/Widgets/Fl_EventMap.C b/SpiralSound/Plugins/Widgets/Fl_EventMap.C
index 183123a..5f3eb4c 100644
--- a/SpiralSound/Plugins/Widgets/Fl_EventMap.C
+++ b/SpiralSound/Plugins/Widgets/Fl_EventMap.C
@@ -17,8 +17,8 @@
 */ 
 
 #include "Fl_EventMap.h"
-#include <Fl/fl_draw.H>
-#include <Fl/Fl_Window.H>
+#include <FL/fl_draw.H>
+#include <FL/Fl_Window.H>
 #include <FL/x.H>
 #include <stdio.h>
 
diff --git a/SpiralSound/Plugins/Widgets/Fl_Knob.fld b/SpiralSound/Plugins/Widgets/Fl_Knob.fld
index ccebcf3..a8f3551 100644
--- a/SpiralSound/Plugins/Widgets/Fl_Knob.fld
+++ b/SpiralSound/Plugins/Widgets/Fl_Knob.fld
@@ -2,10 +2,10 @@
 version 1.0100 
 header_name {.H} 
 code_name {.cxx}
-decl {\#include <Fl/Fl_Valuator.H>} {public
+decl {\#include <FL/Fl_Valuator.H>} {public
 } 
 
-decl {\#include <Fl/fl_draw.H>} {} 
+decl {\#include <FL/fl_draw.H>} {} 
 
 decl {\#include <math.h>} {} 
 
diff --git a/SpiralSound/Plugins/Widgets/Fl_SEvent.C b/SpiralSound/Plugins/Widgets/Fl_SEvent.C
index 44242ff..f1dabfe 100644
--- a/SpiralSound/Plugins/Widgets/Fl_SEvent.C
+++ b/SpiralSound/Plugins/Widgets/Fl_SEvent.C
@@ -18,8 +18,8 @@
 
 #include "Fl_SEvent.h"
 #include "Fl_EventMap.h"
-#include <Fl/fl_draw.H>
-#include <Fl/Fl_Window.H>
+#include <FL/fl_draw.H>
+#include <FL/Fl_Window.H>
 #include <FL/x.H>
 #include <stdio.h>
 
diff --git a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C b/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C
index 2b82237..81c0527 100644
--- a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C
+++ b/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "XFadePlugin.h"
 #include "XFadePluginGUI.h"
-#include <Fl/Fl_Button.H>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
diff --git a/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C b/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C
index ca54de7..a314d31 100644
--- a/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C
+++ b/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "XFadePluginGUI.h"
-#include <Fl/fl_draw.H>
+#include <FL/fl_draw.H>
 #include <FL/fl_draw.H>
 
 using namespace std;
diff --git a/SpiralSynthModular.C b/SpiralSynthModular.C
index d1147e0..4c63ddd 100644
--- a/SpiralSynthModular.C
+++ b/SpiralSynthModular.C
@@ -26,9 +26,9 @@
 #include <dlfcn.h>
 #include <FL/Fl.H>
 #include <FL/Enumerations.H>
-#include <Fl/fl_file_chooser.H>
-#include <Fl/Fl_Box.H>
-#include <Fl/Fl_Tooltip.H>
+#include <FL/fl_file_chooser.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Tooltip.H>
 #include "SpiralSynthModular.h"
 #include "SpiralSound/PluginManager.h"
 #include "SpiralSound/SpiralInfo.h"