Actually make it compilable.

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"

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

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>

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"

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

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
 {

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"
 

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

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;

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"
 

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;

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" {

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;

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;

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;

SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h

@@ -44,7 +44,7 @@ class ControllerPluginGUI : public SpiralPluginGUI {
       Fl_Color m_GUIColour;
       class CVGUI {
          public:
-            CVGUI::CVGUI(int n, ControllerPluginGUI *p, Fl_Color SelColour);
+            CVGUI(int n, ControllerPluginGUI *p, Fl_Color SelColour);
             Fl_Group *m_SliderGroup;
             Fl_Input *m_Title, *m_Min, *m_Max;
             Fl_Slider *m_Chan;

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"
 

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>
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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"
 

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;

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;

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;

SpiralSound/Plugins/JackPlugin/JackPlugin.h

@@ -72,7 +72,7 @@ public:
 	class JackPort
 	{		
 		public:
-		JackPort::JackPort() :
+		JackPort() :
 			Connected(false),Buf(NULL),Port(NULL) {}
 		
 		int            PortNo;

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>

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;

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;
 

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>

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;

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"

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"
 

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>
 

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

SpiralSound/Plugins/MasherPlugin/MasherPlugin.h

@@ -17,7 +17,7 @@
 */ 
 
 #include "../SpiralPlugin.h"
-#include <FL/Fl.h>
+#include <Fl/Fl.H>
 
 #ifndef MasherPLUGIN
 #define MasherPLUGIN

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;

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"
 

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_draw.H>
-//#include <FL/fl_file_chooser.h>
+//#include <Fl/fl_file_chooser.H>
 
 using namespace std;
 

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"

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>

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"
 

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;

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;

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;

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

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;

SpiralSound/Plugins/MousePlugin/MousePlugin.C

@@ -20,6 +20,8 @@
 
 #define SCRATCH_DEVICE "/dev/ttyS0"
 
+#include <string>
+
 #include "MousePlugin.h"
 #include "MousePluginGUI.h"
 #include "SpiralIcon.xpm"
@@ -32,7 +34,7 @@ char** SpiralPlugin_GetIcon() { return SpiralIcon_xpm; }
 
 int SpiralPlugin_GetID() { return 300; }
 
-string SpiralPlugin_GetGroupName() { return "InputOutput"; }
+// string SpiralPlugin_GetGroupName() { return "InputOutput"; }
 
 }
 

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) :

SpiralSound/Plugins/MousePlugin/scratch.h

@@ -26,9 +26,11 @@
 #include <string.h>
 #include <termios.h>
 #include <stdio.h>
-#include <iostream.h>
 #include <pthread.h>
 
+#include <iostream>
+#include <string>
+
 class scratch {
    public:
       scratch (char *dev);

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"
 

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;

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"
 

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;

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"
 

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>
 

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"
 

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"

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"

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;

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"

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;
 

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;

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;

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;

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;

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;

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"

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_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <Fl/fl_file_chooser.H>
 
 using namespace std;
 

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;

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;

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"
 

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_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <Fl/fl_file_chooser.H>
 
 using namespace std;
 

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"
 

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>
 

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"
 

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_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <Fl/fl_file_chooser.H>
 #include <FL/Fl_Color_Chooser.H>
 
 using namespace std;

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;

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;

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;

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"
 

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_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <Fl/fl_file_chooser.H>
 #include "../GUI/WaveChooser.h"
 
 using namespace std;

SpiralSound/Plugins/SpiralPlugin.h

@@ -24,8 +24,8 @@
 #include <string>
 #include <iostream>
 #include <math.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"

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_draw.H>
-#include <FL/Fl_Multiline_Output.h>
-#include <FL/Fl_Text_Display.h>
-#include <FL/Fl_Text_Buffer.h>
+#include <Fl/Fl_Multiline_Output.H>
+#include <Fl/Fl_Text_Display.H>
+#include <Fl/Fl_Text_Buffer.H>
 
 using namespace std;
 

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"
 

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;

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;

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;

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;

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;