Rename water code files to get rid of juce prefix

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;
 

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;
 

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>

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;

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"

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;

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;

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;

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"
 
 // ---------------------------------------------------------------------------------------------------------------------
 

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;

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>
 

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"
 

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>

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"
 
 // -----------------------------------------------------------------------
 

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;

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

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;

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>

source/modules/water/buffers/juce_AudioSampleBuffer.h → 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"
 

source/modules/water/containers/juce_Array.h → 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 {
 

source/modules/water/containers/juce_ArrayAllocationBase.h → 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 {
 

source/modules/water/containers/juce_NamedValueSet.cpp → source/modules/water/containers/NamedValueSet.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_NamedValueSet.h"
+#include "NamedValueSet.h"
 
 namespace water {
 

source/modules/water/containers/juce_NamedValueSet.h → 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 {
 

source/modules/water/containers/juce_OwnedArray.h → 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"
 

source/modules/water/containers/juce_ReferenceCountedArray.h → 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 {
 

source/modules/water/containers/juce_Variant.cpp → source/modules/water/containers/Variant.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_Variant.h"
+#include "Variant.h"
 
 namespace water {
 

source/modules/water/files/juce_DirectoryIterator.cpp → 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 {
 

source/modules/water/files/juce_DirectoryIterator.h → 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"
 

source/modules/water/files/juce_File.cpp → 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"
 

source/modules/water/files/juce_File.h → 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 {
 

source/modules/water/files/juce_FileInputStream.cpp → source/modules/water/files/FileInputStream.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_FileInputStream.h"
+#include "FileInputStream.h"
 
 namespace water {
 

source/modules/water/files/juce_FileInputStream.h → 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 {
 

source/modules/water/files/juce_FileOutputStream.cpp → source/modules/water/files/FileOutputStream.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_FileOutputStream.h"
+#include "FileOutputStream.h"
 
 namespace water {
 

source/modules/water/files/juce_FileOutputStream.h → 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 {
 

source/modules/water/files/juce_TemporaryFile.cpp → 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 {
 

source/modules/water/files/juce_TemporaryFile.h → 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 {
 

source/modules/water/maths/juce_Random.cpp → 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 {
 

source/modules/water/memory/juce_HeapBlock.h → 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 {
 

source/modules/water/memory/juce_MemoryBlock.cpp → source/modules/water/memory/MemoryBlock.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_MemoryBlock.h"
+#include "MemoryBlock.h"
 
 namespace water {
 

source/modules/water/memory/juce_MemoryBlock.h → 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 {
 

source/modules/water/memory/juce_ReferenceCountedObject.h → 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 {
 

source/modules/water/midi/juce_MidiBuffer.cpp → 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 {
 

source/modules/water/midi/juce_MidiBuffer.h → 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 {
 

source/modules/water/midi/juce_MidiFile.cpp → 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 {
 

source/modules/water/midi/juce_MidiFile.h → 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 {
 

source/modules/water/midi/juce_MidiMessage.cpp → 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 {
 

source/modules/water/midi/juce_MidiMessageSequence.cpp → source/modules/water/midi/MidiMessageSequence.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_MidiMessageSequence.h"
+#include "MidiMessageSequence.h"
 
 namespace water {
 

source/modules/water/midi/juce_MidiMessageSequence.h → 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 {
 

source/modules/water/misc/juce_Result.cpp → source/modules/water/misc/Result.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_Result.h"
+#include "Result.h"
 
 namespace water {
 

source/modules/water/misc/juce_Result.h → 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 {
 

source/modules/water/time/juce_Time.cpp → source/modules/water/misc/Time.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_Time.h"
+#include "Time.h"
 
 namespace water {
 

source/modules/water/processors/juce_AudioProcessor.cpp → source/modules/water/processors/AudioProcessor.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#include "juce_AudioProcessor.h"
+#include "AudioProcessor.h"
 
 namespace water {
 

source/modules/water/processors/juce_AudioProcessor.h → 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 {
 

source/modules/water/processors/juce_AudioProcessorGraph.cpp → 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 {
 

source/modules/water/processors/juce_AudioProcessorGraph.h → 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 {
 

source/modules/water/streams/juce_FileInputSource.cpp → 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 {
 

source/modules/water/streams/juce_FileInputSource.h → 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 {
 

source/modules/water/streams/juce_InputStream.cpp → 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 {
 

source/modules/water/streams/juce_MemoryOutputStream.cpp → 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 {
 

source/modules/water/streams/juce_MemoryOutputStream.h → 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 {
 

source/modules/water/streams/juce_OutputStream.cpp → 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 {
 

source/modules/water/text/juce_CharPointer_UTF8.h → 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 {
 

source/modules/water/text/juce_CharacterFunctions.cpp → source/modules/water/text/CharacterFunctions.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_CharacterFunctions.h"
+#include "CharacterFunctions.h"
 
 namespace water {
 

source/modules/water/text/juce_CharacterFunctions.h → 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

source/modules/water/text/juce_Identifier.cpp → 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 {
 

source/modules/water/text/juce_Identifier.h → 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 {
 

source/modules/water/text/juce_String.cpp → 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"
 

source/modules/water/text/juce_String.h → 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

source/modules/water/text/juce_StringArray.cpp → source/modules/water/text/StringArray.cpp

@@ -28,7 +28,7 @@
   ==============================================================================
 */
 
-#include "juce_StringArray.h"
+#include "StringArray.h"
 
 namespace water {
 

source/modules/water/text/juce_StringArray.h → 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 {
 

source/modules/water/text/juce_StringPool.cpp → 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 {
 

source/modules/water/text/juce_StringPool.h → 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 {
 

source/modules/water/text/juce_StringRef.h → 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 {
 

source/modules/water/threads/juce_ChildProcess.cpp → 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
 

source/modules/water/threads/juce_ChildProcess.h → 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"
 

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"

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__);

source/modules/water/xml/juce_XmlDocument.cpp → 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 {
 

source/modules/water/xml/juce_XmlDocument.h → 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"
 

source/modules/water/xml/juce_XmlElement.cpp → 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 {