From 3f56af92427525b22582d3cd2cfc6b98fd354d73 Mon Sep 17 00:00:00 2001
From: aacuevas <aacuelo@teleco.upv.es>
Date: Wed, 3 Apr 2013 19:12:47 +0200
Subject: [PATCH] Windows.h include not needed with juce 2

With new jucer, windows.h is not only unnecesary, but can cause conflicts with some definitions.
Also, OpenGL.h includes disabled, as it's no longer needed and it, by itself, needs windows.h
---
 Source/AccessClass.h                                        | 3 ---
 Source/Audio/AudioComponent.h                               | 3 ---
 Source/Main.cpp                                             | 2 +-
 Source/MainWindow.h                                         | 3 ---
 Source/Processors/ArduinoOutput.h                           | 3 ---
 Source/Processors/AudioNode.h                               | 3 ---
 Source/Processors/AudioResamplingNode.h                     | 3 ---
 Source/Processors/Channel.h                                 | 4 ----
 Source/Processors/DataThreads/DataBuffer.h                  | 3 ---
 Source/Processors/DataThreads/DataThread.h                  | 3 ---
 Source/Processors/DataThreads/FPGAThread.h                  | 3 ---
 Source/Processors/DataThreads/FileReaderThread.h            | 3 ---
 Source/Processors/DataThreads/IntanThread.h                 | 3 ---
 Source/Processors/DataThreads/RHD2000Thread.h               | 3 ---
 Source/Processors/Editors/ArduinoOutputEditor.h             | 3 ---
 Source/Processors/Editors/AudioEditor.h                     | 3 ---
 Source/Processors/Editors/ChannelSelector.h                 | 3 ---
 Source/Processors/Editors/EventNodeEditor.h                 | 3 ---
 Source/Processors/Editors/FPGAOutputEditor.h                | 4 ----
 Source/Processors/Editors/FilterEditor.h                    | 3 ---
 Source/Processors/Editors/GenericEditor.h                   | 3 ---
 Source/Processors/Editors/ImageIcon.h                       | 3 ---
 Source/Processors/Editors/LfpDisplayEditor.h                | 3 ---
 Source/Processors/Editors/MergerEditor.h                    | 3 ---
 Source/Processors/Editors/ParameterEditor.h                 | 3 ---
 Source/Processors/Editors/RecordControlEditor.h             | 3 ---
 Source/Processors/Editors/ReferenceNodeEditor.h             | 3 ---
 Source/Processors/Editors/ResamplingNodeEditor.h            | 3 ---
 Source/Processors/Editors/SignalGeneratorEditor.h           | 3 ---
 Source/Processors/Editors/SourceNodeEditor.h                | 3 ---
 Source/Processors/Editors/SpikeDetectorEditor.h             | 3 ---
 Source/Processors/Editors/SpikeDisplayEditor.h              | 3 ---
 Source/Processors/Editors/SplitterEditor.h                  | 3 ---
 Source/Processors/Editors/VisualizerEditor.h                | 3 ---
 Source/Processors/Editors/WiFiOutputEditor.h                | 3 ---
 Source/Processors/EventDetector.h                           | 4 ----
 Source/Processors/EventNode.h                               | 3 ---
 Source/Processors/FPGAOutput.h                              | 4 ----
 Source/Processors/FilterNode.h                              | 3 ---
 Source/Processors/GenericProcessor.h                        | 3 ---
 Source/Processors/LfpDisplayNode.h                          | 3 ---
 Source/Processors/Parameter.h                               | 3 ---
 Source/Processors/PhaseDetector.h                           | 4 ----
 Source/Processors/ProcessorGraph.h                          | 3 ---
 Source/Processors/RecordNode.h                              | 3 ---
 Source/Processors/ReferenceNode.h                           | 3 ---
 Source/Processors/ResamplingNode.h                          | 3 ---
 Source/Processors/SignalGenerator.h                         | 3 ---
 Source/Processors/SourceNode.h                              | 3 ---
 Source/Processors/SpikeDetector.h                           | 3 ---
 Source/Processors/SpikeDisplayNode.h                        | 3 ---
 Source/Processors/Utilities/Merger.h                        | 3 ---
 Source/Processors/Utilities/RecordControl.h                 | 4 ----
 Source/Processors/Utilities/Splitter.h                      | 3 ---
 Source/Processors/Visualization/DataWindow.h                | 3 ---
 Source/Processors/Visualization/LfpDisplayCanvas.h          | 3 ---
 Source/Processors/Visualization/OpenGLCanvas.cpp            | 1 +
 Source/Processors/Visualization/OpenGLCanvas.h              | 5 +----
 Source/Processors/Visualization/SpikeDisplayCanvas.h        | 3 ---
 Source/Processors/Visualization/SpikePlotting/GenericAxes.h | 3 ---
 Source/Processors/Visualization/SpikePlotting/PlotUtils.h   | 1 -
 Source/Processors/Visualization/Visualizer.h                | 3 ---
 Source/Processors/WiFiOutput.h                              | 3 ---
 Source/UI/ControlPanel.h                                    | 5 +----
 Source/UI/CustomLookAndFeel.h                               | 3 ---
 Source/UI/DataViewport.h                                    | 3 ---
 Source/UI/EditorViewport.h                                  | 3 ---
 Source/UI/EditorViewportButtons.h                           | 3 ---
 Source/UI/InfoLabel.h                                       | 3 ---
 Source/UI/MessageCenter.h                                   | 3 ---
 Source/UI/ProcessorList.h                                   | 3 ---
 Source/UI/SignalChainManager.h                              | 3 ---
 Source/UI/UIComponent.h                                     | 5 +----
 73 files changed, 5 insertions(+), 221 deletions(-)

diff --git a/Source/AccessClass.h b/Source/AccessClass.h
index 0991c8513..6ed566e41 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 021737cb4..f5e5698ac 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 0d73d5c5d..80793f7f6 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 07dc20418..540771210 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 c2757a407..cb85c7463 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 746912865..3b4578679 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 b5eb052cb..40dc86a70 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 d30bbbd83..f44ea8d45 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 f2cb4864b..1c8a33cbd 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 094c4adf4..61d53addb 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 27af4852f..1a0dde7d7 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 e67ae2fc3..fde6aaa96 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 8ce792f87..72121ec22 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 306502f2b..c189df562 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 cef7931cb..87ad84aeb 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 3f2c8a199..12490803c 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 a63e0c425..c5edd2913 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 cd540f1b9..170d95ac7 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 b59f3ad40..5d178e424 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 74087981d..e8d71a511 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 daa142822..594730aeb 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 d70495a1e..ae2a7f9d5 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 b3a5a8eae..4f740e77e 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 fe97e4a8f..f5eef0191 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 e4ef4211a..1f5dfd36b 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 ff40e8a3f..390d247af 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 ae0ed6426..4c476fd2e 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 259e93214..dd430d2f5 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 801d6f505..928f24423 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 6b430893a..c35948a85 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 87fab84bc..798471f3e 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 6725ba640..8b028485c 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 2fb1d46f6..8ac9d5a84 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 dc6852916..fe772b15f 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 ac5809f07..fd8e0bc99 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 005e385b0..4b23b7141 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 594f57929..3781e4607 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 d488d0a2f..fb7b17e39 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 9979d50d7..f97c462c6 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 5a316ca6e..298699fc1 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 158728205..7f84e5eb7 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 8f8cad0c5..a35e80824 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 60303f824..53a11ed0e 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 a0def0b10..472529048 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 abaafc28a..16affd3eb 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 96c12370a..1687c6967 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 650771cc8..1b57796b5 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 487810d17..de5632d1a 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 504cab9f0..48e75fe0f 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 5818a4df5..32a398b12 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 635f164a7..bef65285f 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 593d6851f..a1dc8c6cd 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 77a41592a..23133ebed 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 54dd0d9d9..ffa82bb44 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 e52e14191..7b379b553 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 b87656d31..0b6186326 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 7ca959502..3380e92c7 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 9fdb66051..cfa33525d 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 8cc8694ad..df7eb2465 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 347a39a4c..1768743b4 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 1de516e65..d02422670 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 d442341f5..8bf9de790 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 011678bb7..39a2ca49e 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 3bf4b6b7b..9d54e00f0 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 604b79b02..7bf648243 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 d31a275ef..2662403bd 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 43318a524..7d6553772 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 6ba537fa2..864bba403 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 f24ba1947..f66e4c972 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 680030e86..ee75252ca 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 0d5670084..b6efb6ee6 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 7ac6979f1..c36b48777 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 3b6137448..436d12f78 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;
-- 
GitLab