diff --git a/Builds/VisualStudio2013/Plugins/Plugin_Debug32.props b/Builds/VisualStudio2013/Plugins/Plugin_Debug32.props
index d58e2039158294f888df67c01e1dc70d4ed96a80..0a852e6edae6824581621ad1a84b1b97d3d12b2a 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 b62c2e1d4eb35511bd45a793b05ba40c1713d14a..977f6855a3d4267af729d160a7c94a6b8844070b 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 b5c109738ceb0cda95978edf2b4ee636b42c034a..a09b4bb23b517c6639f8ed037c1749f98e463cb1 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 8099134beea4cde48626c4ece471c3eb6a1e28d7..d425f4c26566bd5d3b5d20e78d12ccf491723c8b 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 92ff0d23f6fc3603c49398820550104cc78bab36..5dec3b2594dc46d09c7d8f5c998c7aab688b0879 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 ef9986aafcb13039283e0649f8c3758edcdff6cc..9529328633c9aeb87c61da0b87c84cb4b974dcab 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 fe9e6efe732ea3579bc087713fafc9621f964bd1..7a27ef614baac487bb99e2697340010bdde37473 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 c8ad20a6894d3eec73dd89e1f46bd647c5399560..32e0c397a2742777b9efdaa75087a53731054a1f 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 0f95d904d057c021662bb10afab4bc91d636fa9f..b05f8b9f8d2cce7bd776df4ae69f35d49e943ea4 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 2510fb6d0aa6e9b9ae275cfc147dfb9b2b1aed29..c3bdeb49431449b725154c9a9da8ef1e232ce977 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 5bf596c480b3392f8fc39919cb2feddc524d2b51..0065b055d9a59c31c36f417295377c6a973b69b5 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 d86ac8d382ab043ee3c8b516ae7b533f8248f4fe..b4bd2d4a32eb32bd6fe2316d9cb24caf50266105 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 ab47e3dc346cb7d351ec3b3e2823aa00c71b04e5..408aa999c0ad53913206ed885aa4a171df979dab 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 90c6bd01d09dd7d46dcb518a1c6b6758de9a4551..41dce7d4a4a1c9c0d66b9c731fe5cd6936afd993 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 6c9fdb00678332456eea26bda8e3c208beddbd45..cabe7b4a170b5c1f7f38930fc15d4ad6d1f4754d 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 4ef1b181e0e7a4e242605e7dfddcb1268538c03f..99d75f457bf506c4e55818f42b07be9a69e0542d 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 bc9ea0a2ee78228a9ebe56321f98b50e645f7416..9ea9f585e3cd235f0725712042111b99ed143499 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 ef44780a5cb09f979865cdcc3f3746a21d29cb6c..c32b683841d0e6a8b2cfd762e37bba04d1f82b52 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 6818bf35884b61eba83a78719a8e2bbf4ea5c459..be25bf7c68afd02b3f4d7ada4a06e521296ad890 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 b5c020e068f1107d40b77d3db9729a63dde1ff2c..a74240025d994a7ca3a0558887aea6d590cf57b7 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 dc6646d73c12f4916ae1b10c96a136a36d7b4616..549dd52afbff8cb112770a135786e0c072ac5351 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 181976c83714a8e76cd5dd3b91564cb68bf311ac..2b0695e9e92670271e9217128817201417d84307 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 ebe067023cbcbaa6ccec01815cdb0fd42f065e55..c81e67dce885d33fe2e185c911237ae8e0371f29 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 8bf4f7cbd09270dedece60d725486e56f679ab44..8b654620f463a179ad0efee1092b60ba602b81d3 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 eb5de208408f7dc693ec88e27b10abf0d661dee4..e446f3c253bea18c7e9c999c04f563c26d27dab2 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 a5cc300af0a41114462f21b46713ad8851585690..2ab56711c588adecabb9acb835709300871ca3d6 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 0c2b71e5382607ae6fc3b106590b0e740d02df87..4f47f2390410d9d87a2a27934da5f9e3284d0744 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 e6e74e0b73437646f3603e125115fe4e29f50ebe..563c217da5093f1ba7d776179878e1deaa811bbf 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 0000000000000000000000000000000000000000..e090c00c0a0d96a5a15ab94c22a2aaa26a310d1c
--- /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 0000000000000000000000000000000000000000..9ae1abe5bdcc25b7fe45e31c35371f721253a157
--- /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 0000000000000000000000000000000000000000..348f488ba993cd04b224a8ff19c7a5b8bffef244
--- /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 0000000000000000000000000000000000000000..d0a330a4f0aac45f32baeecf07c6e088064b6b4e
--- /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 0000000000000000000000000000000000000000..3bba9314e069c9d952baed244d5cd60d9b1472e1
--- /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 0000000000000000000000000000000000000000..567d1d37c5552afad62c41100993d2ab71f678df
--- /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 0000000000000000000000000000000000000000..2a42811c824ffc56f6c7830e5479c86eabdcfdf7
--- /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 0000000000000000000000000000000000000000..e3e44b9a5c5cf53e3f2f7eec75fbb75c3ae72d8e
--- /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 0000000000000000000000000000000000000000..ae5d9ca06f41d13fe6d46761f05e71885f5703e6
--- /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 0000000000000000000000000000000000000000..8fb61fd1afd5d8a8f41221424cc366b945168d78
--- /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 810559109601e175053851c4e7eb58eef80d357a..ba92857e831e7ccb2c86d0b6f1461311b1e665f1 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 d46a5c0966914bb06026bbfda3e0ff8144e36cb5..c8bad911625f035a4c4b7bab3457d3395b2d34db 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 d0707d5a6dc09f5b8fae717e4cbba5b63849d661..dc27f26ff37934a868f8f37b0ea677da827410ea 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 0e99bf01dc1058ee1001a2f3a05a262c373e6648..1c931b779bb804379494b15df37a987ee5fc85c8 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 41af1b9d6d150ab99853ec1c9c8c791a603ccf05..6c5f65667a1a2216021a22227b97ab32192b3d2f 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 16e7148064d75a229d290d6caf07b7103794ff16..e633853c6b5238e4f5ce1c7682018cc0216843f1 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 c644cccc6e10140e34290231d038ce1f14ab765e..d15aa896e714a3f65fa6e2ea0b5152cdf7482ddc 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 c6e5135bd450752d1b9a8aa90acaa0f26f98908d..cb1d9db3ade119a561cb0edd746906841654f32f 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 a02231f13409cee8302a18e4608568681cba7a89..f96f167961e50ed2e1b3d096ad7d6b9d4c078e26 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 c84f91ed1db08345ad2117ce0268f6cb03aceb1e..6935e3e8b7f4959585faabb17b620b99aae270cf 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 0612b67972a11ff14c1571c02673d0c71bf9b016..39c9abe8aad2f60066f580dfe7f9598fc1597956 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 63f32a9d8fa7ced30f22f3a338602487a502b96b..4ce9e8f78d3ee88b53ea11713aa02b8ef225cae9 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 2953967cf07cd328d8bef3f8a16891f575a1b686..0babc8aac3c69743dfeaeb12e320349fd08d0d4c 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 7070ae3232bc5ea880233d25379bd0487f989fc0..4cd12878f9da77a47870c902b8e177a787a5af36 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 f382d6e6270745ac853d6c9c56aee39c5800e556..76c86fb8edde0193054011df6807ab6de3c2eb92 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 9ed190990c280f8e2f46d7d716ac9fd91042748e..95b7fe2c2d8fca9c5a85444b5cbbcde0fa64e1b9 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 bf7fadbf2dddc8a0ace99b3a85222338fcb158f7..3ab2486bc7b73b28fb1cf70c4be5392d45f3de05 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 cf4a6c5090e43eea481c2d781a5a417c9ae142d4..05e6007495da3dab9667246f55143235ca23b3c0 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 f32f9cb18d251be8a8cd5e897fea3cb4c1724a65..110b89e84f8665475c7875fcc7f5c439569b65ef 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 77288329446478b6f3801011bc48ead1b41545d1..9b6546a018e9e40d098b5d45326d4690fcd556dc 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 cd2d29ab5578d4678a0b5fa5c6465e263fdaf92d..786cbcbee4cc05a5fc1e5d322da7af065f635986 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 99b6a8d5ddd9487eaeb08ccef343fd03680512e6..0fc67bc6c9a50b73351808870bece7b661c841b4 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 bd9d991032cda8778f5137230d45f52c45a58ec9..4524168f7588660256c5c9bd5338c461a5339865 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 79bf60ebe3652726ab387b176489cc4d3758f5a3..e8a65f0d21f64de661559c9fa3aa5c231962b0d8 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 64b94c9e139d796096c09a9bdc247264d3d6c0d3..05389fb3dd0a11bb452a2f1674f4971a81491a20 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 ce7ed1fc84347ab237d9a8a959f7d7de0541f05d..bf85702b5ae0f63f08f6d8d36d5035fe975ab8d7 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 1adc12b61d82188b341197dd8b76768e1af1cbd7..ed6ed2067f9c078951be02311efafe869bf4aa39 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;