diff --git a/source/backend/CarlaHostCommon.cpp b/source/backend/CarlaHostCommon.cpp
index a9f342425..c539500c4 100644
--- a/source/backend/CarlaHostCommon.cpp
+++ b/source/backend/CarlaHostCommon.cpp
@@ -18,7 +18,7 @@
 #include "CarlaHost.h"
 #include "CarlaString.hpp"
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 namespace CB = CarlaBackend;
 
diff --git a/source/backend/CarlaStandaloneNSM.cpp b/source/backend/CarlaStandaloneNSM.cpp
index 1dab804cc..cbfa68db1 100644
--- a/source/backend/CarlaStandaloneNSM.cpp
+++ b/source/backend/CarlaStandaloneNSM.cpp
@@ -29,7 +29,7 @@
 #include "CarlaOscUtils.hpp"
 #include "CarlaString.hpp"
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 namespace CB = CarlaBackend;
 
diff --git a/source/backend/CarlaUtils.cpp b/source/backend/CarlaUtils.cpp
index 6283d11e5..296d57fde 100644
--- a/source/backend/CarlaUtils.cpp
+++ b/source/backend/CarlaUtils.cpp
@@ -1,6 +1,6 @@
 /*
  * Carla Plugin Host
- * Copyright (C) 2011-2016 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2011-2017 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -25,7 +25,7 @@
 #include "CarlaThread.hpp"
 #include "LinkedList.hpp"
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 #if defined(HAVE_X11) && ! defined(CARLA_UTILS_CACHED_PLUGINS_ONLY)
 # include <X11/Xlib.h>
diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index c598dd193..b74bd4f3b 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -35,10 +35,10 @@
 
 #include "jackbridge/JackBridge.hpp"
 
-#include "water/files/juce_File.h"
-#include "water/streams/juce_MemoryOutputStream.h"
-#include "water/xml/juce_XmlDocument.h"
-#include "water/xml/juce_XmlElement.h"
+#include "water/files/File.h"
+#include "water/streams/MemoryOutputStream.h"
+#include "water/xml/XmlDocument.h"
+#include "water/xml/XmlElement.h"
 
 using water::Array;
 using water::CharPointer_UTF8;
diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp
index c574006fa..b6219d05c 100644
--- a/source/backend/engine/CarlaEngineBridge.cpp
+++ b/source/backend/engine/CarlaEngineBridge.cpp
@@ -31,8 +31,8 @@
 # include <xmmintrin.h>
 #endif
 
-#include "water/files/juce_File.h"
-#include "water/time/juce_Time.h"
+#include "water/files/File.h"
+#include "water/misc/Time.h"
 
 // must be last
 #include "jackbridge/JackBridge.hpp"
diff --git a/source/backend/engine/CarlaEngineGraph.hpp b/source/backend/engine/CarlaEngineGraph.hpp
index 4c0cc5787..0bd56eb1c 100644
--- a/source/backend/engine/CarlaEngineGraph.hpp
+++ b/source/backend/engine/CarlaEngineGraph.hpp
@@ -24,9 +24,8 @@
 #include "CarlaStringList.hpp"
 #include "CarlaThread.hpp"
 
-#include "water/midi/juce_MidiBuffer.h"
-#include "water/processors/juce_AudioProcessorGraph.h"
-#include "water/text/juce_StringArray.h"
+#include "water/processors/AudioProcessorGraph.h"
+#include "water/text/StringArray.h"
 
 using water::AudioProcessorGraph;
 using water::AudioSampleBuffer;
diff --git a/source/backend/engine/CarlaEngineNative.cpp b/source/backend/engine/CarlaEngineNative.cpp
index ff359d214..5b62d288f 100644
--- a/source/backend/engine/CarlaEngineNative.cpp
+++ b/source/backend/engine/CarlaEngineNative.cpp
@@ -34,10 +34,10 @@
 #include "CarlaHost.h"
 #include "CarlaNative.hpp"
 
-#include "water/files/juce_File.h"
-#include "water/streams/juce_MemoryOutputStream.h"
-#include "water/xml/juce_XmlDocument.h"
-#include "water/xml/juce_XmlElement.h"
+#include "water/files/File.h"
+#include "water/streams/MemoryOutputStream.h"
+#include "water/xml/XmlDocument.h"
+#include "water/xml/XmlElement.h"
 
 using water::File;
 using water::MemoryOutputStream;
diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp
index 6dafe39e7..31a13c3d4 100644
--- a/source/backend/plugin/CarlaPlugin.cpp
+++ b/source/backend/plugin/CarlaPlugin.cpp
@@ -25,10 +25,10 @@
 
 #include <ctime>
 
-#include "water/files/juce_File.h"
-#include "water/streams/juce_MemoryOutputStream.h"
-#include "water/xml/juce_XmlDocument.h"
-#include "water/xml/juce_XmlElement.h"
+#include "water/files/File.h"
+#include "water/streams/MemoryOutputStream.h"
+#include "water/xml/XmlDocument.h"
+#include "water/xml/XmlElement.h"
 
 using water::CharPointer_UTF8;
 using water::File;
diff --git a/source/backend/plugin/CarlaPluginBridge.cpp b/source/backend/plugin/CarlaPluginBridge.cpp
index 19b82d094..d5b2f221f 100644
--- a/source/backend/plugin/CarlaPluginBridge.cpp
+++ b/source/backend/plugin/CarlaPluginBridge.cpp
@@ -30,9 +30,9 @@
 
 #include <ctime>
 
-#include "water/files/juce_File.h"
-#include "water/threads/juce_ChildProcess.h"
-#include "water/time/juce_Time.h"
+#include "water/files/File.h"
+#include "water/misc/Time.h"
+#include "water/threads/ChildProcess.h"
 
 // ---------------------------------------------------------------------------------------------------------------------
 
diff --git a/source/backend/plugin/CarlaPluginDSSI.cpp b/source/backend/plugin/CarlaPluginDSSI.cpp
index 38f0fe359..1b9e567bc 100644
--- a/source/backend/plugin/CarlaPluginDSSI.cpp
+++ b/source/backend/plugin/CarlaPluginDSSI.cpp
@@ -27,7 +27,7 @@
 # include "CarlaThread.hpp"
 #endif
 
-#include "water/threads/juce_ChildProcess.h"
+#include "water/threads/ChildProcess.h"
 
 using water::ChildProcess;
 using water::String;
diff --git a/source/backend/plugin/CarlaPluginFluidSynth.cpp b/source/backend/plugin/CarlaPluginFluidSynth.cpp
index c6d51e630..2c98e3c45 100644
--- a/source/backend/plugin/CarlaPluginFluidSynth.cpp
+++ b/source/backend/plugin/CarlaPluginFluidSynth.cpp
@@ -22,7 +22,7 @@
 
 #include "CarlaMathUtils.hpp"
 
-#include "water/text/juce_StringArray.h"
+#include "water/text/StringArray.h"
 
 #include <fluidsynth.h>
 
diff --git a/source/backend/plugin/CarlaPluginJack.cpp b/source/backend/plugin/CarlaPluginJack.cpp
index 6eaa7bc89..1c677bd75 100644
--- a/source/backend/plugin/CarlaPluginJack.cpp
+++ b/source/backend/plugin/CarlaPluginJack.cpp
@@ -28,9 +28,9 @@
 #include "CarlaShmUtils.hpp"
 #include "CarlaThread.hpp"
 
-#include "water/text/juce_StringArray.h"
-#include "water/threads/juce_ChildProcess.h"
-#include "water/time/juce_Time.h"
+#include "water/misc/Time.h"
+#include "water/text/StringArray.h"
+#include "water/threads/ChildProcess.h"
 
 #include "jackbridge/JackBridge.hpp"
 
diff --git a/source/backend/plugin/CarlaPluginLV2.cpp b/source/backend/plugin/CarlaPluginLV2.cpp
index f31c688ab..7dff6523e 100644
--- a/source/backend/plugin/CarlaPluginLV2.cpp
+++ b/source/backend/plugin/CarlaPluginLV2.cpp
@@ -37,7 +37,7 @@ extern "C" {
 #include "rtmempool/rtmempool-lv2.h"
 }
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 #include <string>
 #include <vector>
diff --git a/source/backend/plugin/CarlaPluginLinuxSampler.cpp b/source/backend/plugin/CarlaPluginLinuxSampler.cpp
index d5942786b..344be7e40 100644
--- a/source/backend/plugin/CarlaPluginLinuxSampler.cpp
+++ b/source/backend/plugin/CarlaPluginLinuxSampler.cpp
@@ -31,8 +31,8 @@
 #include "CarlaBackendUtils.hpp"
 #include "CarlaMathUtils.hpp"
 
-#include "water/files/juce_File.h"
-#include "water/text/juce_StringArray.h"
+#include "water/files/File.h"
+#include "water/text/StringArray.h"
 
 // -----------------------------------------------------------------------
 
diff --git a/source/backend/plugin/CarlaPluginNative.cpp b/source/backend/plugin/CarlaPluginNative.cpp
index c70d264ca..6fa045123 100644
--- a/source/backend/plugin/CarlaPluginNative.cpp
+++ b/source/backend/plugin/CarlaPluginNative.cpp
@@ -21,7 +21,7 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaNative.h"
 
-#include "water/text/juce_StringArray.h"
+#include "water/text/StringArray.h"
 
 using water::jmax;
 using water::String;
diff --git a/source/bridges-plugin/CarlaBridgeLV2.cpp b/source/bridges-plugin/CarlaBridgeLV2.cpp
index aa6f956d6..b44f1a371 100644
--- a/source/bridges-plugin/CarlaBridgeLV2.cpp
+++ b/source/bridges-plugin/CarlaBridgeLV2.cpp
@@ -27,7 +27,7 @@
 #include "CarlaLv2Utils.hpp"
 #include "CarlaUtils.h"
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 // ---------------------------------------------------------------------------------------------------------------------
 // -Weffc++ compat ext widget
diff --git a/source/bridges-plugin/CarlaBridgePlugin.cpp b/source/bridges-plugin/CarlaBridgePlugin.cpp
index 6f4d18f19..b9b9fa490 100644
--- a/source/bridges-plugin/CarlaBridgePlugin.cpp
+++ b/source/bridges-plugin/CarlaBridgePlugin.cpp
@@ -40,7 +40,7 @@
 
 #include "jackbridge/JackBridge.hpp"
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 using CarlaBackend::CarlaEngine;
 using CarlaBackend::EngineCallbackOpcode;
diff --git a/source/bridges-ui/CarlaBridgeUI-LV2.cpp b/source/bridges-ui/CarlaBridgeUI-LV2.cpp
index b6e15943f..fe55fc913 100644
--- a/source/bridges-ui/CarlaBridgeUI-LV2.cpp
+++ b/source/bridges-ui/CarlaBridgeUI-LV2.cpp
@@ -21,7 +21,7 @@
 #include "CarlaMIDI.h"
 #include "LinkedList.hpp"
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 #include <string>
 #include <vector>
diff --git a/source/modules/water/buffers/juce_AudioSampleBuffer.h b/source/modules/water/buffers/AudioSampleBuffer.h
similarity index 97%
rename from source/modules/water/buffers/juce_AudioSampleBuffer.h
rename to source/modules/water/buffers/AudioSampleBuffer.h
index 1fc58a9b0..1ad17b85e 100644
--- a/source/modules/water/buffers/juce_AudioSampleBuffer.h
+++ b/source/modules/water/buffers/AudioSampleBuffer.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_AUDIOSAMPLEBUFFER_H_INCLUDED
 #define JUCE_AUDIOSAMPLEBUFFER_H_INCLUDED
 
-#include "../memory/juce_HeapBlock.h"
+#include "../memory/HeapBlock.h"
 
 #include "CarlaMathUtils.hpp"
 
diff --git a/source/modules/water/containers/juce_Array.h b/source/modules/water/containers/Array.h
similarity index 97%
rename from source/modules/water/containers/juce_Array.h
rename to source/modules/water/containers/Array.h
index e3667ac07..b5635edbb 100644
--- a/source/modules/water/containers/juce_Array.h
+++ b/source/modules/water/containers/Array.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_ARRAY_H_INCLUDED
 #define JUCE_ARRAY_H_INCLUDED
 
-#include "../containers/juce_ArrayAllocationBase.h"
-#include "../containers/juce_ElementComparator.h"
+#include "../containers/ArrayAllocationBase.h"
+#include "../containers/ElementComparator.h"
 
 namespace water {
 
diff --git a/source/modules/water/containers/juce_ArrayAllocationBase.h b/source/modules/water/containers/ArrayAllocationBase.h
similarity index 96%
rename from source/modules/water/containers/juce_ArrayAllocationBase.h
rename to source/modules/water/containers/ArrayAllocationBase.h
index 6ebf1945b..3682cf706 100644
--- a/source/modules/water/containers/juce_ArrayAllocationBase.h
+++ b/source/modules/water/containers/ArrayAllocationBase.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
 #define JUCE_ARRAYALLOCATIONBASE_H_INCLUDED
 
-#include "../memory/juce_HeapBlock.h"
+#include "../memory/HeapBlock.h"
 
 namespace water {
 
diff --git a/source/modules/water/containers/juce_ElementComparator.h b/source/modules/water/containers/ElementComparator.h
similarity index 100%
rename from source/modules/water/containers/juce_ElementComparator.h
rename to source/modules/water/containers/ElementComparator.h
diff --git a/source/modules/water/containers/juce_LinkedListPointer.h b/source/modules/water/containers/LinkedListPointer.h
similarity index 100%
rename from source/modules/water/containers/juce_LinkedListPointer.h
rename to source/modules/water/containers/LinkedListPointer.h
diff --git a/source/modules/water/containers/juce_NamedValueSet.cpp b/source/modules/water/containers/NamedValueSet.cpp
similarity index 95%
rename from source/modules/water/containers/juce_NamedValueSet.cpp
rename to source/modules/water/containers/NamedValueSet.cpp
index adfa2bbd6..13189592c 100644
--- a/source/modules/water/containers/juce_NamedValueSet.cpp
+++ b/source/modules/water/containers/NamedValueSet.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_NamedValueSet.h"
+#include "NamedValueSet.h"
 
 namespace water {
 
diff --git a/source/modules/water/containers/juce_NamedValueSet.h b/source/modules/water/containers/NamedValueSet.h
similarity index 96%
rename from source/modules/water/containers/juce_NamedValueSet.h
rename to source/modules/water/containers/NamedValueSet.h
index 40c0e8e16..9513189a7 100644
--- a/source/modules/water/containers/juce_NamedValueSet.h
+++ b/source/modules/water/containers/NamedValueSet.h
@@ -31,9 +31,9 @@
 #ifndef JUCE_NAMEDVALUESET_H_INCLUDED
 #define JUCE_NAMEDVALUESET_H_INCLUDED
 
-#include "juce_Array.h"
-#include "juce_Variant.h"
-#include "../text/juce_Identifier.h"
+#include "Array.h"
+#include "Variant.h"
+#include "../text/Identifier.h"
 
 namespace water {
 
diff --git a/source/modules/water/containers/juce_OwnedArray.h b/source/modules/water/containers/OwnedArray.h
similarity index 97%
rename from source/modules/water/containers/juce_OwnedArray.h
rename to source/modules/water/containers/OwnedArray.h
index ab0cb330a..0feee33ec 100644
--- a/source/modules/water/containers/juce_OwnedArray.h
+++ b/source/modules/water/containers/OwnedArray.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_OWNEDARRAY_H_INCLUDED
 #define JUCE_OWNEDARRAY_H_INCLUDED
 
-#include "juce_ArrayAllocationBase.h"
+#include "ArrayAllocationBase.h"
 
 #include "CarlaJuceUtils.hpp"
 
diff --git a/source/modules/water/containers/juce_ReferenceCountedArray.h b/source/modules/water/containers/ReferenceCountedArray.h
similarity index 97%
rename from source/modules/water/containers/juce_ReferenceCountedArray.h
rename to source/modules/water/containers/ReferenceCountedArray.h
index aa03cf4b4..400c520c5 100644
--- a/source/modules/water/containers/juce_ReferenceCountedArray.h
+++ b/source/modules/water/containers/ReferenceCountedArray.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
 #define JUCE_REFERENCECOUNTEDARRAY_H_INCLUDED
 
-#include "../memory/juce_ReferenceCountedObject.h"
+#include "../memory/ReferenceCountedObject.h"
 
 namespace water {
 
diff --git a/source/modules/water/containers/juce_SortedSet.h b/source/modules/water/containers/SortedSet.h
similarity index 100%
rename from source/modules/water/containers/juce_SortedSet.h
rename to source/modules/water/containers/SortedSet.h
diff --git a/source/modules/water/containers/juce_Variant.cpp b/source/modules/water/containers/Variant.cpp
similarity index 97%
rename from source/modules/water/containers/juce_Variant.cpp
rename to source/modules/water/containers/Variant.cpp
index 3a31ed140..f31bb4b7f 100644
--- a/source/modules/water/containers/juce_Variant.cpp
+++ b/source/modules/water/containers/Variant.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_Variant.h"
+#include "Variant.h"
 
 namespace water {
 
diff --git a/source/modules/water/containers/juce_Variant.h b/source/modules/water/containers/Variant.h
similarity index 100%
rename from source/modules/water/containers/juce_Variant.h
rename to source/modules/water/containers/Variant.h
diff --git a/source/modules/water/files/juce_DirectoryIterator.cpp b/source/modules/water/files/DirectoryIterator.cpp
similarity index 95%
rename from source/modules/water/files/juce_DirectoryIterator.cpp
rename to source/modules/water/files/DirectoryIterator.cpp
index e76f5874f..49a6b64d6 100644
--- a/source/modules/water/files/juce_DirectoryIterator.cpp
+++ b/source/modules/water/files/DirectoryIterator.cpp
@@ -28,8 +28,8 @@
   ==============================================================================
 */
 
-#include "juce_DirectoryIterator.h"
-#include "../text/juce_StringArray.h"
+#include "DirectoryIterator.h"
+#include "../text/StringArray.h"
 
 namespace water {
 
diff --git a/source/modules/water/files/juce_DirectoryIterator.h b/source/modules/water/files/DirectoryIterator.h
similarity index 96%
rename from source/modules/water/files/juce_DirectoryIterator.h
rename to source/modules/water/files/DirectoryIterator.h
index 846c9f927..a34a7186f 100644
--- a/source/modules/water/files/juce_DirectoryIterator.h
+++ b/source/modules/water/files/DirectoryIterator.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_DIRECTORYITERATOR_H_INCLUDED
 #define JUCE_DIRECTORYITERATOR_H_INCLUDED
 
-#include "juce_File.h"
-#include "../text/juce_StringArray.h"
+#include "File.h"
+#include "../text/StringArray.h"
 
 #include "CarlaJuceUtils.hpp"
 
diff --git a/source/modules/water/files/juce_File.cpp b/source/modules/water/files/File.cpp
similarity index 96%
rename from source/modules/water/files/juce_File.cpp
rename to source/modules/water/files/File.cpp
index f51d370a3..ddeaa1308 100644
--- a/source/modules/water/files/juce_File.cpp
+++ b/source/modules/water/files/File.cpp
@@ -28,14 +28,14 @@
   ==============================================================================
 */
 
-#include "juce_File.h"
-#include "juce_DirectoryIterator.h"
-#include "juce_FileInputStream.h"
-#include "juce_FileOutputStream.h"
-#include "juce_TemporaryFile.h"
-#include "../maths/juce_Random.h"
-#include "../text/juce_StringArray.h"
-#include "../time/juce_Time.h"
+#include "File.h"
+#include "DirectoryIterator.h"
+#include "FileInputStream.h"
+#include "FileOutputStream.h"
+#include "TemporaryFile.h"
+#include "../maths/Random.h"
+#include "../misc/Time.h"
+#include "../text/StringArray.h"
 
 #include "CarlaJuceUtils.hpp"
 
diff --git a/source/modules/water/files/juce_File.h b/source/modules/water/files/File.h
similarity index 97%
rename from source/modules/water/files/juce_File.h
rename to source/modules/water/files/File.h
index 247c2caa4..380832dd7 100644
--- a/source/modules/water/files/juce_File.h
+++ b/source/modules/water/files/File.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_FILE_H_INCLUDED
 #define JUCE_FILE_H_INCLUDED
 
-#include "../containers/juce_Array.h"
-#include "../misc/juce_Result.h"
+#include "../containers/Array.h"
+#include "../misc/Result.h"
 
 namespace water {
 
diff --git a/source/modules/water/files/juce_FileInputStream.cpp b/source/modules/water/files/FileInputStream.cpp
similarity index 95%
rename from source/modules/water/files/juce_FileInputStream.cpp
rename to source/modules/water/files/FileInputStream.cpp
index 7bd151a94..3808b9547 100644
--- a/source/modules/water/files/juce_FileInputStream.cpp
+++ b/source/modules/water/files/FileInputStream.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_FileInputStream.h"
+#include "FileInputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/files/juce_FileInputStream.h b/source/modules/water/files/FileInputStream.h
similarity index 95%
rename from source/modules/water/files/juce_FileInputStream.h
rename to source/modules/water/files/FileInputStream.h
index d9569db7a..6492e8fb0 100644
--- a/source/modules/water/files/juce_FileInputStream.h
+++ b/source/modules/water/files/FileInputStream.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_FILEINPUTSTREAM_H_INCLUDED
 #define JUCE_FILEINPUTSTREAM_H_INCLUDED
 
-#include "juce_File.h"
-#include "../streams/juce_InputStream.h"
+#include "File.h"
+#include "../streams/InputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/files/juce_FileOutputStream.cpp b/source/modules/water/files/FileOutputStream.cpp
similarity index 95%
rename from source/modules/water/files/juce_FileOutputStream.cpp
rename to source/modules/water/files/FileOutputStream.cpp
index eff82edd5..f7e1dfc36 100644
--- a/source/modules/water/files/juce_FileOutputStream.cpp
+++ b/source/modules/water/files/FileOutputStream.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_FileOutputStream.h"
+#include "FileOutputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/files/juce_FileOutputStream.h b/source/modules/water/files/FileOutputStream.h
similarity index 95%
rename from source/modules/water/files/juce_FileOutputStream.h
rename to source/modules/water/files/FileOutputStream.h
index 1963a92fa..dca0b3b3d 100644
--- a/source/modules/water/files/juce_FileOutputStream.h
+++ b/source/modules/water/files/FileOutputStream.h
@@ -31,9 +31,9 @@
 #ifndef JUCE_FILEOUTPUTSTREAM_H_INCLUDED
 #define JUCE_FILEOUTPUTSTREAM_H_INCLUDED
 
-#include "../files/juce_File.h"
-#include "../memory/juce_HeapBlock.h"
-#include "../streams/juce_OutputStream.h"
+#include "../files/File.h"
+#include "../memory/HeapBlock.h"
+#include "../streams/OutputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/files/juce_TemporaryFile.cpp b/source/modules/water/files/TemporaryFile.cpp
similarity index 95%
rename from source/modules/water/files/juce_TemporaryFile.cpp
rename to source/modules/water/files/TemporaryFile.cpp
index 8a6963567..b914d8370 100644
--- a/source/modules/water/files/juce_TemporaryFile.cpp
+++ b/source/modules/water/files/TemporaryFile.cpp
@@ -28,8 +28,8 @@
   ==============================================================================
 */
 
-#include "juce_TemporaryFile.h"
-#include "../maths/juce_Random.h"
+#include "TemporaryFile.h"
+#include "../maths/Random.h"
 
 namespace water {
 
diff --git a/source/modules/water/files/juce_TemporaryFile.h b/source/modules/water/files/TemporaryFile.h
similarity index 97%
rename from source/modules/water/files/juce_TemporaryFile.h
rename to source/modules/water/files/TemporaryFile.h
index 9374066f5..3836bb5de 100644
--- a/source/modules/water/files/juce_TemporaryFile.h
+++ b/source/modules/water/files/TemporaryFile.h
@@ -31,7 +31,8 @@
 #ifndef JUCE_TEMPORARYFILE_H_INCLUDED
 #define JUCE_TEMPORARYFILE_H_INCLUDED
 
-#include "juce_File.h"
+#include "TemporaryFile.h"
+#include "File.h"
 
 namespace water {
 
diff --git a/source/modules/water/maths/juce_MathsFunctions.h b/source/modules/water/maths/MathsFunctions.h
similarity index 100%
rename from source/modules/water/maths/juce_MathsFunctions.h
rename to source/modules/water/maths/MathsFunctions.h
diff --git a/source/modules/water/maths/juce_Random.cpp b/source/modules/water/maths/Random.cpp
similarity index 94%
rename from source/modules/water/maths/juce_Random.cpp
rename to source/modules/water/maths/Random.cpp
index 44c1c0dcd..6d947c21c 100644
--- a/source/modules/water/maths/juce_Random.cpp
+++ b/source/modules/water/maths/Random.cpp
@@ -28,8 +28,8 @@
   ==============================================================================
 */
 
-#include "juce_Random.h"
-#include "../time/juce_Time.h"
+#include "Random.h"
+#include "../misc/Time.h"
 
 namespace water {
 
diff --git a/source/modules/water/maths/juce_Random.h b/source/modules/water/maths/Random.h
similarity index 100%
rename from source/modules/water/maths/juce_Random.h
rename to source/modules/water/maths/Random.h
diff --git a/source/modules/water/memory/juce_Atomic.h b/source/modules/water/memory/Atomic.h
similarity index 100%
rename from source/modules/water/memory/juce_Atomic.h
rename to source/modules/water/memory/Atomic.h
diff --git a/source/modules/water/memory/juce_ByteOrder.h b/source/modules/water/memory/ByteOrder.h
similarity index 100%
rename from source/modules/water/memory/juce_ByteOrder.h
rename to source/modules/water/memory/ByteOrder.h
diff --git a/source/modules/water/memory/juce_HeapBlock.h b/source/modules/water/memory/HeapBlock.h
similarity index 97%
rename from source/modules/water/memory/juce_HeapBlock.h
rename to source/modules/water/memory/HeapBlock.h
index 3238b1648..40cd11bfe 100644
--- a/source/modules/water/memory/juce_HeapBlock.h
+++ b/source/modules/water/memory/HeapBlock.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_HEAPBLOCK_H_INCLUDED
 #define JUCE_HEAPBLOCK_H_INCLUDED
 
-#include "juce_Memory.h"
-#include "../maths/juce_MathsFunctions.h"
+#include "Memory.h"
+#include "../maths/MathsFunctions.h"
 
 namespace water {
 
diff --git a/source/modules/water/memory/juce_Memory.h b/source/modules/water/memory/Memory.h
similarity index 100%
rename from source/modules/water/memory/juce_Memory.h
rename to source/modules/water/memory/Memory.h
diff --git a/source/modules/water/memory/juce_MemoryBlock.cpp b/source/modules/water/memory/MemoryBlock.cpp
similarity index 96%
rename from source/modules/water/memory/juce_MemoryBlock.cpp
rename to source/modules/water/memory/MemoryBlock.cpp
index 0f349047c..215aee4a0 100644
--- a/source/modules/water/memory/juce_MemoryBlock.cpp
+++ b/source/modules/water/memory/MemoryBlock.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_MemoryBlock.h"
+#include "MemoryBlock.h"
 
 namespace water {
 
diff --git a/source/modules/water/memory/juce_MemoryBlock.h b/source/modules/water/memory/MemoryBlock.h
similarity index 97%
rename from source/modules/water/memory/juce_MemoryBlock.h
rename to source/modules/water/memory/MemoryBlock.h
index 54e9a0f23..cac720bce 100644
--- a/source/modules/water/memory/juce_MemoryBlock.h
+++ b/source/modules/water/memory/MemoryBlock.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_MEMORYBLOCK_H_INCLUDED
 #define JUCE_MEMORYBLOCK_H_INCLUDED
 
-#include "juce_HeapBlock.h"
+#include "HeapBlock.h"
 
 namespace water {
 
diff --git a/source/modules/water/memory/juce_ReferenceCountedObject.h b/source/modules/water/memory/ReferenceCountedObject.h
similarity index 97%
rename from source/modules/water/memory/juce_ReferenceCountedObject.h
rename to source/modules/water/memory/ReferenceCountedObject.h
index 0cb630f62..cde940916 100644
--- a/source/modules/water/memory/juce_ReferenceCountedObject.h
+++ b/source/modules/water/memory/ReferenceCountedObject.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_REFERENCECOUNTEDOBJECT_H_INCLUDED
 #define JUCE_REFERENCECOUNTEDOBJECT_H_INCLUDED
 
-#include "juce_Atomic.h"
+#include "Atomic.h"
 
 namespace water {
 
diff --git a/source/modules/water/memory/juce_SharedResourcePointer.h b/source/modules/water/memory/SharedResourcePointer.h
similarity index 100%
rename from source/modules/water/memory/juce_SharedResourcePointer.h
rename to source/modules/water/memory/SharedResourcePointer.h
diff --git a/source/modules/water/midi/juce_MidiBuffer.cpp b/source/modules/water/midi/MidiBuffer.cpp
similarity index 96%
rename from source/modules/water/midi/juce_MidiBuffer.cpp
rename to source/modules/water/midi/MidiBuffer.cpp
index 72519c764..993821cc7 100644
--- a/source/modules/water/midi/juce_MidiBuffer.cpp
+++ b/source/modules/water/midi/MidiBuffer.cpp
@@ -28,8 +28,8 @@
   ==============================================================================
 */
 
-#include "juce_MidiBuffer.h"
-#include "juce_MidiMessage.h"
+#include "MidiBuffer.h"
+#include "MidiMessage.h"
 
 namespace water {
 
diff --git a/source/modules/water/midi/juce_MidiBuffer.h b/source/modules/water/midi/MidiBuffer.h
similarity index 97%
rename from source/modules/water/midi/juce_MidiBuffer.h
rename to source/modules/water/midi/MidiBuffer.h
index ef4a1ae9c..328a8a85c 100644
--- a/source/modules/water/midi/juce_MidiBuffer.h
+++ b/source/modules/water/midi/MidiBuffer.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_MIDIBUFFER_H_INCLUDED
 #define JUCE_MIDIBUFFER_H_INCLUDED
 
-#include "../containers/juce_Array.h"
+#include "../containers/Array.h"
 
 namespace water {
 
diff --git a/source/modules/water/midi/juce_MidiFile.cpp b/source/modules/water/midi/MidiFile.cpp
similarity index 95%
rename from source/modules/water/midi/juce_MidiFile.cpp
rename to source/modules/water/midi/MidiFile.cpp
index 738428e0f..d05f96785 100644
--- a/source/modules/water/midi/juce_MidiFile.cpp
+++ b/source/modules/water/midi/MidiFile.cpp
@@ -28,10 +28,10 @@
   ==============================================================================
 */
 
-#include "juce_MidiFile.h"
-#include "../memory/juce_ByteOrder.h"
-#include "../streams/juce_InputStream.h"
-#include "../streams/juce_MemoryOutputStream.h"
+#include "MidiFile.h"
+#include "../memory/ByteOrder.h"
+#include "../streams/InputStream.h"
+#include "../streams/MemoryOutputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/midi/juce_MidiFile.h b/source/modules/water/midi/MidiFile.h
similarity index 97%
rename from source/modules/water/midi/juce_MidiFile.h
rename to source/modules/water/midi/MidiFile.h
index 4f5047692..a3836f5a9 100644
--- a/source/modules/water/midi/juce_MidiFile.h
+++ b/source/modules/water/midi/MidiFile.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_MIDIFILE_H_INCLUDED
 #define JUCE_MIDIFILE_H_INCLUDED
 
-#include "juce_MidiMessageSequence.h"
+#include "MidiMessageSequence.h"
 
 namespace water {
 
diff --git a/source/modules/water/midi/juce_MidiMessage.cpp b/source/modules/water/midi/MidiMessage.cpp
similarity index 97%
rename from source/modules/water/midi/juce_MidiMessage.cpp
rename to source/modules/water/midi/MidiMessage.cpp
index 27b4f8a97..dd4f6f3e0 100644
--- a/source/modules/water/midi/juce_MidiMessage.cpp
+++ b/source/modules/water/midi/MidiMessage.cpp
@@ -28,9 +28,9 @@
   ==============================================================================
 */
 
-#include "juce_MidiMessage.h"
-#include "../maths/juce_MathsFunctions.h"
-#include "../memory/juce_HeapBlock.h"
+#include "MidiMessage.h"
+#include "../maths/MathsFunctions.h"
+#include "../memory/HeapBlock.h"
 
 namespace water {
 
diff --git a/source/modules/water/midi/juce_MidiMessage.h b/source/modules/water/midi/MidiMessage.h
similarity index 100%
rename from source/modules/water/midi/juce_MidiMessage.h
rename to source/modules/water/midi/MidiMessage.h
diff --git a/source/modules/water/midi/juce_MidiMessageSequence.cpp b/source/modules/water/midi/MidiMessageSequence.cpp
similarity index 96%
rename from source/modules/water/midi/juce_MidiMessageSequence.cpp
rename to source/modules/water/midi/MidiMessageSequence.cpp
index b03bb30f6..f539c09bf 100644
--- a/source/modules/water/midi/juce_MidiMessageSequence.cpp
+++ b/source/modules/water/midi/MidiMessageSequence.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_MidiMessageSequence.h"
+#include "MidiMessageSequence.h"
 
 namespace water {
 
diff --git a/source/modules/water/midi/juce_MidiMessageSequence.h b/source/modules/water/midi/MidiMessageSequence.h
similarity index 96%
rename from source/modules/water/midi/juce_MidiMessageSequence.h
rename to source/modules/water/midi/MidiMessageSequence.h
index 904dd423b..6bcdb248a 100644
--- a/source/modules/water/midi/juce_MidiMessageSequence.h
+++ b/source/modules/water/midi/MidiMessageSequence.h
@@ -31,10 +31,10 @@
 #ifndef JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
 #define JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
 
-#include "juce_MidiMessage.h"
-#include "../containers/juce_Array.h"
-#include "../containers/juce_OwnedArray.h"
-#include "../text/juce_String.h"
+#include "MidiMessage.h"
+#include "../containers/Array.h"
+#include "../containers/OwnedArray.h"
+#include "../text/String.h"
 
 namespace water {
 
diff --git a/source/modules/water/misc/juce_Result.cpp b/source/modules/water/misc/Result.cpp
similarity index 95%
rename from source/modules/water/misc/juce_Result.cpp
rename to source/modules/water/misc/Result.cpp
index 0b27096df..e4422b930 100644
--- a/source/modules/water/misc/juce_Result.cpp
+++ b/source/modules/water/misc/Result.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_Result.h"
+#include "Result.h"
 
 namespace water {
 
diff --git a/source/modules/water/misc/juce_Result.h b/source/modules/water/misc/Result.h
similarity index 96%
rename from source/modules/water/misc/juce_Result.h
rename to source/modules/water/misc/Result.h
index 19a9be5ed..0b08bae6c 100644
--- a/source/modules/water/misc/juce_Result.h
+++ b/source/modules/water/misc/Result.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_RESULT_H_INCLUDED
 #define JUCE_RESULT_H_INCLUDED
 
-#include "../text/juce_String.h"
+#include "../text/String.h"
 
 namespace water {
 
diff --git a/source/modules/water/time/juce_Time.cpp b/source/modules/water/misc/Time.cpp
similarity index 95%
rename from source/modules/water/time/juce_Time.cpp
rename to source/modules/water/misc/Time.cpp
index c6ff38dcc..15a09bed8 100644
--- a/source/modules/water/time/juce_Time.cpp
+++ b/source/modules/water/misc/Time.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_Time.h"
+#include "Time.h"
 
 namespace water {
 
diff --git a/source/modules/water/time/juce_Time.h b/source/modules/water/misc/Time.h
similarity index 100%
rename from source/modules/water/time/juce_Time.h
rename to source/modules/water/misc/Time.h
diff --git a/source/modules/water/processors/juce_AudioPlayHead.h b/source/modules/water/processors/AudioPlayHead.h
similarity index 100%
rename from source/modules/water/processors/juce_AudioPlayHead.h
rename to source/modules/water/processors/AudioPlayHead.h
diff --git a/source/modules/water/processors/juce_AudioProcessor.cpp b/source/modules/water/processors/AudioProcessor.cpp
similarity index 96%
rename from source/modules/water/processors/juce_AudioProcessor.cpp
rename to source/modules/water/processors/AudioProcessor.cpp
index 15c536fce..4b82fb939 100644
--- a/source/modules/water/processors/juce_AudioProcessor.cpp
+++ b/source/modules/water/processors/AudioProcessor.cpp
@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#include "juce_AudioProcessor.h"
+#include "AudioProcessor.h"
 
 namespace water {
 
diff --git a/source/modules/water/processors/juce_AudioProcessor.h b/source/modules/water/processors/AudioProcessor.h
similarity index 97%
rename from source/modules/water/processors/juce_AudioProcessor.h
rename to source/modules/water/processors/AudioProcessor.h
index 3e13b087c..c2cd122d0 100644
--- a/source/modules/water/processors/juce_AudioProcessor.h
+++ b/source/modules/water/processors/AudioProcessor.h
@@ -25,8 +25,8 @@
 #ifndef JUCE_AUDIOPROCESSOR_H_INCLUDED
 #define JUCE_AUDIOPROCESSOR_H_INCLUDED
 
-#include "../text/juce_String.h"
-#include "../buffers/juce_AudioSampleBuffer.h"
+#include "../text/String.h"
+#include "../buffers/AudioSampleBuffer.h"
 
 namespace water {
 
diff --git a/source/modules/water/processors/juce_AudioProcessorGraph.cpp b/source/modules/water/processors/AudioProcessorGraph.cpp
similarity index 96%
rename from source/modules/water/processors/juce_AudioProcessorGraph.cpp
rename to source/modules/water/processors/AudioProcessorGraph.cpp
index 5634611b3..9dfd46088 100644
--- a/source/modules/water/processors/juce_AudioProcessorGraph.cpp
+++ b/source/modules/water/processors/AudioProcessorGraph.cpp
@@ -22,8 +22,8 @@
   ==============================================================================
 */
 
-#include "juce_AudioProcessorGraph.h"
-#include "../containers/juce_SortedSet.h"
+#include "AudioProcessorGraph.h"
+#include "../containers/SortedSet.h"
 
 namespace water {
 
diff --git a/source/modules/water/processors/juce_AudioProcessorGraph.h b/source/modules/water/processors/AudioProcessorGraph.h
similarity index 96%
rename from source/modules/water/processors/juce_AudioProcessorGraph.h
rename to source/modules/water/processors/AudioProcessorGraph.h
index 259d4ec46..a75703814 100644
--- a/source/modules/water/processors/juce_AudioProcessorGraph.h
+++ b/source/modules/water/processors/AudioProcessorGraph.h
@@ -25,11 +25,11 @@
 #ifndef JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED
 #define JUCE_AUDIOPROCESSORGRAPH_H_INCLUDED
 
-#include "juce_AudioProcessor.h"
-#include "../containers/juce_NamedValueSet.h"
-#include "../containers/juce_OwnedArray.h"
-#include "../containers/juce_ReferenceCountedArray.h"
-#include "../midi/juce_MidiBuffer.h"
+#include "AudioProcessor.h"
+#include "../containers/NamedValueSet.h"
+#include "../containers/OwnedArray.h"
+#include "../containers/ReferenceCountedArray.h"
+#include "../midi/MidiBuffer.h"
 
 namespace water {
 
diff --git a/source/modules/water/streams/juce_FileInputSource.cpp b/source/modules/water/streams/FileInputSource.cpp
similarity index 93%
rename from source/modules/water/streams/juce_FileInputSource.cpp
rename to source/modules/water/streams/FileInputSource.cpp
index 97a1502ef..eb28b1d59 100644
--- a/source/modules/water/streams/juce_FileInputSource.cpp
+++ b/source/modules/water/streams/FileInputSource.cpp
@@ -28,8 +28,8 @@
   ==============================================================================
 */
 
-#include "juce_FileInputSource.h"
-#include "../files/juce_FileInputStream.h"
+#include "FileInputSource.h"
+#include "../files/FileInputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/streams/juce_FileInputSource.h b/source/modules/water/streams/FileInputSource.h
similarity index 95%
rename from source/modules/water/streams/juce_FileInputSource.h
rename to source/modules/water/streams/FileInputSource.h
index 4d6abf07b..ba660cae4 100644
--- a/source/modules/water/streams/juce_FileInputSource.h
+++ b/source/modules/water/streams/FileInputSource.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_FILEINPUTSOURCE_H_INCLUDED
 #define JUCE_FILEINPUTSOURCE_H_INCLUDED
 
-#include "juce_InputSource.h"
-#include "../files/juce_File.h"
+#include "InputSource.h"
+#include "../files/File.h"
 
 namespace water {
 
diff --git a/source/modules/water/streams/juce_InputSource.h b/source/modules/water/streams/InputSource.h
similarity index 100%
rename from source/modules/water/streams/juce_InputSource.h
rename to source/modules/water/streams/InputSource.h
diff --git a/source/modules/water/streams/juce_InputStream.cpp b/source/modules/water/streams/InputStream.cpp
similarity index 93%
rename from source/modules/water/streams/juce_InputStream.cpp
rename to source/modules/water/streams/InputStream.cpp
index 5c171e47c..3e41bcc83 100644
--- a/source/modules/water/streams/juce_InputStream.cpp
+++ b/source/modules/water/streams/InputStream.cpp
@@ -28,10 +28,10 @@
   ==============================================================================
 */
 
-#include "juce_InputSource.h"
-#include "juce_InputStream.h"
-#include "../memory/juce_ByteOrder.h"
-#include "../streams/juce_MemoryOutputStream.h"
+#include "InputSource.h"
+#include "InputStream.h"
+#include "../memory/ByteOrder.h"
+#include "../streams/MemoryOutputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/streams/juce_InputStream.h b/source/modules/water/streams/InputStream.h
similarity index 100%
rename from source/modules/water/streams/juce_InputStream.h
rename to source/modules/water/streams/InputStream.h
diff --git a/source/modules/water/streams/juce_MemoryOutputStream.cpp b/source/modules/water/streams/MemoryOutputStream.cpp
similarity index 95%
rename from source/modules/water/streams/juce_MemoryOutputStream.cpp
rename to source/modules/water/streams/MemoryOutputStream.cpp
index e62c5d64e..96f7f3c29 100644
--- a/source/modules/water/streams/juce_MemoryOutputStream.cpp
+++ b/source/modules/water/streams/MemoryOutputStream.cpp
@@ -28,8 +28,8 @@
   ==============================================================================
 */
 
-#include "juce_MemoryOutputStream.h"
-#include "juce_InputStream.h"
+#include "MemoryOutputStream.h"
+#include "InputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/streams/juce_MemoryOutputStream.h b/source/modules/water/streams/MemoryOutputStream.h
similarity index 96%
rename from source/modules/water/streams/juce_MemoryOutputStream.h
rename to source/modules/water/streams/MemoryOutputStream.h
index 36d1cfb16..a7cec22fe 100644
--- a/source/modules/water/streams/juce_MemoryOutputStream.h
+++ b/source/modules/water/streams/MemoryOutputStream.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_MEMORYOUTPUTSTREAM_H_INCLUDED
 #define JUCE_MEMORYOUTPUTSTREAM_H_INCLUDED
 
-#include "juce_OutputStream.h"
-#include "../memory/juce_MemoryBlock.h"
+#include "OutputStream.h"
+#include "../memory/MemoryBlock.h"
 
 namespace water {
 
diff --git a/source/modules/water/streams/juce_OutputStream.cpp b/source/modules/water/streams/OutputStream.cpp
similarity index 94%
rename from source/modules/water/streams/juce_OutputStream.cpp
rename to source/modules/water/streams/OutputStream.cpp
index 8973564b9..a90e31044 100644
--- a/source/modules/water/streams/juce_OutputStream.cpp
+++ b/source/modules/water/streams/OutputStream.cpp
@@ -28,11 +28,11 @@
   ==============================================================================
 */
 
-#include "juce_OutputStream.h"
-#include "../files/juce_FileInputStream.h"
-#include "../memory/juce_ByteOrder.h"
-#include "../memory/juce_MemoryBlock.h"
-#include "../text/juce_NewLine.h"
+#include "OutputStream.h"
+#include "../files/FileInputStream.h"
+#include "../memory/ByteOrder.h"
+#include "../memory/MemoryBlock.h"
+#include "../text/NewLine.h"
 
 namespace water {
 
diff --git a/source/modules/water/streams/juce_OutputStream.h b/source/modules/water/streams/OutputStream.h
similarity index 100%
rename from source/modules/water/streams/juce_OutputStream.h
rename to source/modules/water/streams/OutputStream.h
diff --git a/source/modules/water/text/juce_CharPointer_UTF8.h b/source/modules/water/text/CharPointer_UTF8.h
similarity index 96%
rename from source/modules/water/text/juce_CharPointer_UTF8.h
rename to source/modules/water/text/CharPointer_UTF8.h
index 26a4c299b..6747a0693 100644
--- a/source/modules/water/text/juce_CharPointer_UTF8.h
+++ b/source/modules/water/text/CharPointer_UTF8.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_CHARPOINTER_UTF8_H_INCLUDED
 #define JUCE_CHARPOINTER_UTF8_H_INCLUDED
 
-#include "juce_CharacterFunctions.h"
-#include "../memory/juce_Atomic.h"
+#include "CharacterFunctions.h"
+#include "../memory/Atomic.h"
 
 namespace water {
 
diff --git a/source/modules/water/text/juce_CharacterFunctions.cpp b/source/modules/water/text/CharacterFunctions.cpp
similarity index 96%
rename from source/modules/water/text/juce_CharacterFunctions.cpp
rename to source/modules/water/text/CharacterFunctions.cpp
index 570533846..05cd03788 100644
--- a/source/modules/water/text/juce_CharacterFunctions.cpp
+++ b/source/modules/water/text/CharacterFunctions.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_CharacterFunctions.h"
+#include "CharacterFunctions.h"
 
 namespace water {
 
diff --git a/source/modules/water/text/juce_CharacterFunctions.h b/source/modules/water/text/CharacterFunctions.h
similarity index 96%
rename from source/modules/water/text/juce_CharacterFunctions.h
rename to source/modules/water/text/CharacterFunctions.h
index 2e94dde15..59626274e 100644
--- a/source/modules/water/text/juce_CharacterFunctions.h
+++ b/source/modules/water/text/CharacterFunctions.h
@@ -33,7 +33,7 @@
 
 #include <algorithm>
 
-#include "../memory/juce_Memory.h"
+#include "../memory/Memory.h"
 
 /** This macro will be set to 1 if the compiler's native wchar_t is an 8-bit type. */
 #define JUCE_NATIVE_WCHAR_IS_UTF8 1
diff --git a/source/modules/water/text/juce_Identifier.cpp b/source/modules/water/text/Identifier.cpp
similarity index 95%
rename from source/modules/water/text/juce_Identifier.cpp
rename to source/modules/water/text/Identifier.cpp
index ed11422a5..7513787fb 100644
--- a/source/modules/water/text/juce_Identifier.cpp
+++ b/source/modules/water/text/Identifier.cpp
@@ -28,8 +28,8 @@
   ==============================================================================
 */
 
-#include "juce_Identifier.h"
-#include "juce_StringPool.h"
+#include "Identifier.h"
+#include "StringPool.h"
 
 namespace water {
 
diff --git a/source/modules/water/text/juce_Identifier.h b/source/modules/water/text/Identifier.h
similarity index 97%
rename from source/modules/water/text/juce_Identifier.h
rename to source/modules/water/text/Identifier.h
index 08f1340a0..96c7409a9 100644
--- a/source/modules/water/text/juce_Identifier.h
+++ b/source/modules/water/text/Identifier.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_IDENTIFIER_H_INCLUDED
 #define JUCE_IDENTIFIER_H_INCLUDED
 
-#include "juce_String.h"
+#include "String.h"
 
 namespace water {
 
diff --git a/source/modules/water/text/juce_NewLine.h b/source/modules/water/text/NewLine.h
similarity index 100%
rename from source/modules/water/text/juce_NewLine.h
rename to source/modules/water/text/NewLine.h
diff --git a/source/modules/water/text/juce_String.cpp b/source/modules/water/text/String.cpp
similarity index 96%
rename from source/modules/water/text/juce_String.cpp
rename to source/modules/water/text/String.cpp
index adb29fdb4..b10653425 100644
--- a/source/modules/water/text/juce_String.cpp
+++ b/source/modules/water/text/String.cpp
@@ -28,11 +28,11 @@
   ==============================================================================
 */
 
-#include "juce_String.h"
-#include "juce_NewLine.h"
-#include "../maths/juce_MathsFunctions.h"
-#include "../memory/juce_HeapBlock.h"
-#include "../streams/juce_OutputStream.h"
+#include "String.h"
+#include "NewLine.h"
+#include "../maths/MathsFunctions.h"
+#include "../memory/HeapBlock.h"
+#include "../streams/OutputStream.h"
 
 #include "CarlaJuceUtils.hpp"
 
diff --git a/source/modules/water/text/juce_String.h b/source/modules/water/text/String.h
similarity index 97%
rename from source/modules/water/text/juce_String.h
rename to source/modules/water/text/String.h
index c4f8da0d3..44a74b9e7 100644
--- a/source/modules/water/text/juce_String.h
+++ b/source/modules/water/text/String.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_STRING_H_INCLUDED
 #define JUCE_STRING_H_INCLUDED
 
-#include "juce_CharPointer_UTF8.h"
-#include "../memory/juce_Memory.h"
+#include "CharPointer_UTF8.h"
+#include "../memory/Memory.h"
 
 namespace water {
 
@@ -1190,6 +1190,6 @@ OutputStream& operator<< (OutputStream& stream, StringRef stringToWrite);
 
 }
 
-#include "juce_StringRef.h"
+#include "StringRef.h"
 
 #endif   // JUCE_STRING_H_INCLUDED
diff --git a/source/modules/water/text/juce_StringArray.cpp b/source/modules/water/text/StringArray.cpp
similarity index 96%
rename from source/modules/water/text/juce_StringArray.cpp
rename to source/modules/water/text/StringArray.cpp
index 47b87978e..448146831 100644
--- a/source/modules/water/text/juce_StringArray.cpp
+++ b/source/modules/water/text/StringArray.cpp
@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_StringArray.h"
+#include "StringArray.h"
 
 namespace water {
 
diff --git a/source/modules/water/text/juce_StringArray.h b/source/modules/water/text/StringArray.h
similarity index 97%
rename from source/modules/water/text/juce_StringArray.h
rename to source/modules/water/text/StringArray.h
index 9852d0853..fe84618c6 100644
--- a/source/modules/water/text/juce_StringArray.h
+++ b/source/modules/water/text/StringArray.h
@@ -31,8 +31,8 @@
 #ifndef JUCE_STRINGARRAY_H_INCLUDED
 #define JUCE_STRINGARRAY_H_INCLUDED
 
-#include "juce_String.h"
-#include "../containers/juce_Array.h"
+#include "String.h"
+#include "../containers/Array.h"
 
 namespace water {
 
diff --git a/source/modules/water/text/juce_StringPool.cpp b/source/modules/water/text/StringPool.cpp
similarity index 95%
rename from source/modules/water/text/juce_StringPool.cpp
rename to source/modules/water/text/StringPool.cpp
index 7e15834cb..45157054d 100644
--- a/source/modules/water/text/juce_StringPool.cpp
+++ b/source/modules/water/text/StringPool.cpp
@@ -28,8 +28,8 @@
   ==============================================================================
 */
 
-#include "juce_StringPool.h"
-#include "../time/juce_Time.h"
+#include "StringPool.h"
+#include "../misc/Time.h"
 
 namespace water {
 
diff --git a/source/modules/water/text/juce_StringPool.h b/source/modules/water/text/StringPool.h
similarity index 96%
rename from source/modules/water/text/juce_StringPool.h
rename to source/modules/water/text/StringPool.h
index 2bd28112d..3b67b0301 100644
--- a/source/modules/water/text/juce_StringPool.h
+++ b/source/modules/water/text/StringPool.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_STRINGPOOL_H_INCLUDED
 #define JUCE_STRINGPOOL_H_INCLUDED
 
-#include "../containers/juce_Array.h"
+#include "../containers/Array.h"
 
 namespace water {
 
diff --git a/source/modules/water/text/juce_StringRef.h b/source/modules/water/text/StringRef.h
similarity index 97%
rename from source/modules/water/text/juce_StringRef.h
rename to source/modules/water/text/StringRef.h
index c70a70c3d..e0b8803b2 100644
--- a/source/modules/water/text/juce_StringRef.h
+++ b/source/modules/water/text/StringRef.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_STRINGREF_H_INCLUDED
 #define JUCE_STRINGREF_H_INCLUDED
 
-#include "juce_String.h"
+#include "String.h"
 
 namespace water {
 
diff --git a/source/modules/water/threads/juce_ChildProcess.cpp b/source/modules/water/threads/ChildProcess.cpp
similarity index 95%
rename from source/modules/water/threads/juce_ChildProcess.cpp
rename to source/modules/water/threads/ChildProcess.cpp
index 919464457..aa6b14535 100644
--- a/source/modules/water/threads/juce_ChildProcess.cpp
+++ b/source/modules/water/threads/ChildProcess.cpp
@@ -28,10 +28,10 @@
   ==============================================================================
 */
 
-#include "juce_ChildProcess.h"
-#include "../files/juce_File.h"
-#include "../streams/juce_MemoryOutputStream.h"
-#include "../time/juce_Time.h"
+#include "ChildProcess.h"
+#include "../files/File.h"
+#include "../misc/Time.h"
+#include "../streams/MemoryOutputStream.h"
 
 #define JUCE_USE_VFORK 1
 
diff --git a/source/modules/water/threads/juce_ChildProcess.h b/source/modules/water/threads/ChildProcess.h
similarity index 96%
rename from source/modules/water/threads/juce_ChildProcess.h
rename to source/modules/water/threads/ChildProcess.h
index 108090c71..a93879b68 100644
--- a/source/modules/water/threads/juce_ChildProcess.h
+++ b/source/modules/water/threads/ChildProcess.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_CHILDPROCESS_H_INCLUDED
 #define JUCE_CHILDPROCESS_H_INCLUDED
 
-#include "../text/juce_StringArray.h"
+#include "../text/StringArray.h"
 
 #include "CarlaJuceUtils.hpp"
 
diff --git a/source/modules/water/threads/juce_Process.h b/source/modules/water/threads/Process.h
similarity index 100%
rename from source/modules/water/threads/juce_Process.h
rename to source/modules/water/threads/Process.h
diff --git a/source/modules/water/threads/juce_ScopedLock.h b/source/modules/water/threads/ScopedLock.h
similarity index 100%
rename from source/modules/water/threads/juce_ScopedLock.h
rename to source/modules/water/threads/ScopedLock.h
diff --git a/source/modules/water/threads/juce_SpinLock.h b/source/modules/water/threads/SpinLock.h
similarity index 100%
rename from source/modules/water/threads/juce_SpinLock.h
rename to source/modules/water/threads/SpinLock.h
diff --git a/source/modules/water/water.cpp b/source/modules/water/water.cpp
index 5bf189f51..343b8a2eb 100644
--- a/source/modules/water/water.cpp
+++ b/source/modules/water/water.cpp
@@ -46,7 +46,7 @@
 
 // #include <wctype.h>
 
-#include "misc/juce_Result.h"
+#include "misc/Result.h"
 
 //==============================================================================
 namespace water
@@ -102,43 +102,42 @@ static int64 juce_fileSetPosition (void* handle, int64 pos)
 
 }
 
-#include "containers/juce_NamedValueSet.cpp"
-#include "containers/juce_Variant.cpp"
+#include "containers/NamedValueSet.cpp"
+#include "containers/Variant.cpp"
 
-#include "files/juce_DirectoryIterator.cpp"
-#include "files/juce_File.cpp"
-#include "files/juce_FileInputStream.cpp"
-#include "files/juce_FileOutputStream.cpp"
-#include "files/juce_TemporaryFile.cpp"
+#include "files/DirectoryIterator.cpp"
+#include "files/File.cpp"
+#include "files/FileInputStream.cpp"
+#include "files/FileOutputStream.cpp"
+#include "files/TemporaryFile.cpp"
 
-#include "maths/juce_Random.cpp"
+#include "maths/Random.cpp"
 
-#include "memory/juce_MemoryBlock.cpp"
+#include "memory/MemoryBlock.cpp"
 
-#include "midi/juce_MidiBuffer.cpp"
-#include "midi/juce_MidiFile.cpp"
-#include "midi/juce_MidiMessage.cpp"
-#include "midi/juce_MidiMessageSequence.cpp"
+#include "midi/MidiBuffer.cpp"
+#include "midi/MidiFile.cpp"
+#include "midi/MidiMessage.cpp"
+#include "midi/MidiMessageSequence.cpp"
 
-#include "misc/juce_Result.cpp"
+#include "misc/Result.cpp"
+#include "misc/Time.cpp"
 
-#include "processors/juce_AudioProcessor.cpp"
-#include "processors/juce_AudioProcessorGraph.cpp"
+#include "processors/AudioProcessor.cpp"
+#include "processors/AudioProcessorGraph.cpp"
 
-#include "streams/juce_FileInputSource.cpp"
-#include "streams/juce_InputStream.cpp"
-#include "streams/juce_MemoryOutputStream.cpp"
-#include "streams/juce_OutputStream.cpp"
+#include "streams/FileInputSource.cpp"
+#include "streams/InputStream.cpp"
+#include "streams/MemoryOutputStream.cpp"
+#include "streams/OutputStream.cpp"
 
-#include "text/juce_CharacterFunctions.cpp"
-#include "text/juce_Identifier.cpp"
-#include "text/juce_StringArray.cpp"
-#include "text/juce_StringPool.cpp"
-#include "text/juce_String.cpp"
+#include "text/CharacterFunctions.cpp"
+#include "text/Identifier.cpp"
+#include "text/StringArray.cpp"
+#include "text/StringPool.cpp"
+#include "text/String.cpp"
 
-#include "threads/juce_ChildProcess.cpp"
+#include "threads/ChildProcess.cpp"
 
-#include "time/juce_Time.cpp"
-
-#include "xml/juce_XmlDocument.cpp"
-#include "xml/juce_XmlElement.cpp"
+#include "xml/XmlDocument.cpp"
+#include "xml/XmlElement.cpp"
diff --git a/source/modules/water/water.h b/source/modules/water/water.h
index 31c7df8b4..1d8ece94e 100644
--- a/source/modules/water/water.h
+++ b/source/modules/water/water.h
@@ -21,13 +21,6 @@
 
 #include "CarlaDefines.h"
 
-// #include "CarlaMathUtils.hpp"
-// #include "CarlaJuceUtils.hpp"
-// #include "CarlaMutex.hpp"
-
-// #include <algorithm>
-// #include <string>
-
 //==============================================================================
 
 #define jassertfalse        carla_safe_assert("jassertfalse triggered", __FILE__, __LINE__);
diff --git a/source/modules/water/xml/juce_XmlDocument.cpp b/source/modules/water/xml/XmlDocument.cpp
similarity index 95%
rename from source/modules/water/xml/juce_XmlDocument.cpp
rename to source/modules/water/xml/XmlDocument.cpp
index d5f61885c..b2b765d6c 100644
--- a/source/modules/water/xml/juce_XmlDocument.cpp
+++ b/source/modules/water/xml/XmlDocument.cpp
@@ -28,12 +28,12 @@
   ==============================================================================
 */
 
-#include "juce_XmlDocument.h"
-#include "juce_XmlElement.h"
-#include "../containers/juce_LinkedListPointer.h"
-#include "../streams/juce_FileInputSource.h"
-#include "../streams/juce_InputStream.h"
-#include "../streams/juce_MemoryOutputStream.h"
+#include "XmlDocument.h"
+#include "XmlElement.h"
+#include "../containers/LinkedListPointer.h"
+#include "../streams/FileInputSource.h"
+#include "../streams/InputStream.h"
+#include "../streams/MemoryOutputStream.h"
 
 namespace water {
 
diff --git a/source/modules/water/xml/juce_XmlDocument.h b/source/modules/water/xml/XmlDocument.h
similarity index 96%
rename from source/modules/water/xml/juce_XmlDocument.h
rename to source/modules/water/xml/XmlDocument.h
index 13161d6dc..4421929e5 100644
--- a/source/modules/water/xml/juce_XmlDocument.h
+++ b/source/modules/water/xml/XmlDocument.h
@@ -31,7 +31,7 @@
 #ifndef JUCE_XMLDOCUMENT_H_INCLUDED
 #define JUCE_XMLDOCUMENT_H_INCLUDED
 
-#include "../text/juce_StringArray.h"
+#include "../text/StringArray.h"
 
 #include "CarlaJuceUtils.hpp"
 
diff --git a/source/modules/water/xml/juce_XmlElement.cpp b/source/modules/water/xml/XmlElement.cpp
similarity index 96%
rename from source/modules/water/xml/juce_XmlElement.cpp
rename to source/modules/water/xml/XmlElement.cpp
index 00e8fc363..bd22c9dd5 100644
--- a/source/modules/water/xml/juce_XmlElement.cpp
+++ b/source/modules/water/xml/XmlElement.cpp
@@ -28,11 +28,11 @@
   ==============================================================================
 */
 
-#include "juce_XmlElement.h"
-#include "../streams/juce_MemoryOutputStream.h"
-#include "../streams/juce_OutputStream.h"
-#include "../text/juce_NewLine.h"
-#include "../text/juce_StringPool.h"
+#include "XmlElement.h"
+#include "../streams/MemoryOutputStream.h"
+#include "../streams/OutputStream.h"
+#include "../text/NewLine.h"
+#include "../text/StringPool.h"
 
 namespace water {
 
diff --git a/source/modules/water/xml/juce_XmlElement.h b/source/modules/water/xml/XmlElement.h
similarity index 97%
rename from source/modules/water/xml/juce_XmlElement.h
rename to source/modules/water/xml/XmlElement.h
index 626cff04b..b7a3a52f0 100644
--- a/source/modules/water/xml/juce_XmlElement.h
+++ b/source/modules/water/xml/XmlElement.h
@@ -31,9 +31,9 @@
 #ifndef JUCE_XMLELEMENT_H_INCLUDED
 #define JUCE_XMLELEMENT_H_INCLUDED
 
-#include "../containers/juce_LinkedListPointer.h"
-#include "../memory/juce_HeapBlock.h"
-#include "../text/juce_Identifier.h"
+#include "../containers/LinkedListPointer.h"
+#include "../memory/HeapBlock.h"
+#include "../text/Identifier.h"
 
 namespace water {
 
diff --git a/source/native-plugins/bigmeter.cpp b/source/native-plugins/bigmeter.cpp
index 182d8c6c9..a2bcd64f6 100644
--- a/source/native-plugins/bigmeter.cpp
+++ b/source/native-plugins/bigmeter.cpp
@@ -20,7 +20,7 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaNativeExtUI.hpp"
 
-#include "water/maths/juce_MathsFunctions.h"
+#include "water/maths/MathsFunctions.h"
 
 using water::roundToIntAccurate;
 
diff --git a/source/native-plugins/midi-file.cpp b/source/native-plugins/midi-file.cpp
index 3a313087d..deb778c0e 100644
--- a/source/native-plugins/midi-file.cpp
+++ b/source/native-plugins/midi-file.cpp
@@ -18,8 +18,8 @@
 #include "CarlaNative.hpp"
 #include "midi-base.hpp"
 
-#include "water/files/juce_FileInputStream.h"
-#include "water/midi/juce_MidiFile.h"
+#include "water/files/FileInputStream.h"
+#include "water/midi/MidiFile.h"
 
 // -----------------------------------------------------------------------
 
diff --git a/source/native-plugins/zita-at1.cpp b/source/native-plugins/zita-at1.cpp
index 7e49000b3..281125453 100644
--- a/source/native-plugins/zita-at1.cpp
+++ b/source/native-plugins/zita-at1.cpp
@@ -21,7 +21,7 @@
 #include "zita-at1/jclient.cc"
 #include "zita-at1/retuner.cc"
 
-#include "water/maths/juce_MathsFunctions.h"
+#include "water/maths/MathsFunctions.h"
 
 using water::roundToIntAccurate;
 
diff --git a/source/native-plugins/zynaddsubfx-fx.cpp b/source/native-plugins/zynaddsubfx-fx.cpp
index 1d5bb5433..e3824cedc 100644
--- a/source/native-plugins/zynaddsubfx-fx.cpp
+++ b/source/native-plugins/zynaddsubfx-fx.cpp
@@ -45,7 +45,7 @@
 # pragma GCC diagnostic pop
 #endif
 
-#include "water/maths/juce_MathsFunctions.h"
+#include "water/maths/MathsFunctions.h"
 
 using water::roundToIntAccurate;
 
diff --git a/source/native-plugins/zynaddsubfx-synth.cpp b/source/native-plugins/zynaddsubfx-synth.cpp
index abb8a8e81..aff65cdd8 100644
--- a/source/native-plugins/zynaddsubfx-synth.cpp
+++ b/source/native-plugins/zynaddsubfx-synth.cpp
@@ -49,7 +49,7 @@
 # pragma GCC diagnostic pop
 #endif
 
-#include "water/maths/juce_MathsFunctions.h"
+#include "water/maths/MathsFunctions.h"
 
 using water::roundToIntAccurate;
 
diff --git a/source/plugin/carla-lv2-export.cpp b/source/plugin/carla-lv2-export.cpp
index 7c51bf9cd..f7870ebd5 100644
--- a/source/plugin/carla-lv2-export.cpp
+++ b/source/plugin/carla-lv2-export.cpp
@@ -32,8 +32,8 @@
 #include "lv2/lv2_external_ui.h"
 #include "lv2/lv2_programs.h"
 
-#include "water/files/juce_File.h"
-#include "water/text/juce_StringArray.h"
+#include "water/files/File.h"
+#include "water/text/StringArray.h"
 
 #include <fstream>
 
diff --git a/source/plugin/carla-vst.cpp b/source/plugin/carla-vst.cpp
index b1ff3d896..be5d03e53 100644
--- a/source/plugin/carla-vst.cpp
+++ b/source/plugin/carla-vst.cpp
@@ -26,7 +26,7 @@
 #define CARLA_NATIVE_PLUGIN_VST
 #include "carla-base.cpp"
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 #include "CarlaMathUtils.hpp"
 
diff --git a/source/utils/CarlaDssiUtils.cpp b/source/utils/CarlaDssiUtils.cpp
index bb827cb95..606603e42 100644
--- a/source/utils/CarlaDssiUtils.cpp
+++ b/source/utils/CarlaDssiUtils.cpp
@@ -17,7 +17,7 @@
 
 #include "CarlaDssiUtils.hpp"
 
-#include "water/files/juce_File.h"
+#include "water/files/File.h"
 
 // --------------------------------------------------------------------------------------------------------------------
 
diff --git a/source/utils/CarlaEngineUtils.hpp b/source/utils/CarlaEngineUtils.hpp
index c524dc749..fec60ffa0 100644
--- a/source/utils/CarlaEngineUtils.hpp
+++ b/source/utils/CarlaEngineUtils.hpp
@@ -22,7 +22,7 @@
 #include "CarlaUtils.hpp"
 #include "CarlaMIDI.h"
 
-#include "water/midi/juce_MidiBuffer.h"
+#include "water/midi/MidiBuffer.h"
 
 CARLA_BACKEND_START_NAMESPACE
 
diff --git a/source/utils/CarlaLv2Utils.hpp b/source/utils/CarlaLv2Utils.hpp
index a00b6597f..07142b2dd 100644
--- a/source/utils/CarlaLv2Utils.hpp
+++ b/source/utils/CarlaLv2Utils.hpp
@@ -82,7 +82,7 @@
 #ifdef USE_QT
 # include <QtCore/QStringList>
 #else
-# include "water/text/juce_StringArray.h"
+# include "water/text/StringArray.h"
 #endif
 
 // used for scalepoint sorting
diff --git a/source/utils/CarlaStateUtils.cpp b/source/utils/CarlaStateUtils.cpp
index e549a0df5..d08e4fa8a 100644
--- a/source/utils/CarlaStateUtils.cpp
+++ b/source/utils/CarlaStateUtils.cpp
@@ -21,8 +21,8 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaMIDI.h"
 
-#include "water/streams/juce_MemoryOutputStream.h"
-#include "water/xml/juce_XmlElement.h"
+#include "water/streams/MemoryOutputStream.h"
+#include "water/xml/XmlElement.h"
 
 #include <string>
 
diff --git a/source/utils/CarlaStateUtils.hpp b/source/utils/CarlaStateUtils.hpp
index 17f5a86c1..47189e0b1 100644
--- a/source/utils/CarlaStateUtils.hpp
+++ b/source/utils/CarlaStateUtils.hpp
@@ -21,7 +21,7 @@
 #include "CarlaBackend.h"
 #include "LinkedList.hpp"
 
-#include "water/text/juce_String.h"
+#include "water/text/String.h"
 
 CARLA_BACKEND_START_NAMESPACE