From 766e7fcfd8ff3d3f4821eae945dad25b3f9fe6be Mon Sep 17 00:00:00 2001
From: Aaron Cuevas Lopez <aacuelo@teleco.upv.es>
Date: Mon, 30 Nov 2015 17:10:12 +0100
Subject: [PATCH] Create common headers for plugins

---
 Builds/VisualStudio2013/Plugins/Plugin_Debug32.props     | 2 +-
 Builds/VisualStudio2013/Plugins/Plugin_Debug64.props     | 2 +-
 Builds/VisualStudio2013/Plugins/Plugin_Release32.props   | 2 +-
 Builds/VisualStudio2013/Plugins/Plugin_Release64.props   | 2 +-
 Source/Plugins/ArduinoOutput/ArduinoOutput.h             | 6 +++---
 Source/Plugins/ArduinoOutput/ArduinoOutputEditor.h       | 6 ++----
 Source/Plugins/ArduinoOutput/OpenEphysLib.cpp            | 2 +-
 Source/Plugins/ArduinoOutput/serial/ofArduino.h          | 2 +-
 Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp        | 2 +-
 .../BasicSpikeDisplay/SpikeDetector/SpikeDetector.h      | 6 ++----
 .../SpikeDetector/SpikeDetectorEditor.h                  | 4 +---
 .../SpikeDisplayNode/SpikeDisplayCanvas.h                | 5 ++---
 .../SpikeDisplayNode/SpikeDisplayEditor.h                | 9 +++------
 .../SpikeDisplayNode/SpikeDisplayNode.cpp                | 1 -
 .../SpikeDisplayNode/SpikeDisplayNode.h                  | 6 ++----
 Source/Plugins/CAR/CAR.h                                 | 3 +--
 Source/Plugins/CAR/OpenEphysLib.cpp                      | 2 +-
 .../Plugins/ChannelMappingNode/ChannelMappingEditor.cpp  | 1 -
 Source/Plugins/ChannelMappingNode/ChannelMappingEditor.h | 4 +---
 Source/Plugins/ChannelMappingNode/ChannelMappingNode.h   | 5 +----
 Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp       | 2 +-
 Source/Plugins/EcubeSource/EcubeEditor.h                 | 3 +--
 Source/Plugins/EcubeSource/EcubeThread.cpp               | 1 -
 Source/Plugins/EcubeSource/EcubeThread.h                 | 5 +----
 Source/Plugins/EcubeSource/OpenEphysLib.cpp              | 2 +-
 Source/Plugins/FilterNode/FilterEditor.h                 | 3 +--
 Source/Plugins/FilterNode/FilterNode.h                   | 3 +--
 Source/Plugins/FilterNode/OpenEphysLib.cpp               | 2 +-
 Source/Plugins/Headers/DataThreadHeaders.h               | 3 +++
 Source/Plugins/Headers/EditorHeaders.h                   | 5 +++++
 Source/Plugins/Headers/FileSourceHeaders.h               | 2 ++
 Source/Plugins/Headers/PluginInfo.h                      | 1 +
 Source/Plugins/Headers/ProcessorHeaders.h                | 4 ++++
 Source/Plugins/Headers/RecordingLib.h                    | 1 +
 Source/Plugins/Headers/SerialLib.h                       | 1 +
 Source/Plugins/Headers/SpikeLib.h                        | 1 +
 Source/Plugins/Headers/VisualizerEditorHeaders.h         | 4 ++++
 Source/Plugins/Headers/VisualizerWindowHeaders.h         | 2 ++
 Source/Plugins/KWIKFormat/FileSource/KwikFileSource.h    | 3 +--
 Source/Plugins/KWIKFormat/OpenEphysLib.cpp               | 2 +-
 Source/Plugins/KWIKFormat/RecordEngine/HDF5Recording.h   | 2 +-
 Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.h         | 4 ++--
 Source/Plugins/LfpDisplayNode/LfpDisplayEditor.h         | 8 ++------
 Source/Plugins/LfpDisplayNode/LfpDisplayNode.h           | 4 +---
 Source/Plugins/LfpDisplayNode/OpenEphysLib.cpp           | 2 +-
 Source/Plugins/NetworkEvents/NetworkEvents.h             | 3 +--
 Source/Plugins/NetworkEvents/NetworkEventsEditor.h       | 3 +--
 Source/Plugins/NetworkEvents/OpenEphysLib.cpp            | 2 +-
 Source/Plugins/PhaseDetector/OpenEphysLib.cpp            | 2 +-
 Source/Plugins/PhaseDetector/PhaseDetector.h             | 3 +--
 Source/Plugins/PhaseDetector/PhaseDetectorEditor.h       | 5 +----
 Source/Plugins/PulsePalOutput/OpenEphysLib.cpp           | 2 +-
 Source/Plugins/PulsePalOutput/PulsePalOutput.h           | 3 +--
 Source/Plugins/PulsePalOutput/PulsePalOutputEditor.h     | 3 +--
 Source/Plugins/PulsePalOutput/serial/PulsePal.h          | 2 +-
 Source/Plugins/RecordControl/OpenEphysLib.cpp            | 2 +-
 Source/Plugins/RecordControl/RecordControl.cpp           | 1 -
 Source/Plugins/RecordControl/RecordControl.h             | 3 +--
 Source/Plugins/RecordControl/RecordControlEditor.cpp     | 1 -
 Source/Plugins/RecordControl/RecordControlEditor.h       | 3 +--
 Source/Plugins/Rectifier/OpenEphysLib.cpp                | 2 +-
 Source/Plugins/Rectifier/Rectifier.h                     | 3 +--
 Source/Plugins/SerialInput/OpenEphysLib.cpp              | 2 +-
 Source/Plugins/SerialInput/SerialInput.h                 | 5 ++---
 Source/Plugins/SerialInput/SerialInputEditor.h           | 3 +--
 65 files changed, 85 insertions(+), 110 deletions(-)
 create mode 100644 Source/Plugins/Headers/DataThreadHeaders.h
 create mode 100644 Source/Plugins/Headers/EditorHeaders.h
 create mode 100644 Source/Plugins/Headers/FileSourceHeaders.h
 create mode 100644 Source/Plugins/Headers/PluginInfo.h
 create mode 100644 Source/Plugins/Headers/ProcessorHeaders.h
 create mode 100644 Source/Plugins/Headers/RecordingLib.h
 create mode 100644 Source/Plugins/Headers/SerialLib.h
 create mode 100644 Source/Plugins/Headers/SpikeLib.h
 create mode 100644 Source/Plugins/Headers/VisualizerEditorHeaders.h
 create mode 100644 Source/Plugins/Headers/VisualizerWindowHeaders.h

diff --git a/Builds/VisualStudio2013/Plugins/Plugin_Debug32.props b/Builds/VisualStudio2013/Plugins/Plugin_Debug32.props
index d58e20391..0a852e6ed 100644
--- a/Builds/VisualStudio2013/Plugins/Plugin_Debug32.props
+++ b/Builds/VisualStudio2013/Plugins/Plugin_Debug32.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\Plugins\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>OEPLUGIN;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_API=__declspec(dllimport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/Builds/VisualStudio2013/Plugins/Plugin_Debug64.props b/Builds/VisualStudio2013/Plugins/Plugin_Debug64.props
index b62c2e1d4..977f6855a 100644
--- a/Builds/VisualStudio2013/Plugins/Plugin_Debug64.props
+++ b/Builds/VisualStudio2013/Plugins/Plugin_Debug64.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\Plugins\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>OEPLUGIN;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_API=__declspec(dllimport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/Builds/VisualStudio2013/Plugins/Plugin_Release32.props b/Builds/VisualStudio2013/Plugins/Plugin_Release32.props
index b5c109738..a09b4bb23 100644
--- a/Builds/VisualStudio2013/Plugins/Plugin_Release32.props
+++ b/Builds/VisualStudio2013/Plugins/Plugin_Release32.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\Plugins\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>OEPLUGIN;WIN32;_WINDOWS;NDEBUG;JUCE_API=__declspec(dllimport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/Builds/VisualStudio2013/Plugins/Plugin_Release64.props b/Builds/VisualStudio2013/Plugins/Plugin_Release64.props
index 8099134be..d425f4c26 100644
--- a/Builds/VisualStudio2013/Plugins/Plugin_Release64.props
+++ b/Builds/VisualStudio2013/Plugins/Plugin_Release64.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\Plugins\Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>OEPLUGIN;WIN32;_WINDOWS;NDEBUG;JUCE_API=__declspec(dllimport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/Source/Plugins/ArduinoOutput/ArduinoOutput.h b/Source/Plugins/ArduinoOutput/ArduinoOutput.h
index 92ff0d23f..5dec3b259 100644
--- a/Source/Plugins/ArduinoOutput/ArduinoOutput.h
+++ b/Source/Plugins/ArduinoOutput/ArduinoOutput.h
@@ -24,10 +24,10 @@
 #ifndef __ARDUINOOUTPUT_H_F7BDA585__
 #define __ARDUINOOUTPUT_H_F7BDA585__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-
+#include <SerialLib.h>
+#include <ProcessorHeaders.h>
 #include "serial/ofArduino.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+
 
 
 /**
diff --git a/Source/Plugins/ArduinoOutput/ArduinoOutputEditor.h b/Source/Plugins/ArduinoOutput/ArduinoOutputEditor.h
index ef9986aaf..952932863 100644
--- a/Source/Plugins/ArduinoOutput/ArduinoOutputEditor.h
+++ b/Source/Plugins/ArduinoOutput/ArduinoOutputEditor.h
@@ -25,11 +25,9 @@
 #define __ARDUINOOUTPUTEDITOR_H_28EB4CC9__
 
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
-#include "../../Processors/Editors/ImageIcon.h"
+#include <EditorHeaders.h>
 #include "ArduinoOutput.h"
-#include "../../Processors/Serial/ofSerial.h"
+#include <SerialLib.h>
 
 class ImageIcon;
 
diff --git a/Source/Plugins/ArduinoOutput/OpenEphysLib.cpp b/Source/Plugins/ArduinoOutput/OpenEphysLib.cpp
index fe9e6efe7..7a27ef614 100644
--- a/Source/Plugins/ArduinoOutput/OpenEphysLib.cpp
+++ b/Source/Plugins/ArduinoOutput/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "ArduinoOutput.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/ArduinoOutput/serial/ofArduino.h b/Source/Plugins/ArduinoOutput/serial/ofArduino.h
index c8ad20a68..32e0c397a 100644
--- a/Source/Plugins/ArduinoOutput/serial/ofArduino.h
+++ b/Source/Plugins/ArduinoOutput/serial/ofArduino.h
@@ -38,7 +38,7 @@
 
 //#include "ofEvents.h"
 
-#include "../../../Processors/Serial/ofSerial.h"
+#include <SerialLib.h>
 
 /*
  * Version numbers for the protocol. The protocol is still changing, so these
diff --git a/Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp b/Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp
index 0f95d904d..b05f8b9f8 100644
--- a/Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp
+++ b/Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "SpikeDetector/SpikeDetector.h"
 #include "SpikeDisplayNode/SpikeDisplayNode.h"
 #include <string>
diff --git a/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.h b/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.h
index 2510fb6d0..c3bdeb494 100644
--- a/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.h
+++ b/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetector.h
@@ -24,12 +24,10 @@
 #ifndef __SPIKEDETECTOR_H_3F920F95__
 #define __SPIKEDETECTOR_H_3F920F95__
 
-#include "../../../../JuceLibraryCode/JuceHeader.h"
-
-#include "../../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 #include "SpikeDetectorEditor.h"
 
-#include "../../../Processors/Visualization/SpikeObject.h"
+#include <SpikeLib.h>
 
 struct SimpleElectrode
 {
diff --git a/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.h b/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.h
index 5bf596c48..0065b055d 100644
--- a/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.h
+++ b/Source/Plugins/BasicSpikeDisplay/SpikeDetector/SpikeDetectorEditor.h
@@ -25,9 +25,7 @@
 #define __SPIKEDETECTOREDITOR_H_F0BD2DD9__
 
 
-#include "../../../../JuceLibraryCode/JuceHeader.h"
-#include "../../../Processors/Editors/GenericEditor.h"
-#include "../../../Processors/Editors/ElectrodeButtons.h"
+#include <EditorHeaders.h>
 
 class TriangleButton;
 class UtilityButton;
diff --git a/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayCanvas.h b/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayCanvas.h
index d86ac8d38..b4bd2d4a3 100644
--- a/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayCanvas.h
+++ b/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayCanvas.h
@@ -24,12 +24,11 @@
 #ifndef SPIKEDISPLAYCANVAS_H_
 #define SPIKEDISPLAYCANVAS_H_
 
-#include "../../../../JuceLibraryCode/JuceHeader.h"
+#include <VisualizerWindowHeaders.h>
 
 #include "SpikeDisplayNode.h"
-#include "../../../Processors/Visualization/SpikeObject.h"
+#include <SpikeLib.h>
 
-#include "../../../Processors/Visualization/Visualizer.h"
 #include <vector>
 
 #define WAVE1 0
diff --git a/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayEditor.h b/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayEditor.h
index ab47e3dc3..408aa999c 100644
--- a/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayEditor.h
+++ b/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayEditor.h
@@ -24,14 +24,11 @@
 #ifndef SPIKEDISPLAYEDITOR_H_
 #define SPIKEDISPLAYEDITOR_H_
 
-#include "../../../../JuceLibraryCode/JuceHeader.h"
-#include "../../../Processors/Editors/GenericEditor.h"
-#include "../../../UI/UIComponent.h"
-#include "../../../UI/DataViewport.h"
-#include "../../../Processors/Visualization/DataWindow.h"
+#include <VisualizerEditorHeaders.h>
+#include <RecordingLib.h>
 #include "SpikeDisplayNode.h"
 #include "SpikeDisplayCanvas.h"
-#include "../../../Processors/Editors/VisualizerEditor.h"
+
 
 #define MAX_N_SUB_CHAN 8
 class Visualizer;
diff --git a/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayNode.cpp b/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayNode.cpp
index 90c6bd01d..41dce7d4a 100644
--- a/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayNode.cpp
+++ b/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayNode.cpp
@@ -23,7 +23,6 @@
 
 #include "SpikeDisplayNode.h"
 #include "SpikeDisplayCanvas.h"
-#include "../../../Processors/Channel/Channel.h"
 
 #include <stdio.h>
 
diff --git a/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayNode.h b/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayNode.h
index 6c9fdb006..cabe7b4a1 100644
--- a/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayNode.h
+++ b/Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayNode.h
@@ -24,11 +24,9 @@
 #ifndef SPIKEDISPLAYNODE_H_
 #define SPIKEDISPLAYNODE_H_
 
-#include "../../../../JuceLibraryCode/JuceHeader.h"
+#include <ProcessorHeaders.h>
+#include <SpikeLib.h>
 #include "SpikeDisplayEditor.h"
-#include "../../../Processors/Editors/VisualizerEditor.h"
-#include "../../../Processors/GenericProcessor/GenericProcessor.h"
-#include "../../../Processors/Visualization/SpikeObject.h"
 
 class DataViewport;
 class SpikePlot;
diff --git a/Source/Plugins/CAR/CAR.h b/Source/Plugins/CAR/CAR.h
index 4ef1b181e..99d75f457 100644
--- a/Source/Plugins/CAR/CAR.h
+++ b/Source/Plugins/CAR/CAR.h
@@ -29,8 +29,7 @@
 #include <Windows.h>
 #endif
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 
 /**
 
diff --git a/Source/Plugins/CAR/OpenEphysLib.cpp b/Source/Plugins/CAR/OpenEphysLib.cpp
index bc9ea0a2e..9ea9f585e 100644
--- a/Source/Plugins/CAR/OpenEphysLib.cpp
+++ b/Source/Plugins/CAR/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "CAR.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp b/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp
index ef44780a5..c32b68384 100644
--- a/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp
+++ b/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ChannelMappingEditor.h"
 #include "ChannelMappingNode.h"
-#include "../../Processors/Editors/ChannelSelector.h"
 #include <stdio.h>
 
 
diff --git a/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.h b/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.h
index 6818bf358..be25bf7c6 100644
--- a/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.h
+++ b/Source/Plugins/ChannelMappingNode/ChannelMappingEditor.h
@@ -26,9 +26,7 @@
 
 
 #include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
-
-#include "../../Processors/Editors/ElectrodeButtons.h" // for ElectrodeButton and ElectrodeEditorButton
+#include <EditorHeaders.h>
 
 #define NUM_REFERENCES 4
 
diff --git a/Source/Plugins/ChannelMappingNode/ChannelMappingNode.h b/Source/Plugins/ChannelMappingNode/ChannelMappingNode.h
index b5c020e06..a74240025 100644
--- a/Source/Plugins/ChannelMappingNode/ChannelMappingNode.h
+++ b/Source/Plugins/ChannelMappingNode/ChannelMappingNode.h
@@ -25,10 +25,7 @@
 #define __CHANNELMAPPINGNODE_H_330E50E0__
 
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-
-
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 
 
 /**
diff --git a/Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp b/Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp
index dc6646d73..549dd52af 100644
--- a/Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp
+++ b/Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "ChannelMappingNode.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/EcubeSource/EcubeEditor.h b/Source/Plugins/EcubeSource/EcubeEditor.h
index 181976c83..2b0695e9e 100644
--- a/Source/Plugins/EcubeSource/EcubeEditor.h
+++ b/Source/Plugins/EcubeSource/EcubeEditor.h
@@ -26,8 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef __ECUBEEDITOR_H_D3EC8BA8__
 #define __ECUBEEDITOR_H_D3EC8BA8__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
+#include <EditorHeaders.h>
 
 
 
diff --git a/Source/Plugins/EcubeSource/EcubeThread.cpp b/Source/Plugins/EcubeSource/EcubeThread.cpp
index ebe067023..c81e67dce 100644
--- a/Source/Plugins/EcubeSource/EcubeThread.cpp
+++ b/Source/Plugins/EcubeSource/EcubeThread.cpp
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 #include "EcubeThread.h"
-#include "../../Processors/SourceNode/SourceNode.h"
 #include "EcubeDialogComponent.h"
 #include <stdint.h>
 
diff --git a/Source/Plugins/EcubeSource/EcubeThread.h b/Source/Plugins/EcubeSource/EcubeThread.h
index 8bf4f7cbd..8b654620f 100644
--- a/Source/Plugins/EcubeSource/EcubeThread.h
+++ b/Source/Plugins/EcubeSource/EcubeThread.h
@@ -27,14 +27,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __ECUBETHREAD_H_EC4CAD67__
 
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
+#include <DataThreadHeaders.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#include "../../Processors/DataThreads/DataThread.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
-
 #define MAX_NUM_DATA_STREAMS 8
 
 class SourceNode;
diff --git a/Source/Plugins/EcubeSource/OpenEphysLib.cpp b/Source/Plugins/EcubeSource/OpenEphysLib.cpp
index eb5de2084..e446f3c25 100644
--- a/Source/Plugins/EcubeSource/OpenEphysLib.cpp
+++ b/Source/Plugins/EcubeSource/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "EcubeThread.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/FilterNode/FilterEditor.h b/Source/Plugins/FilterNode/FilterEditor.h
index a5cc300af..2ab56711c 100644
--- a/Source/Plugins/FilterNode/FilterEditor.h
+++ b/Source/Plugins/FilterNode/FilterEditor.h
@@ -25,8 +25,7 @@
 #define __FILTEREDITOR_H_969BDB5__
 
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
+#include <EditorHeaders.h>
 
 class FilterViewport;
 
diff --git a/Source/Plugins/FilterNode/FilterNode.h b/Source/Plugins/FilterNode/FilterNode.h
index 0c2b71e53..4f47f2390 100644
--- a/Source/Plugins/FilterNode/FilterNode.h
+++ b/Source/Plugins/FilterNode/FilterNode.h
@@ -24,9 +24,8 @@
 #ifndef __FILTERNODE_H_CED428E__
 #define __FILTERNODE_H_CED428E__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
+#include <ProcessorHeaders.h>
 #include "Dsp/Dsp.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
 
 /**
 
diff --git a/Source/Plugins/FilterNode/OpenEphysLib.cpp b/Source/Plugins/FilterNode/OpenEphysLib.cpp
index e6e74e0b7..563c217da 100644
--- a/Source/Plugins/FilterNode/OpenEphysLib.cpp
+++ b/Source/Plugins/FilterNode/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "FilterNode.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/Headers/DataThreadHeaders.h b/Source/Plugins/Headers/DataThreadHeaders.h
new file mode 100644
index 000000000..e090c00c0
--- /dev/null
+++ b/Source/Plugins/Headers/DataThreadHeaders.h
@@ -0,0 +1,3 @@
+#include "../../../JuceLibraryCode/JuceHeader.h"
+#include "../../Processors/DataThreads/DataThread.h"
+#include "../../Processors/SourceNode/SourceNode.h"
diff --git a/Source/Plugins/Headers/EditorHeaders.h b/Source/Plugins/Headers/EditorHeaders.h
new file mode 100644
index 000000000..9ae1abe5b
--- /dev/null
+++ b/Source/Plugins/Headers/EditorHeaders.h
@@ -0,0 +1,5 @@
+#include "../../../JuceLibraryCode/JuceHeader.h"
+#include "../../Processors/Editors/GenericEditor.h"
+#include "../../Processors/Editors/ImageIcon.h"
+#include "../../Processors/Editors/ElectrodeButtons.h"
+#include "../../Processors/Editors/ChannelSelector.h"
diff --git a/Source/Plugins/Headers/FileSourceHeaders.h b/Source/Plugins/Headers/FileSourceHeaders.h
new file mode 100644
index 000000000..348f488ba
--- /dev/null
+++ b/Source/Plugins/Headers/FileSourceHeaders.h
@@ -0,0 +1,2 @@
+#include "../../JuceLibraryCode/JuceHeader.h"
+#include "../../Processors/FileReader/FileSource.h"
diff --git a/Source/Plugins/Headers/PluginInfo.h b/Source/Plugins/Headers/PluginInfo.h
new file mode 100644
index 000000000..d0a330a4f
--- /dev/null
+++ b/Source/Plugins/Headers/PluginInfo.h
@@ -0,0 +1 @@
+#include "../../Processors/PluginManager/OpenEphysPlugin.h"
diff --git a/Source/Plugins/Headers/ProcessorHeaders.h b/Source/Plugins/Headers/ProcessorHeaders.h
new file mode 100644
index 000000000..3bba9314e
--- /dev/null
+++ b/Source/Plugins/Headers/ProcessorHeaders.h
@@ -0,0 +1,4 @@
+#include "../../../JuceLibraryCode/JuceHeader.h"
+#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include "../../Processors/Channel/Channel.h"
+
diff --git a/Source/Plugins/Headers/RecordingLib.h b/Source/Plugins/Headers/RecordingLib.h
new file mode 100644
index 000000000..567d1d37c
--- /dev/null
+++ b/Source/Plugins/Headers/RecordingLib.h
@@ -0,0 +1 @@
+#include "../../Processors/RecordNode/RecordEngine.h"
diff --git a/Source/Plugins/Headers/SerialLib.h b/Source/Plugins/Headers/SerialLib.h
new file mode 100644
index 000000000..2a42811c8
--- /dev/null
+++ b/Source/Plugins/Headers/SerialLib.h
@@ -0,0 +1 @@
+#include "../../Processors/Serial/ofSerial.h"
diff --git a/Source/Plugins/Headers/SpikeLib.h b/Source/Plugins/Headers/SpikeLib.h
new file mode 100644
index 000000000..e3e44b9a5
--- /dev/null
+++ b/Source/Plugins/Headers/SpikeLib.h
@@ -0,0 +1 @@
+#include "../../../Processors/Visualization/SpikeObject.h"
diff --git a/Source/Plugins/Headers/VisualizerEditorHeaders.h b/Source/Plugins/Headers/VisualizerEditorHeaders.h
new file mode 100644
index 000000000..ae5d9ca06
--- /dev/null
+++ b/Source/Plugins/Headers/VisualizerEditorHeaders.h
@@ -0,0 +1,4 @@
+#include "../../../JuceLibraryCode/JuceHeader.h"
+#include "EditorHeaders.h"
+#include "../../Processors/Visualization/DataWindow.h"
+#include "../../Processors/Editors/VisualizerEditor.h"
diff --git a/Source/Plugins/Headers/VisualizerWindowHeaders.h b/Source/Plugins/Headers/VisualizerWindowHeaders.h
new file mode 100644
index 000000000..8fb61fd1a
--- /dev/null
+++ b/Source/Plugins/Headers/VisualizerWindowHeaders.h
@@ -0,0 +1,2 @@
+#include "../../../JuceLibraryCode/JuceHeader.h"
+#include "../../Processors/Visualization/Visualizer.h"
diff --git a/Source/Plugins/KWIKFormat/FileSource/KwikFileSource.h b/Source/Plugins/KWIKFormat/FileSource/KwikFileSource.h
index 810559109..ba92857e8 100644
--- a/Source/Plugins/KWIKFormat/FileSource/KwikFileSource.h
+++ b/Source/Plugins/KWIKFormat/FileSource/KwikFileSource.h
@@ -24,8 +24,7 @@
 #ifndef KWIKFILESOURCE_H_INCLUDED
 #define KWIKFILESOURCE_H_INCLUDED
 
-#include "../../../../JuceLibraryCode/JuceHeader.h"
-#include "../../../Processors/FileReader/FileSource.h"
+#include <FileSourceHeaders.h>
 
 #define MIN_KWIK_VERSION 2
 #define MAX_KWIK_VERSION 2
diff --git a/Source/Plugins/KWIKFormat/OpenEphysLib.cpp b/Source/Plugins/KWIKFormat/OpenEphysLib.cpp
index d46a5c096..c8bad9116 100644
--- a/Source/Plugins/KWIKFormat/OpenEphysLib.cpp
+++ b/Source/Plugins/KWIKFormat/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "RecordEngine/HDF5Recording.h"
 #include "FileSource/KwikFileSource.h"
 #include <string>
diff --git a/Source/Plugins/KWIKFormat/RecordEngine/HDF5Recording.h b/Source/Plugins/KWIKFormat/RecordEngine/HDF5Recording.h
index d0707d5a6..dc27f26ff 100644
--- a/Source/Plugins/KWIKFormat/RecordEngine/HDF5Recording.h
+++ b/Source/Plugins/KWIKFormat/RecordEngine/HDF5Recording.h
@@ -24,7 +24,7 @@
 #ifndef HDF5RECORDING_H_INCLUDED
 #define HDF5RECORDING_H_INCLUDED
 
-#include "../../../Processors/RecordNode/RecordEngine.h"
+#include <RecordingLib.h>
 #include "HDF5FileFormat.h"
 
 class HDF5Recording : public RecordEngine
diff --git a/Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.h b/Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.h
index 0e99bf01d..1c931b779 100644
--- a/Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.h
+++ b/Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.h
@@ -23,9 +23,9 @@
 #ifndef __LFPDISPLAYCANVAS_H_B711873A__
 #define __LFPDISPLAYCANVAS_H_B711873A__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
+#include <VisualizerWindowHeaders.h>
 #include "LfpDisplayNode.h"
-#include "../../Processors/Visualization/Visualizer.h"
+
 #define CHANNEL_TYPES 3
 
 class LfpDisplayNode;
diff --git a/Source/Plugins/LfpDisplayNode/LfpDisplayEditor.h b/Source/Plugins/LfpDisplayNode/LfpDisplayEditor.h
index 41af1b9d6..6c5f65667 100644
--- a/Source/Plugins/LfpDisplayNode/LfpDisplayEditor.h
+++ b/Source/Plugins/LfpDisplayNode/LfpDisplayEditor.h
@@ -24,14 +24,9 @@
 #ifndef __LFPDISPLAYEDITOR_H_3438800D__
 #define __LFPDISPLAYEDITOR_H_3438800D__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
-#include "../../UI/UIComponent.h"
-#include "../../UI/DataViewport.h"
-#include "../../Processors/Visualization/DataWindow.h"
+#include <VisualizerEditorHeaders.h>
 #include "LfpDisplayNode.h"
 #include "LfpDisplayCanvas.h"
-#include "../../Processors/Editors/VisualizerEditor.h"
 
 class Visualizer;
 
@@ -61,3 +56,4 @@ private:
 };
 
 #endif  // __LFPDISPLAYEDITOR_H_3438800D__
+		
\ No newline at end of file
diff --git a/Source/Plugins/LfpDisplayNode/LfpDisplayNode.h b/Source/Plugins/LfpDisplayNode/LfpDisplayNode.h
index 16e714806..e633853c6 100644
--- a/Source/Plugins/LfpDisplayNode/LfpDisplayNode.h
+++ b/Source/Plugins/LfpDisplayNode/LfpDisplayNode.h
@@ -24,10 +24,8 @@
 #ifndef __LFPDISPLAYNODE_H_D969A379__
 #define __LFPDISPLAYNODE_H_D969A379__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
+#include <ProcessorHeaders.h>
 #include "LfpDisplayEditor.h"
-#include "../../Processors/Editors/VisualizerEditor.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
 
 class DataViewport;
 
diff --git a/Source/Plugins/LfpDisplayNode/OpenEphysLib.cpp b/Source/Plugins/LfpDisplayNode/OpenEphysLib.cpp
index c644cccc6..d15aa896e 100644
--- a/Source/Plugins/LfpDisplayNode/OpenEphysLib.cpp
+++ b/Source/Plugins/LfpDisplayNode/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "LfpDisplayNode.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/NetworkEvents/NetworkEvents.h b/Source/Plugins/NetworkEvents/NetworkEvents.h
index c6e5135bd..cb1d9db3a 100644
--- a/Source/Plugins/NetworkEvents/NetworkEvents.h
+++ b/Source/Plugins/NetworkEvents/NetworkEvents.h
@@ -37,8 +37,7 @@
 
 #endif
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 
 #include <list>
 #include <queue>
diff --git a/Source/Plugins/NetworkEvents/NetworkEventsEditor.h b/Source/Plugins/NetworkEvents/NetworkEventsEditor.h
index a02231f13..f96f16796 100644
--- a/Source/Plugins/NetworkEvents/NetworkEventsEditor.h
+++ b/Source/Plugins/NetworkEvents/NetworkEventsEditor.h
@@ -25,8 +25,7 @@
 #ifndef __NETWORKEVENTSEDITOR_H_D6EC8B49__
 #define __NETWORKEVENTSEDITOR_H_D6EC8B49__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
+#include <EditorHeaders.h>
 
 class NetworkEvents;
 
diff --git a/Source/Plugins/NetworkEvents/OpenEphysLib.cpp b/Source/Plugins/NetworkEvents/OpenEphysLib.cpp
index c84f91ed1..6935e3e8b 100644
--- a/Source/Plugins/NetworkEvents/OpenEphysLib.cpp
+++ b/Source/Plugins/NetworkEvents/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "NetworkEvents.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/PhaseDetector/OpenEphysLib.cpp b/Source/Plugins/PhaseDetector/OpenEphysLib.cpp
index 0612b6797..39c9abe8a 100644
--- a/Source/Plugins/PhaseDetector/OpenEphysLib.cpp
+++ b/Source/Plugins/PhaseDetector/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "PhaseDetector.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/PhaseDetector/PhaseDetector.h b/Source/Plugins/PhaseDetector/PhaseDetector.h
index 63f32a9d8..4ce9e8f78 100644
--- a/Source/Plugins/PhaseDetector/PhaseDetector.h
+++ b/Source/Plugins/PhaseDetector/PhaseDetector.h
@@ -25,8 +25,7 @@
 #define __PHASEDETECTOR_H_F411F29D__
 
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 
 #define NUM_INTERVALS 5
 
diff --git a/Source/Plugins/PhaseDetector/PhaseDetectorEditor.h b/Source/Plugins/PhaseDetector/PhaseDetectorEditor.h
index 2953967cf..0babc8aac 100644
--- a/Source/Plugins/PhaseDetector/PhaseDetectorEditor.h
+++ b/Source/Plugins/PhaseDetector/PhaseDetectorEditor.h
@@ -25,10 +25,7 @@
 #ifndef __PHASEDETECTOREDITOR_H_136829C6__
 #define __PHASEDETECTOREDITOR_H_136829C6__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-
-#include "../../Processors/Editors/GenericEditor.h"
-#include "../../Processors/Editors/ElectrodeButtons.h"
+#include <EditorHeaders.h>
 
 class DetectorInterface;
 class PhaseDetector;
diff --git a/Source/Plugins/PulsePalOutput/OpenEphysLib.cpp b/Source/Plugins/PulsePalOutput/OpenEphysLib.cpp
index 7070ae323..4cd12878f 100644
--- a/Source/Plugins/PulsePalOutput/OpenEphysLib.cpp
+++ b/Source/Plugins/PulsePalOutput/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "PulsePalOutput.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/PulsePalOutput/PulsePalOutput.h b/Source/Plugins/PulsePalOutput/PulsePalOutput.h
index f382d6e62..76c86fb8e 100644
--- a/Source/Plugins/PulsePalOutput/PulsePalOutput.h
+++ b/Source/Plugins/PulsePalOutput/PulsePalOutput.h
@@ -24,8 +24,7 @@
 #ifndef __PULSEPALOUTPUT_H_A8BF66D6__
 #define __PULSEPALOUTPUT_H_A8BF66D6__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 #include "PulsePalOutputEditor.h"
 #include "serial/PulsePal.h"
 
diff --git a/Source/Plugins/PulsePalOutput/PulsePalOutputEditor.h b/Source/Plugins/PulsePalOutput/PulsePalOutputEditor.h
index 9ed190990..95b7fe2c2 100644
--- a/Source/Plugins/PulsePalOutput/PulsePalOutputEditor.h
+++ b/Source/Plugins/PulsePalOutput/PulsePalOutputEditor.h
@@ -24,8 +24,7 @@
 #ifndef __PULSEPALOUTPUTEDITOR_H_BB5F0ECC__
 #define __PULSEPALOUTPUTEDITOR_H_BB5F0ECC__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
+#include <EditorHeaders.h>
 
 /**
 
diff --git a/Source/Plugins/PulsePalOutput/serial/PulsePal.h b/Source/Plugins/PulsePalOutput/serial/PulsePal.h
index bf7fadbf2..3ab2486bc 100644
--- a/Source/Plugins/PulsePalOutput/serial/PulsePal.h
+++ b/Source/Plugins/PulsePalOutput/serial/PulsePal.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <string.h>
 
-#include "../../../Processors/Serial/ofSerial.h"
+#include <SerialLib.h>
 
 /**
   Interface to PulsePal 
diff --git a/Source/Plugins/RecordControl/OpenEphysLib.cpp b/Source/Plugins/RecordControl/OpenEphysLib.cpp
index cf4a6c509..05e600749 100644
--- a/Source/Plugins/RecordControl/OpenEphysLib.cpp
+++ b/Source/Plugins/RecordControl/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "RecordControl.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/RecordControl/RecordControl.cpp b/Source/Plugins/RecordControl/RecordControl.cpp
index f32f9cb18..110b89e84 100644
--- a/Source/Plugins/RecordControl/RecordControl.cpp
+++ b/Source/Plugins/RecordControl/RecordControl.cpp
@@ -24,7 +24,6 @@
 
 #include <stdio.h>
 #include "RecordControl.h"
-#include "../../UI/ControlPanel.h"
 
 RecordControl::RecordControl()
     : GenericProcessor("Record Control"),
diff --git a/Source/Plugins/RecordControl/RecordControl.h b/Source/Plugins/RecordControl/RecordControl.h
index 772883294..9b6546a01 100644
--- a/Source/Plugins/RecordControl/RecordControl.h
+++ b/Source/Plugins/RecordControl/RecordControl.h
@@ -24,8 +24,7 @@
 #ifndef __RECORDCONTROL_H_120DD434__
 #define __RECORDCONTROL_H_120DD434__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 #include "RecordControlEditor.h"
 
 /**
diff --git a/Source/Plugins/RecordControl/RecordControlEditor.cpp b/Source/Plugins/RecordControl/RecordControlEditor.cpp
index cd2d29ab5..786cbcbee 100644
--- a/Source/Plugins/RecordControl/RecordControlEditor.cpp
+++ b/Source/Plugins/RecordControl/RecordControlEditor.cpp
@@ -23,7 +23,6 @@
 
 #include "RecordControlEditor.h"
 #include "RecordControl.h"
-#include "../../Processors/Editors/ChannelSelector.h"
 #include <stdio.h>
 
 RecordControlEditor::RecordControlEditor(GenericProcessor* parentNode, bool useDefaultParameterEditors=true)
diff --git a/Source/Plugins/RecordControl/RecordControlEditor.h b/Source/Plugins/RecordControl/RecordControlEditor.h
index 99b6a8d5d..0fc67bc6c 100644
--- a/Source/Plugins/RecordControl/RecordControlEditor.h
+++ b/Source/Plugins/RecordControl/RecordControlEditor.h
@@ -24,8 +24,7 @@
 #ifndef __RECORDCONTROLEDITOR_H_F9C69E2B__
 #define __RECORDCONTROLEDITOR_H_F9C69E2B__
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
+#include <EditorHeaders.h>
 
 /**
 
diff --git a/Source/Plugins/Rectifier/OpenEphysLib.cpp b/Source/Plugins/Rectifier/OpenEphysLib.cpp
index bd9d99103..4524168f7 100644
--- a/Source/Plugins/Rectifier/OpenEphysLib.cpp
+++ b/Source/Plugins/Rectifier/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "Rectifier.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/Rectifier/Rectifier.h b/Source/Plugins/Rectifier/Rectifier.h
index 79bf60ebe..e8a65f0d2 100644
--- a/Source/Plugins/Rectifier/Rectifier.h
+++ b/Source/Plugins/Rectifier/Rectifier.h
@@ -29,8 +29,7 @@
 #include <Windows.h>
 #endif
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 
 /**
  
diff --git a/Source/Plugins/SerialInput/OpenEphysLib.cpp b/Source/Plugins/SerialInput/OpenEphysLib.cpp
index 64b94c9e1..05389fb3d 100644
--- a/Source/Plugins/SerialInput/OpenEphysLib.cpp
+++ b/Source/Plugins/SerialInput/OpenEphysLib.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "../../Processors/PluginManager/OpenEphysPlugin.h"
+#include <PluginInfo.h>
 #include "SerialInput.h"
 #include <string>
 #ifdef WIN32
diff --git a/Source/Plugins/SerialInput/SerialInput.h b/Source/Plugins/SerialInput/SerialInput.h
index ce7ed1fc8..bf85702b5 100644
--- a/Source/Plugins/SerialInput/SerialInput.h
+++ b/Source/Plugins/SerialInput/SerialInput.h
@@ -28,11 +28,10 @@
 #include <Windows.h>
 #endif
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/GenericProcessor/GenericProcessor.h"
+#include <ProcessorHeaders.h>
 
 #include "SerialInputEditor.h"
-#include "../../Processors/Serial/ofSerial.h"
+#include <SerialLib.h>
 
 /**
 
diff --git a/Source/Plugins/SerialInput/SerialInputEditor.h b/Source/Plugins/SerialInput/SerialInputEditor.h
index 1adc12b61..ed6ed2067 100644
--- a/Source/Plugins/SerialInput/SerialInputEditor.h
+++ b/Source/Plugins/SerialInput/SerialInputEditor.h
@@ -28,8 +28,7 @@
 #include <Windows.h>
 #endif
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
-#include "../../Processors/Editors/GenericEditor.h"
+#include <EditorHeaders.h>
 
 class SerialInput;
 
-- 
GitLab