diff --git a/Source/AccessClass.h b/Source/AccessClass.h
index 0991c8513420b314315bdc3fa2d0267cb7ebb69d..6ed566e41b11f3834c3c517c8fc45bb625d69a2b 100644
--- a/Source/AccessClass.h
+++ b/Source/AccessClass.h
@@ -24,9 +24,6 @@
 #ifndef __ACCESSCLASS_H_CE1DC2DE__
 #define __ACCESSCLASS_H_CE1DC2DE__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../JuceLibraryCode/JuceHeader.h"
 
 class UIComponent;
diff --git a/Source/Audio/AudioComponent.h b/Source/Audio/AudioComponent.h
index 021737cb4939585adb3f5dbf33a143c0635d2921..f5e5698ac925b63f9e3c6598668304e9f9a150a7 100644
--- a/Source/Audio/AudioComponent.h
+++ b/Source/Audio/AudioComponent.h
@@ -24,9 +24,6 @@
 #ifndef __AUDIOCOMPONENT_H_D97C73CF__
 #define __AUDIOCOMPONENT_H_D97C73CF__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 /**
diff --git a/Source/Main.cpp b/Source/Main.cpp
index 0d73d5c5db07a9e04426caf65daadf7d70350bce..80793f7f62ededf2ab6d29c90fe59f3e00da31e6 100644
--- a/Source/Main.cpp
+++ b/Source/Main.cpp
@@ -77,7 +77,7 @@ public:
 		StringArray parameters;
 		parameters.addTokens(commandLine," ","\"");
 #ifdef WIN32
-		glWinInit();
+		//glWinInit();
 
 		if (parameters.contains("--console",true)) {
 			if (AllocConsole())
diff --git a/Source/MainWindow.h b/Source/MainWindow.h
index 07dc204187a8a0329ae55bb86e0e879401961f88..540771210e6c648208f69962ed755285b87a5e12 100644
--- a/Source/MainWindow.h
+++ b/Source/MainWindow.h
@@ -24,9 +24,6 @@
 #ifndef __MAINWINDOW_H_BA75E17__
 #define __MAINWINDOW_H_BA75E17__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "UI/UIComponent.h"
 #include "Audio/AudioComponent.h"
diff --git a/Source/Processors/ArduinoOutput.h b/Source/Processors/ArduinoOutput.h
index c2757a4078b6fd646bc275614ed8a01f45caf41d..cb85c746390b25cff13ebfee4563023859ce121e 100755
--- a/Source/Processors/ArduinoOutput.h
+++ b/Source/Processors/ArduinoOutput.h
@@ -24,9 +24,6 @@
 #ifndef __ARDUINOOUTPUT_H_F7BDA585__
 #define __ARDUINOOUTPUT_H_F7BDA585__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 #include "Editors/ArduinoOutputEditor.h"
diff --git a/Source/Processors/AudioNode.h b/Source/Processors/AudioNode.h
index 746912865a6607b5187a2d1c81883fd69ed3ec66..3b457867984300ec439c468dc2c62f8e2cb989a5 100755
--- a/Source/Processors/AudioNode.h
+++ b/Source/Processors/AudioNode.h
@@ -25,9 +25,6 @@
 #define __AUDIONODE_H_AF61F3C5__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include <stdio.h>
 
diff --git a/Source/Processors/AudioResamplingNode.h b/Source/Processors/AudioResamplingNode.h
index b5eb052cb57804eaa51f8fc52b4c08961125648e..40dc86a70178e4f38cfe8a76cb4823e2ecdf692a 100644
--- a/Source/Processors/AudioResamplingNode.h
+++ b/Source/Processors/AudioResamplingNode.h
@@ -26,9 +26,6 @@
 
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "../Dsp/Dsp.h"
 #include "GenericProcessor.h"
diff --git a/Source/Processors/Channel.h b/Source/Processors/Channel.h
index d30bbbd832251bb43f58d4d15caa2ba7e1bfe632..f44ea8d45bd017bcbeb7c2aa7abd673e99315ec2 100644
--- a/Source/Processors/Channel.h
+++ b/Source/Processors/Channel.h
@@ -25,10 +25,6 @@
 #define __CHANNEL_H_DABDFE3F__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
-
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 #include "GenericProcessor.h"
diff --git a/Source/Processors/DataThreads/DataBuffer.h b/Source/Processors/DataThreads/DataBuffer.h
index f2cb4864ba9d7a6c7e736e35feea18573e735984..1c8a33cbd6b3d087a82b9445215e40fbc34c0153 100755
--- a/Source/Processors/DataThreads/DataBuffer.h
+++ b/Source/Processors/DataThreads/DataBuffer.h
@@ -24,9 +24,6 @@
 #ifndef __DATABUFFER_H_11C6C591__
 #define __DATABUFFER_H_11C6C591__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 /**
diff --git a/Source/Processors/DataThreads/DataThread.h b/Source/Processors/DataThreads/DataThread.h
index 094c4adf4c30118dd84446bf2fb16eff2680aad8..61d53addbf76a0d17d9d9720cfc66ed67bbb580b 100755
--- a/Source/Processors/DataThreads/DataThread.h
+++ b/Source/Processors/DataThreads/DataThread.h
@@ -24,9 +24,6 @@
 #ifndef __DATATHREAD_H_C454F4DB__
 #define __DATATHREAD_H_C454F4DB__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include <stdio.h>
 #include "DataBuffer.h"
diff --git a/Source/Processors/DataThreads/FPGAThread.h b/Source/Processors/DataThreads/FPGAThread.h
index 27af4852f1dd03562b2f60ccae663a5efcb67ef6..1a0dde7d7503a64f0527d4aed772c29d0d6e3811 100755
--- a/Source/Processors/DataThreads/FPGAThread.h
+++ b/Source/Processors/DataThreads/FPGAThread.h
@@ -24,9 +24,6 @@
 #ifndef __FPGATHREAD_H_FBB22A45__
 #define __FPGATHREAD_H_FBB22A45__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 #include <stdio.h>
diff --git a/Source/Processors/DataThreads/FileReaderThread.h b/Source/Processors/DataThreads/FileReaderThread.h
index e67ae2fc3b07f57dcac29fe4444182aa011f7c7c..fde6aaa96005a11d731bdd783f8f48cd43888b26 100755
--- a/Source/Processors/DataThreads/FileReaderThread.h
+++ b/Source/Processors/DataThreads/FileReaderThread.h
@@ -24,9 +24,6 @@
 #ifndef __FILEREADERTHREAD_H_82594504__
 #define __FILEREADERTHREAD_H_82594504__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 #include <stdio.h>
diff --git a/Source/Processors/DataThreads/IntanThread.h b/Source/Processors/DataThreads/IntanThread.h
index 8ce792f8704ce335177c664692b1b1fddeb44f74..72121ec223461f61cca499226f1c023a44aed9fb 100755
--- a/Source/Processors/DataThreads/IntanThread.h
+++ b/Source/Processors/DataThreads/IntanThread.h
@@ -24,9 +24,6 @@
 #ifndef __INTANTHREAD_H_D9135C03__
 #define __INTANTHREAD_H_D9135C03__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include <ftdi.h>
 #include <stdio.h>
diff --git a/Source/Processors/DataThreads/RHD2000Thread.h b/Source/Processors/DataThreads/RHD2000Thread.h
index 306502f2bdbec4356489de7c5fc128bcbadf1179..c189df5629dc8afabd5c382dfc45398261ebca7c 100644
--- a/Source/Processors/DataThreads/RHD2000Thread.h
+++ b/Source/Processors/DataThreads/RHD2000Thread.h
@@ -26,9 +26,6 @@
 #define __RHD2000THREAD_H_2C4CBD67__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 #include <stdio.h>
diff --git a/Source/Processors/Editors/ArduinoOutputEditor.h b/Source/Processors/Editors/ArduinoOutputEditor.h
index cef7931cb7b315bdeada1fa7b740d30e9bef40e8..87ad84aeba22c25853654d5d0300e3c0ffc0a147 100644
--- a/Source/Processors/Editors/ArduinoOutputEditor.h
+++ b/Source/Processors/Editors/ArduinoOutputEditor.h
@@ -24,9 +24,6 @@
 #ifndef __ARDUINOOUTPUTEDITOR_H_28EB4CC9__
 #define __ARDUINOOUTPUTEDITOR_H_28EB4CC9__
 
-#ifdef _WIN32
-#include <Windows.h>
-#endif
 
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
diff --git a/Source/Processors/Editors/AudioEditor.h b/Source/Processors/Editors/AudioEditor.h
index 3f2c8a199e96656aa1f920eb01d87e1dcc934664..12490803c89e246d63451d78b9b67f6b19fd441f 100755
--- a/Source/Processors/Editors/AudioEditor.h
+++ b/Source/Processors/Editors/AudioEditor.h
@@ -24,9 +24,6 @@
 #define __AUDIOEDITOR_H_9D6F1FC3__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../AudioNode.h"
 #include <stdio.h>
diff --git a/Source/Processors/Editors/ChannelSelector.h b/Source/Processors/Editors/ChannelSelector.h
index a63e0c425b9fbd911aacacb8380f5de9b7a9689a..c5edd291377767fdb93a0b0f551d82b779bc4def 100755
--- a/Source/Processors/Editors/ChannelSelector.h
+++ b/Source/Processors/Editors/ChannelSelector.h
@@ -24,9 +24,6 @@
 #ifndef __CHANNELSELECTOR_H_68124E35__
 #define __CHANNELSELECTOR_H_68124E35__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 #include "../../AccessClass.h"
diff --git a/Source/Processors/Editors/EventNodeEditor.h b/Source/Processors/Editors/EventNodeEditor.h
index cd540f1b90cca92fac46a751bccfc09d7362ba96..170d95ac70bf4732ead06a6ad5afdf22229e9aff 100755
--- a/Source/Processors/Editors/EventNodeEditor.h
+++ b/Source/Processors/Editors/EventNodeEditor.h
@@ -25,9 +25,6 @@
 #define __EVENTNODEEDITOR_H_A681BEBC__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/FPGAOutputEditor.h b/Source/Processors/Editors/FPGAOutputEditor.h
index b59f3ad4068cbb1032ad159c3846d2b8d77eec06..5d178e424199a316837665beb236fe2a0cb11334 100644
--- a/Source/Processors/Editors/FPGAOutputEditor.h
+++ b/Source/Processors/Editors/FPGAOutputEditor.h
@@ -24,10 +24,6 @@
 #ifndef __FPGAOUTPUTEDITOR_H_5A646CD3__
 #define __FPGAOUTPUTEDITOR_H_5A646CD3__
 
-#ifdef _WIN32
-#include <Windows.h>
-#endif
-
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 #include "ImageIcon.h"
diff --git a/Source/Processors/Editors/FilterEditor.h b/Source/Processors/Editors/FilterEditor.h
index 74087981d5919695d755d7a311a7364e59307c2b..e8d71a511bd13e114a5d7e49cd4bb14cfbf5d14a 100755
--- a/Source/Processors/Editors/FilterEditor.h
+++ b/Source/Processors/Editors/FilterEditor.h
@@ -25,9 +25,6 @@
 #define __FILTEREDITOR_H_969BDB5__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/GenericEditor.h b/Source/Processors/Editors/GenericEditor.h
index daa142822d713dc9ad46ad901761f70057826dda..594730aeb984625e201dd2bbcc2a382104df4f75 100755
--- a/Source/Processors/Editors/GenericEditor.h
+++ b/Source/Processors/Editors/GenericEditor.h
@@ -24,9 +24,6 @@
 #ifndef __GENERICEDITOR_H_DD406E71__
 #define __GENERICEDITOR_H_DD406E71__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../GenericProcessor.h"
 #include "../../AccessClass.h"
diff --git a/Source/Processors/Editors/ImageIcon.h b/Source/Processors/Editors/ImageIcon.h
index d70495a1ed1eafd8bd05d1caca14db613ee928d9..ae2a7f9d50c3f68849f107165cc71ebe4c1d2992 100755
--- a/Source/Processors/Editors/ImageIcon.h
+++ b/Source/Processors/Editors/ImageIcon.h
@@ -24,9 +24,6 @@
 #ifndef __IMAGEICON_H_ED764AE7__
 #define __IMAGEICON_H_ED764AE7__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 /**
diff --git a/Source/Processors/Editors/LfpDisplayEditor.h b/Source/Processors/Editors/LfpDisplayEditor.h
index b3a5a8eaea98e3e42e0c6ac192e4249a00171c41..4f740e77eb5910c5ee61e2d7887604c8006d1dcf 100755
--- a/Source/Processors/Editors/LfpDisplayEditor.h
+++ b/Source/Processors/Editors/LfpDisplayEditor.h
@@ -24,9 +24,6 @@
 #ifndef __LFPDISPLAYEDITOR_H_3438800D__
 #define __LFPDISPLAYEDITOR_H_3438800D__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 #include "../../UI/UIComponent.h"
diff --git a/Source/Processors/Editors/MergerEditor.h b/Source/Processors/Editors/MergerEditor.h
index fe97e4a8ffca2ce457704656460c3af04280f701..f5eef0191405858c19c7b5681c98a954ad1a02d2 100755
--- a/Source/Processors/Editors/MergerEditor.h
+++ b/Source/Processors/Editors/MergerEditor.h
@@ -25,9 +25,6 @@
 #define __MERGEREDITOR_H_33F644A8__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/ParameterEditor.h b/Source/Processors/Editors/ParameterEditor.h
index e4ef4211a1e313f5674f4d3b276948d0b8eb39cf..1f5dfd36b7c10038883ca696b4acec226693d036 100755
--- a/Source/Processors/Editors/ParameterEditor.h
+++ b/Source/Processors/Editors/ParameterEditor.h
@@ -24,9 +24,6 @@
 #ifndef __PARAMETEREDITOR_H_44537DA9__
 #define __PARAMETEREDITOR_H_44537DA9__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../GenericProcessor.h"
 #include "ChannelSelector.h"
diff --git a/Source/Processors/Editors/RecordControlEditor.h b/Source/Processors/Editors/RecordControlEditor.h
index ff40e8a3fb6fb9adb62fb261403bed013bb9765b..390d247af68a38064d327eecf9f584426f531e30 100644
--- a/Source/Processors/Editors/RecordControlEditor.h
+++ b/Source/Processors/Editors/RecordControlEditor.h
@@ -24,9 +24,6 @@
 #ifndef __RECORDCONTROLEDITOR_H_F9C69E2B__
 #define __RECORDCONTROLEDITOR_H_F9C69E2B__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/ReferenceNodeEditor.h b/Source/Processors/Editors/ReferenceNodeEditor.h
index ae0ed642660c4853179b21694e49917ecb6d60ad..4c476fd2e586c83e715402c605d7d33f14737d70 100644
--- a/Source/Processors/Editors/ReferenceNodeEditor.h
+++ b/Source/Processors/Editors/ReferenceNodeEditor.h
@@ -24,9 +24,6 @@
 #ifndef __REFERENCENODEEDITOR_H_370C056D__
 #define __REFERENCENODEEDITOR_H_370C056D__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/ResamplingNodeEditor.h b/Source/Processors/Editors/ResamplingNodeEditor.h
index 259e93214f2096f526fa1123cf81dbfd6a95ac54..dd430d2f56605747ea27068b75c5ada355fbaf46 100644
--- a/Source/Processors/Editors/ResamplingNodeEditor.h
+++ b/Source/Processors/Editors/ResamplingNodeEditor.h
@@ -25,9 +25,6 @@
 #define __RESAMPLINGNODEEDITOR_H_B7FD956A__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/SignalGeneratorEditor.h b/Source/Processors/Editors/SignalGeneratorEditor.h
index 801d6f50513ad940721dc86e4b778a7fa011c986..928f24423d6791c3e2557a378baa86bcc2e5de6c 100755
--- a/Source/Processors/Editors/SignalGeneratorEditor.h
+++ b/Source/Processors/Editors/SignalGeneratorEditor.h
@@ -24,9 +24,6 @@
 #ifndef __SIGNALGENERATOREDITOR_H_841A7078__
 #define __SIGNALGENERATOREDITOR_H_841A7078__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/SourceNodeEditor.h b/Source/Processors/Editors/SourceNodeEditor.h
index 6b430893a6beb5032ed044c43b3296c4082a6b12..c35948a85e7b6f522043372b90a1ca6b7765921a 100755
--- a/Source/Processors/Editors/SourceNodeEditor.h
+++ b/Source/Processors/Editors/SourceNodeEditor.h
@@ -24,9 +24,6 @@
 #ifndef __SOURCENODEEDITOR_H_A1B19E1E__
 #define __SOURCENODEEDITOR_H_A1B19E1E__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 #include "ImageIcon.h"
diff --git a/Source/Processors/Editors/SpikeDetectorEditor.h b/Source/Processors/Editors/SpikeDetectorEditor.h
index 87fab84bc456aa74557a51a5e82faa607805feae..798471f3ef2aab71922fd5f647c0d51956f7bc82 100755
--- a/Source/Processors/Editors/SpikeDetectorEditor.h
+++ b/Source/Processors/Editors/SpikeDetectorEditor.h
@@ -25,9 +25,6 @@
 #define __SPIKEDETECTOREDITOR_H_F0BD2DD9__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/SpikeDisplayEditor.h b/Source/Processors/Editors/SpikeDisplayEditor.h
index 6725ba6403543322f3684424cf7e30e35b9b3bfd..8b028485caa110bb3ea5b46039bde3a9b9a32337 100755
--- a/Source/Processors/Editors/SpikeDisplayEditor.h
+++ b/Source/Processors/Editors/SpikeDisplayEditor.h
@@ -24,9 +24,6 @@
 #ifndef SPIKEDISPLAYEDITOR_H_
 #define SPIKEDISPLAYEDITOR_H_
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 #include "../../UI/UIComponent.h"
diff --git a/Source/Processors/Editors/SplitterEditor.h b/Source/Processors/Editors/SplitterEditor.h
index 2fb1d46f62305e27ec28c3a74a36f7a0c6196059..8ac9d5a84c59c4ca15901303a0ac2db46b67c669 100755
--- a/Source/Processors/Editors/SplitterEditor.h
+++ b/Source/Processors/Editors/SplitterEditor.h
@@ -25,9 +25,6 @@
 #define __SPLITTEREDITOR_H_33F644A8__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 
diff --git a/Source/Processors/Editors/VisualizerEditor.h b/Source/Processors/Editors/VisualizerEditor.h
index dc685291684422492f0d1c4626f83016bf7a8c3d..fe772b15fa1c7ab5a27d9bbfb6d1d7e2df0021e0 100755
--- a/Source/Processors/Editors/VisualizerEditor.h
+++ b/Source/Processors/Editors/VisualizerEditor.h
@@ -24,9 +24,6 @@
 #ifndef __VISUALIZEREDITOR_H_17E6D78C__
 #define __VISUALIZEREDITOR_H_17E6D78C__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 #include "../../UI/UIComponent.h"
diff --git a/Source/Processors/Editors/WiFiOutputEditor.h b/Source/Processors/Editors/WiFiOutputEditor.h
index ac5809f07aee5b43d7738965ae7d08a12971e35e..fd8e0bc992724eb30fb443b7a406412e7f1bf6aa 100755
--- a/Source/Processors/Editors/WiFiOutputEditor.h
+++ b/Source/Processors/Editors/WiFiOutputEditor.h
@@ -23,9 +23,6 @@
 #ifndef __WIFIOUTPUTEDITOR_H_7161DB44__
 #define __WIFIOUTPUTEDITOR_H_7161DB44__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "GenericEditor.h"
 #include "ImageIcon.h"
diff --git a/Source/Processors/EventDetector.h b/Source/Processors/EventDetector.h
index 005e385b0443fec2e89adcb90162e3fca5f5bc30..4b23b7141c243b51c896bb625d36c06e9be09020 100755
--- a/Source/Processors/EventDetector.h
+++ b/Source/Processors/EventDetector.h
@@ -24,10 +24,6 @@
 #ifndef __EVENTDETECTOR_H_91811542__
 #define __EVENTDETECTOR_H_91811542__
 
-#ifdef _WIN32
-#include <Windows.h>
-#endif
-
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "GenericProcessor.h"
 
diff --git a/Source/Processors/EventNode.h b/Source/Processors/EventNode.h
index 594f57929a9daa8244f63bdae248c0542c6df75a..3781e46074e042f535f9e93b9e557d0eeb8a3951 100755
--- a/Source/Processors/EventNode.h
+++ b/Source/Processors/EventNode.h
@@ -24,9 +24,6 @@
 #ifndef __EVENTNODE_H_9B67A789__
 #define __EVENTNODE_H_9B67A789__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "GenericProcessor.h"
 #include "Editors/EventNodeEditor.h"
diff --git a/Source/Processors/FPGAOutput.h b/Source/Processors/FPGAOutput.h
index d488d0a2f21a08657d61f92720ac514c37d40194..fb7b17e39cb5666618490a6ead4067757f16495a 100755
--- a/Source/Processors/FPGAOutput.h
+++ b/Source/Processors/FPGAOutput.h
@@ -24,10 +24,6 @@
 #ifndef __FPGAOUTPUT_H_33275017__
 #define __FPGAOUTPUT_H_33275017__
 
-#ifdef _WIN32
-#include <Windows.h>
-#endif
-
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "GenericProcessor.h"
 #include "Editors/FPGAOutputEditor.h"
diff --git a/Source/Processors/FilterNode.h b/Source/Processors/FilterNode.h
index 9979d50d7fa907a83593a280281e5da4f5f3c9ca..f97c462c636c5baca20329288267940135f67760 100755
--- a/Source/Processors/FilterNode.h
+++ b/Source/Processors/FilterNode.h
@@ -24,9 +24,6 @@
 #ifndef __FILTERNODE_H_CED428E__
 #define __FILTERNODE_H_CED428E__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "../Dsp/Dsp.h"
 #include "GenericProcessor.h"
diff --git a/Source/Processors/GenericProcessor.h b/Source/Processors/GenericProcessor.h
index 5a316ca6eee55737f3c5c9c7a01099a905e53ef3..298699fc1be96bb5752612769fc0ffd60daa4881 100755
--- a/Source/Processors/GenericProcessor.h
+++ b/Source/Processors/GenericProcessor.h
@@ -25,9 +25,6 @@
 #define __GENERICPROCESSOR_H_1F469DAF__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "Editors/GenericEditor.h"
 #include "Parameter.h"
diff --git a/Source/Processors/LfpDisplayNode.h b/Source/Processors/LfpDisplayNode.h
index 1587282054c9931298d9008c9e641e0e0024a9cb..7f84e5eb721e6530bcbfdd7ee8a6a942b0ae5868 100755
--- a/Source/Processors/LfpDisplayNode.h
+++ b/Source/Processors/LfpDisplayNode.h
@@ -24,9 +24,6 @@
 #ifndef __LFPDISPLAYNODE_H_D969A379__
 #define __LFPDISPLAYNODE_H_D969A379__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "Editors/LfpDisplayEditor.h"
 #include "Editors/VisualizerEditor.h"
diff --git a/Source/Processors/Parameter.h b/Source/Processors/Parameter.h
index 8f8cad0c55ff99e4a025c9e025b5e740d9c86634..a35e80824a35f99bc464d03b238f4a71d63dde98 100755
--- a/Source/Processors/Parameter.h
+++ b/Source/Processors/Parameter.h
@@ -24,9 +24,6 @@
 #ifndef __PARAMETER_H_62922AE5__
 #define __PARAMETER_H_62922AE5__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 // #include "Editors/GenericEditor.h"
 // #include "GenericProcessor.h"
diff --git a/Source/Processors/PhaseDetector.h b/Source/Processors/PhaseDetector.h
index 60303f824abb48db27ae1fc28496e6f6692ee120..53a11ed0e93a0c77b4f935b553d502cfaacd0d9b 100644
--- a/Source/Processors/PhaseDetector.h
+++ b/Source/Processors/PhaseDetector.h
@@ -25,10 +25,6 @@
 #define __PHASEDETECTOR_H_F411F29D__
 
 
-#ifdef _WIN32
-#include <Windows.h>
-#endif
-
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "GenericProcessor.h"
 
diff --git a/Source/Processors/ProcessorGraph.h b/Source/Processors/ProcessorGraph.h
index a0def0b108c4d1739764e47f771a82210d92dcdf..4725290488e425b2ffe8f16c1726f1f00146145e 100755
--- a/Source/Processors/ProcessorGraph.h
+++ b/Source/Processors/ProcessorGraph.h
@@ -24,9 +24,6 @@
 #ifndef __PROCESSORGRAPH_H_124F8B50__
 #define __PROCESSORGRAPH_H_124F8B50__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 #include "../AccessClass.h"
diff --git a/Source/Processors/RecordNode.h b/Source/Processors/RecordNode.h
index abaafc28a6d6d0a3a51848ae6d64b8e138f1395f..16affd3eb65e398c33b741d77ac3169612f83de7 100755
--- a/Source/Processors/RecordNode.h
+++ b/Source/Processors/RecordNode.h
@@ -25,9 +25,6 @@
 #define __RECORDNODE_H_FB9B1CA7__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include <stdio.h>
 #include <map>
diff --git a/Source/Processors/ReferenceNode.h b/Source/Processors/ReferenceNode.h
index 96c12370af14780199b1c103c6b0ec2381c14692..1687c6967eecbff46959707cfa0d9fdb2a8cffd2 100644
--- a/Source/Processors/ReferenceNode.h
+++ b/Source/Processors/ReferenceNode.h
@@ -25,9 +25,6 @@
 #define __REFERENCENODE_H_786EA929__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 #include "GenericProcessor.h"
diff --git a/Source/Processors/ResamplingNode.h b/Source/Processors/ResamplingNode.h
index 650771cc898ecd243112ec0a73981742f7b34782..1b57796b5dd08c8c597bcc297f0a88de863a504b 100755
--- a/Source/Processors/ResamplingNode.h
+++ b/Source/Processors/ResamplingNode.h
@@ -25,9 +25,6 @@
 #define __RESAMPLINGNODE_H_79663B0__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "../Dsp/Dsp.h"
 #include "GenericProcessor.h"
diff --git a/Source/Processors/SignalGenerator.h b/Source/Processors/SignalGenerator.h
index 487810d17c72b933524bfd9c35b40c970ea696c6..de5632d1a587376646ce749818e6ffd106eb648e 100755
--- a/Source/Processors/SignalGenerator.h
+++ b/Source/Processors/SignalGenerator.h
@@ -25,9 +25,6 @@
 #define __SIGNALGENERATOR_H_EAA44B0B__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "GenericProcessor.h"
 #include "Editors/SignalGeneratorEditor.h"
diff --git a/Source/Processors/SourceNode.h b/Source/Processors/SourceNode.h
index 504cab9f0242963ed145928eb6875b9917152989..48e75fe0fafdb417bed9c43706f924cde55127fb 100755
--- a/Source/Processors/SourceNode.h
+++ b/Source/Processors/SourceNode.h
@@ -24,9 +24,6 @@
 #ifndef __SOURCENODE_H_DCE798F1__
 #define __SOURCENODE_H_DCE798F1__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include <ftdi.h>
 #include <stdio.h>
diff --git a/Source/Processors/SpikeDetector.h b/Source/Processors/SpikeDetector.h
index 5818a4df5567781ce163c5c067ad2ec68a1381bc..32a398b1222ae46fdf150a5e6923887275d22932 100755
--- a/Source/Processors/SpikeDetector.h
+++ b/Source/Processors/SpikeDetector.h
@@ -24,9 +24,6 @@
 #ifndef __SPIKEDETECTOR_H_3F920F95__
 #define __SPIKEDETECTOR_H_3F920F95__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 #include "GenericProcessor.h"
diff --git a/Source/Processors/SpikeDisplayNode.h b/Source/Processors/SpikeDisplayNode.h
index 635f164a76e3d3b79fe4c3693960dcfa5c8a3b78..bef65285fe94670f58bcef511c15eb6179278442 100755
--- a/Source/Processors/SpikeDisplayNode.h
+++ b/Source/Processors/SpikeDisplayNode.h
@@ -24,9 +24,6 @@
 #ifndef SPIKEDISPLAYNODE_H_
 #define SPIKEDISPLAYNODE_H_
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "Editors/SpikeDisplayEditor.h"
 #include "Editors/VisualizerEditor.h"
diff --git a/Source/Processors/Utilities/Merger.h b/Source/Processors/Utilities/Merger.h
index 593d6851f02a29e5eacace6352e810ec3a786f29..a1dc8c6cdabb0e39aba13160b514c2f127b95ec0 100755
--- a/Source/Processors/Utilities/Merger.h
+++ b/Source/Processors/Utilities/Merger.h
@@ -24,9 +24,6 @@
 #ifndef __MERGER_H_ED548E77__
 #define __MERGER_H_ED548E77__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../GenericProcessor.h"
 
diff --git a/Source/Processors/Utilities/RecordControl.h b/Source/Processors/Utilities/RecordControl.h
index 77a41592add39ee93a61e91a20d0499abea12c1d..23133ebedbb8b23ffa558972c7216449560593c7 100644
--- a/Source/Processors/Utilities/RecordControl.h
+++ b/Source/Processors/Utilities/RecordControl.h
@@ -24,10 +24,6 @@
 #ifndef __RECORDCONTROL_H_120DD434__
 #define __RECORDCONTROL_H_120DD434__
 
-#ifdef _WIN32
-#include <Windows.h>
-#endif
-
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../GenericProcessor.h"
 #include "../Editors/RecordControlEditor.h"
diff --git a/Source/Processors/Utilities/Splitter.h b/Source/Processors/Utilities/Splitter.h
index 54dd0d9d90280c13a0be46f8eb1bf81debf01ec1..ffa82bb44da9e6e5e3aa689e35f299db012b122f 100755
--- a/Source/Processors/Utilities/Splitter.h
+++ b/Source/Processors/Utilities/Splitter.h
@@ -24,9 +24,6 @@
 #ifndef __SPLITTER_H_A75239F7__
 #define __SPLITTER_H_A75239F7__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../GenericProcessor.h"
 
diff --git a/Source/Processors/Visualization/DataWindow.h b/Source/Processors/Visualization/DataWindow.h
index e52e14191650ab9570675d57dc02012a5acc1c1c..7b379b553648df4444ee29cc11154451b464cdae 100755
--- a/Source/Processors/Visualization/DataWindow.h
+++ b/Source/Processors/Visualization/DataWindow.h
@@ -24,9 +24,6 @@
 #ifndef __DATAWINDOW_H_FDDAB8D0__
 #define __DATAWINDOW_H_FDDAB8D0__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 /**
diff --git a/Source/Processors/Visualization/LfpDisplayCanvas.h b/Source/Processors/Visualization/LfpDisplayCanvas.h
index b87656d31ce7b2bcd5cde334316d6f34e349049b..0b6186326f81d9390ca685ce5c5a29c2e7fcd872 100755
--- a/Source/Processors/Visualization/LfpDisplayCanvas.h
+++ b/Source/Processors/Visualization/LfpDisplayCanvas.h
@@ -23,9 +23,6 @@
 #ifndef __LFPDISPLAYCANVAS_H_B711873A__
 #define __LFPDISPLAYCANVAS_H_B711873A__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 #include "../LfpDisplayNode.h"
 #include "Visualizer.h"
diff --git a/Source/Processors/Visualization/OpenGLCanvas.cpp b/Source/Processors/Visualization/OpenGLCanvas.cpp
index 7ca95950291fe032f69b7f4ff49a365a7a1c79d2..3380e92c7d0658efc6843c643ebbd5284d841848 100755
--- a/Source/Processors/Visualization/OpenGLCanvas.cpp
+++ b/Source/Processors/Visualization/OpenGLCanvas.cpp
@@ -246,6 +246,7 @@ int OpenGLCanvas::mouseWheelMove(const MouseEvent&e,
 
 	mouseWheelMoveInCanvas(e, wheelIncrementX, wheelIncrementY);
 
+	return 0; //mouseWheelMove should be void according to juce's documentation.
 }
 
 void OpenGLCanvas::timerCallback()
diff --git a/Source/Processors/Visualization/OpenGLCanvas.h b/Source/Processors/Visualization/OpenGLCanvas.h
index 9fdb6605145bceeed4bceec683aa0f2fe5a8f06c..cfa33525d8f8cedb5f076fbde41560884e8407a2 100755
--- a/Source/Processors/Visualization/OpenGLCanvas.h
+++ b/Source/Processors/Visualization/OpenGLCanvas.h
@@ -24,12 +24,9 @@
 #ifndef __OPENGLCANVAS_H_98F0C13D__
 #define __OPENGLCANVAS_H_98F0C13D__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
-#include "../../OpenGL.h"
+//#include "../../OpenGL.h"
 
 /** 
 
diff --git a/Source/Processors/Visualization/SpikeDisplayCanvas.h b/Source/Processors/Visualization/SpikeDisplayCanvas.h
index 8cc8694ad37f7c6d2cc372d1c90dd6c89ffd47e6..df7eb2465d5f7a4c1f6ae1b9e39a1c6453731e91 100755
--- a/Source/Processors/Visualization/SpikeDisplayCanvas.h
+++ b/Source/Processors/Visualization/SpikeDisplayCanvas.h
@@ -24,9 +24,6 @@
 #ifndef SPIKEDISPLAYCANVAS_H_
 #define SPIKEDISPLAYCANVAS_H_
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 #include "../SpikeDisplayNode.h"
diff --git a/Source/Processors/Visualization/SpikePlotting/GenericAxes.h b/Source/Processors/Visualization/SpikePlotting/GenericAxes.h
index 347a39a4cfb75829772a9f72181e95b8e37b7697..1768743b4280e64883b5782a904a94325750f189 100755
--- a/Source/Processors/Visualization/SpikePlotting/GenericAxes.h
+++ b/Source/Processors/Visualization/SpikePlotting/GenericAxes.h
@@ -1,9 +1,6 @@
 #ifndef GENERIC_AXES_H_
 #define GENERIC_AXES_H_
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 
 #if defined(__linux__)
 	#include <GL/glut.h>
diff --git a/Source/Processors/Visualization/SpikePlotting/PlotUtils.h b/Source/Processors/Visualization/SpikePlotting/PlotUtils.h
index 1de516e65271eecf6d1f3ddbf4025750ef9f291f..d02422670e3d85d24373b636c0b2c5df6336a337 100755
--- a/Source/Processors/Visualization/SpikePlotting/PlotUtils.h
+++ b/Source/Processors/Visualization/SpikePlotting/PlotUtils.h
@@ -7,7 +7,6 @@
 	#include <GL/glut.h>
 #elif defined(WIN32)
 	#undef GL_GLEXT_PROTOTYPES
-	#include <Windows.h>
 	#include <GLUT/glut.h>
 	#include <gl/GLU.h>
 	#include "..\..\..\glWinInit.h"
diff --git a/Source/Processors/Visualization/Visualizer.h b/Source/Processors/Visualization/Visualizer.h
index d442341f57f66d03e95d737fba022fe2ffa2bb14..8bf9de790bcadce8150d171369b2adc5db466014 100755
--- a/Source/Processors/Visualization/Visualizer.h
+++ b/Source/Processors/Visualization/Visualizer.h
@@ -24,9 +24,6 @@
 #ifndef __VISUALIZER_H_C5943EC1__
 #define __VISUALIZER_H_C5943EC1__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../../JuceLibraryCode/JuceHeader.h"
 
 /**
diff --git a/Source/Processors/WiFiOutput.h b/Source/Processors/WiFiOutput.h
index 011678bb71c50b90f1259856e760d674cca7e154..39a2ca49ee6e2c89f2e6bd7240ee64b2690f54d6 100755
--- a/Source/Processors/WiFiOutput.h
+++ b/Source/Processors/WiFiOutput.h
@@ -25,9 +25,6 @@
 #define __WIFIOUTPUT_H_94D625CE__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "GenericProcessor.h"
 #include "Editors/WiFiOutputEditor.h"
diff --git a/Source/UI/ControlPanel.h b/Source/UI/ControlPanel.h
index 3bf4b6b7bc50796bf9c684608eaeb8619513a6c7..9d54e00f037771cab71e0ddf05d06bc2a0e58ae7 100755
--- a/Source/UI/ControlPanel.h
+++ b/Source/UI/ControlPanel.h
@@ -24,9 +24,6 @@
 #ifndef __CONTROLPANEL_H_AD81E528__
 #define __CONTROLPANEL_H_AD81E528__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "../Audio/AudioComponent.h"
 #include "../Processors/Editors/AudioEditor.h"
@@ -37,7 +34,7 @@
 #include "../Processors/Editors/GenericEditor.h" // for UtilityButton
 #include "../Processors/Visualization/OpenGLCanvas.h"
 
-#include "../OpenGL.h"
+//#include "../OpenGL.h"
 
 
 /**
diff --git a/Source/UI/CustomLookAndFeel.h b/Source/UI/CustomLookAndFeel.h
index 604b79b023f62d4cdbaede4088c93e4e460a56a9..7bf648243fa753f2c2bd69270e1b76a62e99b83b 100755
--- a/Source/UI/CustomLookAndFeel.h
+++ b/Source/UI/CustomLookAndFeel.h
@@ -24,9 +24,6 @@
 #ifndef __CUSTOMLOOKANDFEEL_H_6B021009__
 #define __CUSTOMLOOKANDFEEL_H_6B021009__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 /**
diff --git a/Source/UI/DataViewport.h b/Source/UI/DataViewport.h
index d31a275efb0e5d6ed18412e194e60435ec815cf0..2662403bdd44d3e9224061ef7faf7be045307c32 100755
--- a/Source/UI/DataViewport.h
+++ b/Source/UI/DataViewport.h
@@ -24,9 +24,6 @@
 #ifndef __DATAVIEWPORT_H_B38FE628__
 #define __DATAVIEWPORT_H_B38FE628__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "../AccessClass.h"
 
diff --git a/Source/UI/EditorViewport.h b/Source/UI/EditorViewport.h
index 43318a5249573f7608ae54646bbf99d6d5164375..7d6553772234dd882cd2a27daf63086c56f23982 100755
--- a/Source/UI/EditorViewport.h
+++ b/Source/UI/EditorViewport.h
@@ -24,9 +24,6 @@
 #ifndef __EDITORVIEWPORT_H_80260F3F__
 #define __EDITORVIEWPORT_H_80260F3F__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "../Processors/ProcessorGraph.h"
 #include "../Processors/Editors/GenericEditor.h"
diff --git a/Source/UI/EditorViewportButtons.h b/Source/UI/EditorViewportButtons.h
index 6ba537fa2972f9c58d119bf6947474718ca3232f..864bba4036e40a109176fb8846c2b7f960802185 100755
--- a/Source/UI/EditorViewportButtons.h
+++ b/Source/UI/EditorViewportButtons.h
@@ -24,9 +24,6 @@
 #ifndef __EDITORVIEWPORTBUTTONS_H_2657C51D__
 #define __EDITORVIEWPORTBUTTONS_H_2657C51D__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 /**
diff --git a/Source/UI/InfoLabel.h b/Source/UI/InfoLabel.h
index f24ba1947917a50fe28b62293bd3e975e1e2e0a8..f66e4c972e7a7f9cd3c2769e45d9b25467e74cbb 100755
--- a/Source/UI/InfoLabel.h
+++ b/Source/UI/InfoLabel.h
@@ -24,9 +24,6 @@
 #ifndef __INFOLABEL_H_14DA9A62__
 #define __INFOLABEL_H_14DA9A62__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
     
 #include "../../JuceLibraryCode/JuceHeader.h"
 
diff --git a/Source/UI/MessageCenter.h b/Source/UI/MessageCenter.h
index 680030e8646f79b07e4f722e7f3aa9990477232f..ee75252ca71ddd03ed578cdb22ebf71271231573 100755
--- a/Source/UI/MessageCenter.h
+++ b/Source/UI/MessageCenter.h
@@ -25,9 +25,6 @@
 #define __MESSAGECENTER_H_2695FC38__
 
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 
 /**
diff --git a/Source/UI/ProcessorList.h b/Source/UI/ProcessorList.h
index 0d5670084482656b65771b7e42e306572aac6421..b6efb6ee61bb1a9217fe43824888ddf5ed408f7e 100755
--- a/Source/UI/ProcessorList.h
+++ b/Source/UI/ProcessorList.h
@@ -24,9 +24,6 @@
 #ifndef __PROCESSORLIST_H_C3A661E9__
 #define __PROCESSORLIST_H_C3A661E9__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "../Processors/Visualization/OpenGLCanvas.h"
 #include "../AccessClass.h"
diff --git a/Source/UI/SignalChainManager.h b/Source/UI/SignalChainManager.h
index 7ac6979f1e3c8bf6cecb10433bf1915cb1d53ea0..c36b48777e8ad2e6d98e2f10aae52186d53efda5 100755
--- a/Source/UI/SignalChainManager.h
+++ b/Source/UI/SignalChainManager.h
@@ -24,9 +24,6 @@
 #ifndef __SIGNALCHAINMANAGER_H_948769B9__
 #define __SIGNALCHAINMANAGER_H_948769B9__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "../Processors/Editors/GenericEditor.h"
 #include "../AccessClass.h"
diff --git a/Source/UI/UIComponent.h b/Source/UI/UIComponent.h
index 3b6137448aa7e95cccb91b7714adceb088ae0c61..436d12f789314fb40127d6196646adc083e1fa97 100755
--- a/Source/UI/UIComponent.h
+++ b/Source/UI/UIComponent.h
@@ -24,9 +24,6 @@
 #ifndef __UICOMPONENT_H_D97C73CF__
 #define __UICOMPONENT_H_D97C73CF__
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
 #include "../../JuceLibraryCode/JuceHeader.h"
 #include "InfoLabel.h"
 #include "ControlPanel.h"
@@ -39,7 +36,7 @@
 #include "../MainWindow.h"
 #include "../Processors/Visualization/OpenGLCanvas.h"
 
-#include "../OpenGL.h"
+//#include "../OpenGL.h"
 
 class MainWindow;
 class ProcessorList;