diff --git a/include/element/application.hpp b/include/element/application.hpp
index 535da035e..a3c477b80 100644
--- a/include/element/application.hpp
+++ b/include/element/application.hpp
@@ -143,7 +143,7 @@ class Application : public juce::JUCEApplication,
         Context& context;
         juce::MidiDeviceListConnection connection;
         juce::WeakReference<MidiSettingsApply>::Master masterReference;
-        friend class WeakReference<MidiSettingsApply>;
+        friend class juce::WeakReference<MidiSettingsApply>;
     };
     std::unique_ptr<MidiSettingsApply> applyMidiSettings;
 #endif
diff --git a/include/element/juce.hpp b/include/element/juce.hpp
index c38a4681d..dcb8433cf 100644
--- a/include/element/juce.hpp
+++ b/include/element/juce.hpp
@@ -21,6 +21,5 @@
 #include <juce_gui_extra/juce_gui_extra.h>
 #include <juce_osc/juce_osc.h>
 
-using namespace juce; // FIXME: namespace juce
 namespace element {
 }
diff --git a/include/element/ui/standard.hpp b/include/element/ui/standard.hpp
index fb10aba1a..f4ace0531 100644
--- a/include/element/ui/standard.hpp
+++ b/include/element/ui/standard.hpp
@@ -91,7 +91,7 @@ class StandardContent : public Content,
     std::unique_ptr<NavigationConcertinaPanel> nav;
     friend class ContentContainer;
     std::unique_ptr<ContentContainer> container;
-    StretchableLayoutManager layout;
+    juce::StretchableLayoutManager layout;
     class Resizer;
     friend class Resizer;
     std::unique_ptr<Resizer> bar1;
diff --git a/src/application.cpp b/src/application.cpp
index 95171d07d..10ffdd849 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -36,6 +36,8 @@
 #define ELEMENT_FIRST_RUN 0
 #endif
 
+using namespace juce;
+
 namespace element {
 
 static std::atomic<int> sCanShutdown { 0 };
diff --git a/src/engine/graphmanager.hpp b/src/engine/graphmanager.hpp
index d6662d08d..00cf2ab55 100644
--- a/src/engine/graphmanager.hpp
+++ b/src/engine/graphmanager.hpp
@@ -12,7 +12,7 @@ namespace element {
 class PluginManager;
 class RootGraph;
 
-class GraphManager : public ChangeBroadcaster
+class GraphManager : public juce::ChangeBroadcaster
 {
 public:
     static const uint32 invalidNodeId = EL_INVALID_PORT;
@@ -49,7 +49,7 @@ class GraphManager : public ChangeBroadcaster
     uint32 addNode (const Node& node);
 
     /** Adss a node with a plugin description */
-    uint32 addNode (const PluginDescription* desc, double x = 0.0f, double y = 0.0f, uint32 nodeId = 0);
+    uint32 addNode (const juce::PluginDescription* desc, double x = 0.0f, double y = 0.0f, uint32 nodeId = 0);
 
     /** Remove a node by ID */
     void removeNode (const uint32 nodeId);
diff --git a/src/engine/mappingengine.hpp b/src/engine/mappingengine.hpp
index d52bef393..f94b9dd50 100644
--- a/src/engine/mappingengine.hpp
+++ b/src/engine/mappingengine.hpp
@@ -33,7 +33,7 @@ class MappingEngine
     void stopMapping();
 
     void capture (const bool start = true) { capturedEvent.capture.set (start); }
-    MidiMessage getCapturedMidiMessage() const { return capturedEvent.message; }
+    juce::MidiMessage getCapturedMidiMessage() const { return capturedEvent.message; }
     Control getCapturedControl() const { return capturedEvent.control; }
     CapturedEventSignal& capturedSignal() { return capturedEvent.callback; }
 
@@ -42,7 +42,7 @@ class MappingEngine
     class Inputs;
     std::unique_ptr<Inputs> inputs;
 
-    class CapturedEvent : public AsyncUpdater
+    class CapturedEvent : public juce::AsyncUpdater
     {
     public:
         CapturedEvent() { capture.set (false); }
@@ -55,13 +55,13 @@ class MappingEngine
 
     private:
         friend class MappingEngine;
-        Atomic<bool> capture;
+        juce::Atomic<bool> capture;
         Control control;
-        MidiMessage message;
+        juce::MidiMessage message;
         CapturedEventSignal callback;
     } capturedEvent;
 
-    bool captureNextEvent (ControllerMapInput&, const Control&, const MidiMessage&);
+    bool captureNextEvent (ControllerMapInput&, const Control&, const juce::MidiMessage&);
 };
 
 } // namespace element
diff --git a/src/engine/midipanic.hpp b/src/engine/midipanic.hpp
index 783bda566..f8407b9ea 100644
--- a/src/engine/midipanic.hpp
+++ b/src/engine/midipanic.hpp
@@ -25,8 +25,8 @@ class MidiPanic
     /** Write panic messags to a buffer. */
     inline static void write (juce::MidiBuffer& buffer, int ch, int frame)
     {
-        buffer.addEvent (MidiMessage::allNotesOff (ch), frame);
-        buffer.addEvent (MidiMessage::allSoundOff (ch), frame);
+        buffer.addEvent (juce::MidiMessage::allNotesOff (ch), frame);
+        buffer.addEvent (juce::MidiMessage::allSoundOff (ch), frame);
     }
 
     /** Write panic messages on all midi channels in the buffer. */
@@ -47,11 +47,11 @@ class MidiPanic
     inline static std::vector<juce::MidiMessage> messages (int ch)
     {
         std::vector<juce::MidiMessage> msgs;
-        const auto timestamp = Time::getMillisecondCounterHiRes();
-        auto msg = MidiMessage::allNotesOff (ch);
+        const auto timestamp = juce::Time::getMillisecondCounterHiRes();
+        auto msg = juce::MidiMessage::allNotesOff (ch);
         msg.setTimeStamp (timestamp);
         msgs.push_back (msg);
-        msg = MidiMessage::allSoundOff (ch);
+        msg = juce::MidiMessage::allSoundOff (ch);
         msg.setTimeStamp (timestamp);
         msgs.push_back (msg);
         return msgs;
@@ -61,13 +61,13 @@ class MidiPanic
     inline static std::vector<juce::MidiMessage> messages()
     {
         std::vector<juce::MidiMessage> msgs;
-        const auto timestamp = Time::getMillisecondCounterHiRes();
+        const auto timestamp = juce::Time::getMillisecondCounterHiRes();
         for (int ch = 1; ch <= 16; ++ch)
         {
-            auto msg = MidiMessage::allNotesOff (ch);
+            auto msg = juce::MidiMessage::allNotesOff (ch);
             msg.setTimeStamp (timestamp);
             msgs.push_back (msg);
-            msg = MidiMessage::allSoundOff (ch);
+            msg = juce::MidiMessage::allSoundOff (ch);
             msg.setTimeStamp (timestamp);
             msgs.push_back (msg);
         }
diff --git a/src/engine/midipipe.cpp b/src/engine/midipipe.cpp
index b61a43faa..22b4b00f5 100644
--- a/src/engine/midipipe.cpp
+++ b/src/engine/midipipe.cpp
@@ -13,6 +13,7 @@
 #include "el/midi_buffer.hpp"
 #include "el/factories.hpp"
 
+using namespace juce;
 namespace element {
 
 MidiPipe::MidiPipe()
diff --git a/src/engine/miditranspose.hpp b/src/engine/miditranspose.hpp
index cc3a268c2..b41f9e6d2 100644
--- a/src/engine/miditranspose.hpp
+++ b/src/engine/miditranspose.hpp
@@ -27,26 +27,26 @@ class MidiTranspose
     inline int getNoteOffset() const { return offset.get(); }
 
     /** Process a single event */
-    inline static void process (MidiMessage& message, const int offset)
+    inline static void process (juce::MidiMessage& message, const int offset)
     {
         if (message.isNoteOnOrOff())
             message.setNoteNumber (offset + message.getNoteNumber());
     }
 
     /** Process a single event */
-    inline void process (MidiMessage& message) noexcept
+    inline void process (juce::MidiMessage& message) noexcept
     {
         if (message.isNoteOnOrOff())
             message.setNoteNumber (offset.get() + message.getNoteNumber());
     }
 
     /** Process a MidiBuffer */
-    inline void process (MidiBuffer& midi, int numSamples)
+    inline void process (juce::MidiBuffer& midi, int numSamples)
     {
         if (0 == offset.get())
             return;
 
-        MidiMessage msg;
+        juce::MidiMessage msg;
         for (auto m : midi)
         {
             if (m.samplePosition >= numSamples)
@@ -62,8 +62,8 @@ class MidiTranspose
     }
 
 private:
-    Atomic<int> offset { 0 };
-    MidiBuffer output;
+    juce::Atomic<int> offset { 0 };
+    juce::MidiBuffer output;
 };
 
 } // namespace element
diff --git a/src/nodes/audiofileplayer.cpp b/src/nodes/audiofileplayer.cpp
index f0c7109a1..5f8cbe0b5 100644
--- a/src/nodes/audiofileplayer.cpp
+++ b/src/nodes/audiofileplayer.cpp
@@ -17,6 +17,8 @@
 
 #include "utils.hpp"
 
+using namespace juce;
+
 namespace element {
 
 class AudioFilePlayerEditor;
@@ -156,7 +158,7 @@ class AudioFilePlayerEditor : public AudioProcessorEditor,
     }
 
     void timerCallback() override { stabilizeComponents(); }
-    void changeListenerCallback (ChangeBroadcaster*) override { stabilizeComponents(); }
+    void changeListenerCallback (juce::ChangeBroadcaster*) override { stabilizeComponents(); }
 
     void stabilizeComponents()
     {
diff --git a/src/nodes/audiofileplayer.hpp b/src/nodes/audiofileplayer.hpp
index b3b5192a3..fd81dc668 100644
--- a/src/nodes/audiofileplayer.hpp
+++ b/src/nodes/audiofileplayer.hpp
@@ -9,8 +9,8 @@
 namespace element {
 
 class AudioFilePlayerNode : public BaseProcessor,
-                            public AudioProcessorParameter::Listener,
-                            public AsyncUpdater
+                            public juce::AudioProcessorParameter::Listener,
+                            public juce::AsyncUpdater
 {
 public:
     enum Parameters
diff --git a/src/nodes/audiorouter.hpp b/src/nodes/audiorouter.hpp
index 85584ef36..ef00a77fd 100644
--- a/src/nodes/audiorouter.hpp
+++ b/src/nodes/audiorouter.hpp
@@ -11,19 +11,19 @@
 namespace element {
 
 class AudioRouterNode : public Processor,
-                        public ChangeBroadcaster
+                        public juce::ChangeBroadcaster
 {
 public:
     explicit AudioRouterNode (int ins = 4, int outs = 4);
     ~AudioRouterNode();
 
-    void prepareToRender (double sampleRate, int maxBufferSize) override { ignoreUnused (sampleRate, maxBufferSize); }
+    void prepareToRender (double sampleRate, int maxBufferSize) override { juce::ignoreUnused (sampleRate, maxBufferSize); }
     void releaseResources() override {}
 
     inline bool wantsContext() const noexcept override { return true; }
     void render (RenderContext&) override;
 
-    void getState (MemoryBlock&) override;
+    void getState (juce::MemoryBlock&) override;
     void setState (const void*, int sizeInBytes) override;
 
     void setSize (int newIns, int newOuts, bool async = true);
@@ -31,9 +31,9 @@ class AudioRouterNode : public Processor,
     void setMatrixState (const MatrixState&);
     MatrixState getMatrixState() const;
     void setWithoutLocking (int src, int dst, bool set);
-    CriticalSection& getLock() { return lock; }
+    juce::CriticalSection& getLock() { return lock; }
 
-    int getNumPrograms() const override { return jmax (1, programs.size()); }
+    int getNumPrograms() const override { return juce::jmax (1, programs.size()); }
     int getCurrentProgram() const override { return currentProgram; }
     void setCurrentProgram (int index) override;
     const String getProgramName (int index) const override
@@ -45,14 +45,14 @@ class AudioRouterNode : public Processor,
 
     void setFadeLength (double seconds)
     {
-        seconds = jlimit (0.001, 5.0, seconds);
-        ScopedLock sl (lock);
+        seconds = juce::jlimit (0.001, 5.0, seconds);
+        juce::ScopedLock sl (lock);
         fadeLengthSeconds = seconds;
         fadeIn.setLength (static_cast<float> (fadeLengthSeconds));
         fadeOut.setLength (static_cast<float> (fadeLengthSeconds));
     }
 
-    void getPluginDescription (PluginDescription& desc) const override
+    void getPluginDescription (juce::PluginDescription& desc) const override
     {
         desc.fileOrIdentifier = EL_NODE_ID_AUDIO_ROUTER;
         desc.name = "Audio Router";
@@ -92,12 +92,12 @@ class AudioRouterNode : public Processor,
     }
 
 private:
-    CriticalSection lock;
+    juce::CriticalSection lock;
     [[maybe_unused]] int numSources;
     [[maybe_unused]] int nextNumSources;
     [[maybe_unused]] int numDestinations;
     [[maybe_unused]] int nextNumDestinations;
-    AudioSampleBuffer tempAudio { 1, 1 };
+    juce::AudioSampleBuffer tempAudio { 1, 1 };
     bool rebuildPorts = true;
 
     struct Program
@@ -109,7 +109,7 @@ class AudioRouterNode : public Processor,
         MatrixState matrix;
     };
 
-    OwnedArray<Program> programs;
+    juce::OwnedArray<Program> programs;
     int currentProgram = -1;
 
     void set (int src, int dst, bool patched);
diff --git a/src/nodes/audioroutereditor.cpp b/src/nodes/audioroutereditor.cpp
index ea5b082a9..a197c67cc 100644
--- a/src/nodes/audioroutereditor.cpp
+++ b/src/nodes/audioroutereditor.cpp
@@ -8,6 +8,8 @@
 #include "ui/patchmatrix.hpp"
 #include "common.hpp"
 
+using namespace juce;
+
 namespace element {
 
 class AudioRouterMatrix : public PatchMatrixComponent
@@ -268,7 +270,7 @@ String AudioRouterEditor::getSizeString() const
     return {};
 }
 
-void AudioRouterEditor::changeListenerCallback (ChangeBroadcaster*)
+void AudioRouterEditor::changeListenerCallback (juce::ChangeBroadcaster*)
 {
     if (auto* const node = getNodeObjectOfType<AudioRouterNode>())
     {
diff --git a/src/nodes/audioroutereditor.hpp b/src/nodes/audioroutereditor.hpp
index cd18a1666..b86327ae2 100644
--- a/src/nodes/audioroutereditor.hpp
+++ b/src/nodes/audioroutereditor.hpp
@@ -9,21 +9,21 @@
 namespace element {
 
 class AudioRouterEditor : public NodeEditor,
-                          public ChangeListener
+                          public juce::ChangeListener
 {
 public:
     AudioRouterEditor (const Node& node);
     ~AudioRouterEditor();
 
     void resized() override;
-    void paint (Graphics& g) override;
+    void paint (juce::Graphics& g) override;
 
     void adjustBoundsToMatrixSize (int cellSize = 0);
     String getSizeString() const;
     MatrixState& getMatrixState() { return matrix; }
     void applyMatrix();
     void setFadeLength (double length);
-    void changeListenerCallback (ChangeBroadcaster*) override;
+    void changeListenerCallback (juce::ChangeBroadcaster*) override;
 
     void setAutoResize (bool yn) { autoResize = yn; }
 
diff --git a/src/nodes/ionodeeditor.hpp b/src/nodes/ionodeeditor.hpp
index 04ace3ec3..5d4a9c4d6 100644
--- a/src/nodes/ionodeeditor.hpp
+++ b/src/nodes/ionodeeditor.hpp
@@ -11,7 +11,7 @@
 namespace element {
 
 class AudioIONodeEditor : public NodeEditor,
-                          public ChangeListener
+                          public juce::ChangeListener
 {
 public:
     AudioIONodeEditor (const Node& node, DeviceManager& devs, bool ins = true, bool outs = true)
@@ -31,7 +31,7 @@ class AudioIONodeEditor : public NodeEditor,
         content.reset();
     }
 
-    void paint (Graphics& g) override
+    void paint (juce::Graphics& g) override
     {
         g.setFont (13.f);
         g.setColour (Colors::textColor);
@@ -40,10 +40,10 @@ class AudioIONodeEditor : public NodeEditor,
             text << "Input";
         else if (getNode().isAudioOutputNode())
             text << "Output";
-        g.drawText (text, getLocalBounds(), Justification::centred);
+        g.drawText (text, getLocalBounds(), juce::Justification::centred);
     }
 
-    void changeListenerCallback (ChangeBroadcaster*) override
+    void changeListenerCallback (juce::ChangeBroadcaster*) override
     {
         content->updateDevices();
     }
@@ -58,10 +58,10 @@ class AudioIONodeEditor : public NodeEditor,
     DeviceManager& devices;
     bool showIns = true;
     bool showOuts = true;
-    Viewport view;
+    juce::Viewport view;
 
     struct Content : public Component,
-                     public Button::Listener
+                     public juce::Button::Listener
     {
         Content (AudioIONodeEditor& ed)
             : owner (ed)
@@ -98,7 +98,7 @@ class AudioIONodeEditor : public NodeEditor,
         {
         }
 
-        void buttonClicked (Button* button) override
+        void buttonClicked (juce::Button* button) override
         {
         }
 
diff --git a/src/nodes/midirouter.hpp b/src/nodes/midirouter.hpp
index 23806277f..8cc0a2e6c 100644
--- a/src/nodes/midirouter.hpp
+++ b/src/nodes/midirouter.hpp
@@ -11,26 +11,26 @@
 namespace element {
 
 class MidiRouterNode : public Processor,
-                       public ChangeBroadcaster
+                       public juce::ChangeBroadcaster
 {
 public:
     explicit MidiRouterNode (int ins = 4, int outs = 4);
     ~MidiRouterNode();
 
-    void prepareToRender (double sampleRate, int maxBufferSize) override { ignoreUnused (sampleRate, maxBufferSize); }
+    void prepareToRender (double sampleRate, int maxBufferSize) override { juce::ignoreUnused (sampleRate, maxBufferSize); }
     void releaseResources() override {}
 
     inline bool wantsContext() const noexcept override { return true; }
     void render (RenderContext&) override;
-    void getState (MemoryBlock&) override;
+    void getState (juce::MemoryBlock&) override;
     void setState (const void*, int sizeInBytes) override;
 
     void setMatrixState (const MatrixState&);
     MatrixState getMatrixState() const;
     void setWithoutLocking (int src, int dst, bool set);
-    CriticalSection& getLock() { return lock; }
+    juce::CriticalSection& getLock() { return lock; }
 
-    int getNumPrograms() const override { return jmax (1, programs.size()); }
+    int getNumPrograms() const override { return juce::jmax (1, programs.size()); }
     int getCurrentProgram() const override { return currentProgram; }
     void setCurrentProgram (int index) override;
     const String getProgramName (int index) const override
@@ -40,7 +40,7 @@ class MidiRouterNode : public Processor,
         return "MIDI Router " + String (index + 1);
     }
 
-    void getPluginDescription (PluginDescription& desc) const override
+    void getPluginDescription (juce::PluginDescription& desc) const override
     {
         desc.fileOrIdentifier = EL_NODE_ID_MIDI_ROUTER;
         desc.uniqueId = EL_NODE_UID_MIDI_ROUTER;
@@ -74,7 +74,7 @@ class MidiRouterNode : public Processor,
     }
 
 private:
-    CriticalSection lock;
+    juce::CriticalSection lock;
     const int numSources;
     const int numDestinations;
 
@@ -87,7 +87,7 @@ class MidiRouterNode : public Processor,
         MatrixState matrix;
     };
 
-    OwnedArray<Program> programs;
+    juce::OwnedArray<Program> programs;
     int currentProgram = -1;
 
     void set (int src, int dst, bool patched);
@@ -100,8 +100,8 @@ class MidiRouterNode : public Processor,
     ToggleGrid nextToggles;
     bool togglesChanged { false };
 
-    OwnedArray<MidiBuffer> midiOuts;
-    void initMidiOuts (OwnedArray<MidiBuffer>& outs);
+    juce::OwnedArray<juce::MidiBuffer> midiOuts;
+    void initMidiOuts (juce::OwnedArray<juce::MidiBuffer>& outs);
 };
 
 } // namespace element
diff --git a/src/nodes/midiroutereditor.cpp b/src/nodes/midiroutereditor.cpp
index 28979a144..eab50f3b9 100644
--- a/src/nodes/midiroutereditor.cpp
+++ b/src/nodes/midiroutereditor.cpp
@@ -186,7 +186,7 @@ void MidiRouterEditor::applyMatrix()
         node->setMatrixState (matrix);
 }
 
-void MidiRouterEditor::changeListenerCallback (ChangeBroadcaster*)
+void MidiRouterEditor::changeListenerCallback (juce::ChangeBroadcaster*)
 {
     if (auto* const node = getNodeObjectOfType<MidiRouterNode>())
     {
diff --git a/src/nodes/midiroutereditor.hpp b/src/nodes/midiroutereditor.hpp
index 667377b64..d5a7cd603 100644
--- a/src/nodes/midiroutereditor.hpp
+++ b/src/nodes/midiroutereditor.hpp
@@ -25,18 +25,18 @@
 namespace element {
 
 class MidiRouterEditor : public NodeEditor,
-                         public ChangeListener
+                         public juce::ChangeListener
 {
 public:
     MidiRouterEditor (const Node& node);
     ~MidiRouterEditor();
 
     void resized() override;
-    void paint (Graphics& g) override;
+    void paint (juce::Graphics& g) override;
 
     MatrixState& getMatrixState() { return matrix; }
     void applyMatrix();
-    void changeListenerCallback (ChangeBroadcaster*) override;
+    void changeListenerCallback (juce::ChangeBroadcaster*) override;
 
 private:
     MatrixState matrix;
diff --git a/src/nodes/midisetlisteditor.hpp b/src/nodes/midisetlisteditor.hpp
index c38a6a57f..f622679c3 100644
--- a/src/nodes/midisetlisteditor.hpp
+++ b/src/nodes/midisetlisteditor.hpp
@@ -9,13 +9,13 @@
 namespace element {
 
 class MidiSetListEditor : public NodeEditor,
-                          public ChangeListener
+                          public juce::ChangeListener
 {
 public:
     MidiSetListEditor (const Node& node);
     virtual ~MidiSetListEditor();
 
-    void paint (Graphics&) override;
+    void paint (juce::Graphics&) override;
     void resized() override;
 
     void addProgram();
@@ -34,19 +34,19 @@ class MidiSetListEditor : public NodeEditor,
     void selectRow (int row);
     void setStoreSize (const bool storeSize);
 
-    void changeListenerCallback (ChangeBroadcaster*) override;
+    void changeListenerCallback (juce::ChangeBroadcaster*) override;
 
-    bool keyPressed (const KeyPress&) override;
+    bool keyPressed (const juce::KeyPress&) override;
 
 private:
     Node node;
     class TableModel;
     friend class TableModel;
     std::unique_ptr<TableModel> model;
-    TableListBox table;
-    TextButton addButton;
-    TextButton delButton;
-    Slider fontSlider;
+    juce::TableListBox table;
+    juce::TextButton addButton;
+    juce::TextButton delButton;
+    juce::Slider fontSlider;
     bool storeSizeInNode = true;
     float fontSize = 15.f;
     SignalConnection lastProgramChangeConnection;
diff --git a/src/presetmanager.hpp b/src/presetmanager.hpp
index ed143db4f..dbb2e9aa9 100644
--- a/src/presetmanager.hpp
+++ b/src/presetmanager.hpp
@@ -35,7 +35,7 @@ class PresetManager
         presets.clear();
     }
 
-    inline void getPresetsFor (const Node& node, OwnedArray<PresetInfo>& results) const
+    inline void getPresetsFor (const Node& node, juce::OwnedArray<PresetInfo>& results) const
     {
         SortByName sorter;
         for (const auto* const preset : presets)
@@ -81,7 +81,7 @@ class PresetManager
 
 private:
     DataPath path;
-    OwnedArray<PresetInfo> presets;
+    juce::OwnedArray<PresetInfo> presets;
 };
 
 } // namespace element
diff --git a/src/scripting/dspscript.cpp b/src/scripting/dspscript.cpp
index face7a7ab..42a6f8e34 100644
--- a/src/scripting/dspscript.cpp
+++ b/src/scripting/dspscript.cpp
@@ -9,6 +9,8 @@
 #include <element/processor.hpp>
 
 using namespace element;
+using namespace juce;
+
 namespace element {
 
 //==============================================================================
diff --git a/src/scripting/scriptmanager.cpp b/src/scripting/scriptmanager.cpp
index 82c1d1ab7..efb073c2c 100644
--- a/src/scripting/scriptmanager.cpp
+++ b/src/scripting/scriptmanager.cpp
@@ -9,6 +9,8 @@
 #include <element/datapath.hpp>
 #include "sol/sol.hpp"
 
+using namespace juce;
+
 namespace element {
 
 static void scanForScripts (File dir, Array<ScriptInfo>& results, bool recursive = true)
diff --git a/src/services/guiservice.cpp b/src/services/guiservice.cpp
index 1d3e9357f..681c1d45a 100644
--- a/src/services/guiservice.cpp
+++ b/src/services/guiservice.cpp
@@ -1144,7 +1144,7 @@ void GuiService::saveSettings()
     saveProperties (settings().getUserSettings());
 }
 
-void GuiService::changeListenerCallback (ChangeBroadcaster* broadcaster)
+void GuiService::changeListenerCallback (juce::ChangeBroadcaster* broadcaster)
 {
     if (broadcaster == &context().devices())
         if (auto* win = mainWindow.get())
diff --git a/src/services/mappingservice.cpp b/src/services/mappingservice.cpp
index a2c7bd297..fde9c962e 100644
--- a/src/services/mappingservice.cpp
+++ b/src/services/mappingservice.cpp
@@ -9,6 +9,8 @@
 #include <element/context.hpp>
 #include <element/signals.hpp>
 
+using namespace juce;
+
 namespace element {
 
 enum LearnState
diff --git a/src/services/oscservice.cpp b/src/services/oscservice.cpp
index 6beefc37b..930012f78 100644
--- a/src/services/oscservice.cpp
+++ b/src/services/oscservice.cpp
@@ -14,6 +14,8 @@
 #define EL_OSC_ADDRESS_COMMAND "/element/command"
 #define EL_OSC_ADDRESS_ENGINE "/element/engine"
 
+using namespace juce;
+
 namespace element {
 
 struct CommandOSCListener final : juce::OSCReceiver::ListenerWithOSCAddress<>
diff --git a/src/services/presetservice.cpp b/src/services/presetservice.cpp
index 1e6329fdc..e11906bfc 100644
--- a/src/services/presetservice.cpp
+++ b/src/services/presetservice.cpp
@@ -11,6 +11,7 @@
 #include "services/presetservice.hpp"
 
 using juce::String;
+using namespace juce;
 
 namespace element {
 
diff --git a/src/session.cpp b/src/session.cpp
index bac1ea387..d2bf3e4b0 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -9,6 +9,8 @@
 #include <element/context.hpp>
 #include "tempo.hpp"
 
+using namespace juce;
+
 namespace element {
 
 static Node findNodeRecursive (const Node& start, const Uuid& uuid)
diff --git a/src/ui/aboutscreen.cpp b/src/ui/aboutscreen.cpp
index e77d78c47..278fccbf4 100644
--- a/src/ui/aboutscreen.cpp
+++ b/src/ui/aboutscreen.cpp
@@ -25,6 +25,8 @@
     "along with this program; if not, write to the Free Software\r\n"          \
     "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r\n"
 
+using namespace juce;
+
 namespace element {
 
 namespace detail {
diff --git a/src/ui/audiodeviceselector.cpp b/src/ui/audiodeviceselector.cpp
index 910f0bfe3..724270e80 100644
--- a/src/ui/audiodeviceselector.cpp
+++ b/src/ui/audiodeviceselector.cpp
@@ -5,6 +5,8 @@
 
 #include "ui/audiodeviceselector.hpp"
 
+using namespace juce;
+
 namespace element {
 
 struct SimpleDeviceManagerInputLevelMeter : public Component,
diff --git a/src/ui/audiodeviceselector.hpp b/src/ui/audiodeviceselector.hpp
index 961c4c445..53062a882 100644
--- a/src/ui/audiodeviceselector.hpp
+++ b/src/ui/audiodeviceselector.hpp
@@ -18,9 +18,9 @@ namespace element {
 
     @tags{Audio}
 */
-class JUCE_API AudioDeviceSelectorComponent : public Component,
-                                              private ChangeListener,
-                                              private Timer
+class JUCE_API AudioDeviceSelectorComponent : public juce::Component,
+                                              private juce::ChangeListener,
+                                              private juce::Timer
 {
 public:
     //==============================================================================
@@ -42,7 +42,7 @@ class JUCE_API AudioDeviceSelectorComponent : public Component,
         @param hideAdvancedOptionsWithButton    if true, only the minimum amount of UI components
                                         are shown, with an "advanced" button that shows the rest of them
     */
-    AudioDeviceSelectorComponent (AudioDeviceManager& deviceManager,
+    AudioDeviceSelectorComponent (juce::AudioDeviceManager& deviceManager,
                                   int minAudioInputChannels,
                                   int maxAudioInputChannels,
                                   int minAudioOutputChannels,
@@ -56,7 +56,7 @@ class JUCE_API AudioDeviceSelectorComponent : public Component,
     ~AudioDeviceSelectorComponent() override;
 
     /** The device manager that this component is controlling */
-    AudioDeviceManager& deviceManager;
+    juce::AudioDeviceManager& deviceManager;
 
     /** Sets the standard height used for items in the panel. */
     void setItemHeight (int itemHeight);
@@ -65,7 +65,7 @@ class JUCE_API AudioDeviceSelectorComponent : public Component,
     int getItemHeight() const noexcept { return itemHeight; }
 
     /** Returns the ListBox that's being used to show the midi inputs, or nullptr if there isn't one. */
-    ListBox* getMidiInputSelectorListBox() const noexcept;
+    juce::ListBox* getMidiInputSelectorListBox() const noexcept;
 
     //==============================================================================
     /** @internal */
@@ -78,11 +78,11 @@ class JUCE_API AudioDeviceSelectorComponent : public Component,
     void handleBluetoothButton();
     void updateDeviceType();
     void updateMidiOutput();
-    void changeListenerCallback (ChangeBroadcaster*) override;
+    void changeListenerCallback (juce::ChangeBroadcaster*) override;
     void updateAllControls();
 
-    std::unique_ptr<ComboBox> deviceTypeDropDown;
-    std::unique_ptr<Label> deviceTypeDropDownLabel;
+    std::unique_ptr<juce::ComboBox> deviceTypeDropDown;
+    std::unique_ptr<juce::Label> deviceTypeDropDownLabel;
     std::unique_ptr<Component> audioDeviceSettingsComp;
     String audioDeviceSettingsCompType;
     int itemHeight;
@@ -92,9 +92,9 @@ class JUCE_API AudioDeviceSelectorComponent : public Component,
 
     class MidiInputSelectorComponentListBox;
     std::unique_ptr<MidiInputSelectorComponentListBox> midiInputsList;
-    std::unique_ptr<ComboBox> midiOutputSelector;
-    std::unique_ptr<Label> midiInputsLabel, midiOutputLabel;
-    std::unique_ptr<TextButton> bluetoothButton;
+    std::unique_ptr<juce::ComboBox> midiOutputSelector;
+    std::unique_ptr<juce::Label> midiInputsLabel, midiOutputLabel;
+    std::unique_ptr<juce::TextButton> bluetoothButton;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDeviceSelectorComponent)
 };
diff --git a/src/ui/block.hpp b/src/ui/block.hpp
index af6d0a0a4..c8b07acca 100644
--- a/src/ui/block.hpp
+++ b/src/ui/block.hpp
@@ -367,7 +367,7 @@ class BlockComponent : public Component,
     PortAlignment _portAlign { PortsMiddle };
     bool selected { false };
 
-    void changeListenerCallback (ChangeBroadcaster*) override;
+    void changeListenerCallback (juce::ChangeBroadcaster*) override;
 
     void deleteAllPins();
 
diff --git a/src/ui/console.cpp b/src/ui/console.cpp
index d5cc4a0d6..d952aa241 100644
--- a/src/ui/console.cpp
+++ b/src/ui/console.cpp
@@ -4,6 +4,8 @@
 #include "ui/console.hpp"
 #include <element/ui/style.hpp>
 
+using namespace juce;
+
 namespace element {
 
 static void setupEditor (TextEditor& editor)
diff --git a/src/ui/meterbridge.cpp b/src/ui/meterbridge.cpp
index 98e6815f0..fbcdb28a5 100644
--- a/src/ui/meterbridge.cpp
+++ b/src/ui/meterbridge.cpp
@@ -8,6 +8,8 @@
 
 #include <element/ui/style.hpp>
 
+using namespace juce;
+
 namespace element {
 
 struct SimpleLevelMeter : public Component,
diff --git a/src/ui/pluginspanelview.hpp b/src/ui/pluginspanelview.hpp
index 30a9e10c7..5ebc34a34 100644
--- a/src/ui/pluginspanelview.hpp
+++ b/src/ui/pluginspanelview.hpp
@@ -28,7 +28,7 @@ class PluginsPanelView : public ContentView,
     /** @internal */
     void textEditorTextChanged (TextEditor&) override;
     void textEditorReturnKeyPressed (TextEditor&) override;
-    void changeListenerCallback (ChangeBroadcaster*) override;
+    void changeListenerCallback (juce::ChangeBroadcaster*) override;
     void timerCallback() override;
 
 private:
diff --git a/src/ui/sessionimportwizard.hpp b/src/ui/sessionimportwizard.hpp
index cd3d3a781..ceecf0b49 100644
--- a/src/ui/sessionimportwizard.hpp
+++ b/src/ui/sessionimportwizard.hpp
@@ -9,7 +9,7 @@ namespace element {
 
 class Services;
 
-class SessionImportWizard final : public Component
+class SessionImportWizard final : public juce::Component
 {
 public:
     SessionImportWizard();
@@ -18,7 +18,7 @@ class SessionImportWizard final : public Component
     void loadSession (const File& file);
     SessionPtr session();
 
-    void paint (Graphics& g) override;
+    void paint (juce::Graphics& g) override;
     void resized() override;
 
 private:
@@ -27,7 +27,7 @@ class SessionImportWizard final : public Component
     SessionPtr _session;
 };
 
-class SessionImportWizardDialog : public DialogWindow
+class SessionImportWizardDialog : public juce::DialogWindow
 {
 public:
     SessionImportWizardDialog (std::unique_ptr<Component>& h, const File& file);
diff --git a/test/NodeFactoryTests.cpp b/test/NodeFactoryTests.cpp
index 56ead2a89..019a55840 100644
--- a/test/NodeFactoryTests.cpp
+++ b/test/NodeFactoryTests.cpp
@@ -6,6 +6,7 @@
 #include <element/nodefactory.hpp>
 
 using namespace element;
+using namespace juce;
 
 BOOST_AUTO_TEST_SUITE (NodeFactoryTests)
 
diff --git a/test/PortListTests.cpp b/test/PortListTests.cpp
index 4298bf469..ae4799743 100644
--- a/test/PortListTests.cpp
+++ b/test/PortListTests.cpp
@@ -21,6 +21,8 @@
 #include <element/juce.hpp>
 #include <element/porttype.hpp>
 
+using namespace juce;
+
 using PortType = element::PortType;
 
 BOOST_AUTO_TEST_SUITE (PortListTests)
diff --git a/test/scripting/dspscripttest.cpp b/test/scripting/dspscripttest.cpp
index ba3f6567c..26e422a04 100644
--- a/test/scripting/dspscripttest.cpp
+++ b/test/scripting/dspscripttest.cpp
@@ -9,6 +9,7 @@
 #include "testutil.hpp"
 
 using namespace element;
+using namespace juce;
 
 BOOST_AUTO_TEST_SUITE (DSPScriptTest)