diff --git a/include/app/CableWidget.hpp b/include/app/CableWidget.hpp
index 7d43885c..1d8490de 100644
--- a/include/app/CableWidget.hpp
+++ b/include/app/CableWidget.hpp
@@ -1,10 +1,10 @@
 #pragma once
+#include <map>
 #include <app/common.hpp>
 #include <widget/OpaqueWidget.hpp>
 #include <app/PortWidget.hpp>
 #include <app/ModuleWidget.hpp>
 #include <engine/Cable.hpp>
-#include <map>
 
 
 namespace rack {
diff --git a/include/app/RackWidget.hpp b/include/app/RackWidget.hpp
index fa3dc314..25c9a59c 100644
--- a/include/app/RackWidget.hpp
+++ b/include/app/RackWidget.hpp
@@ -1,4 +1,6 @@
 #pragma once
+#include <map>
+
 #include <app/common.hpp>
 #include <widget/OpaqueWidget.hpp>
 #include <widget/FramebufferWidget.hpp>
@@ -7,7 +9,6 @@
 #include <app/PortWidget.hpp>
 #include <app/ParamWidget.hpp>
 #include <history.hpp>
-#include <map>
 
 
 namespace rack {
diff --git a/include/app/common.hpp b/include/app/common.hpp
index 48ad01a4..9298a54f 100644
--- a/include/app/common.hpp
+++ b/include/app/common.hpp
@@ -1,7 +1,8 @@
 #pragma once
+#include <jansson.h>
+
 #include <common.hpp>
 #include <math.hpp>
-#include <jansson.h>
 
 
 namespace rack {
diff --git a/include/audio.hpp b/include/audio.hpp
index 8069bf66..027131dc 100644
--- a/include/audio.hpp
+++ b/include/audio.hpp
@@ -1,10 +1,12 @@
 #pragma once
-#include <common.hpp>
-#include <context.hpp>
-#include <jansson.h>
 #include <vector>
 #include <set>
 
+#include <jansson.h>
+
+#include <common.hpp>
+#include <context.hpp>
+
 namespace rack {
 
 
diff --git a/include/color.hpp b/include/color.hpp
index 3aabcbf1..ae74b687 100644
--- a/include/color.hpp
+++ b/include/color.hpp
@@ -1,7 +1,8 @@
 #pragma once
+#include <nanovg.h>
+
 #include <common.hpp>
 #include <string.hpp>
-#include <nanovg.h>
 
 
 namespace rack {
diff --git a/include/common.hpp b/include/common.hpp
index 6338dc6d..6f344b9b 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -1,6 +1,4 @@
 #pragma once
-#include <logger.hpp>
-
 // Include most of the C stdlib for convenience
 #include <cstdlib>
 #include <cstdio>
@@ -15,6 +13,8 @@
 #include <string>
 #include <stdexcept>
 
+#include <logger.hpp>
+
 
 namespace rack {
 
diff --git a/include/dsp/common.hpp b/include/dsp/common.hpp
index 03183c16..6949a954 100644
--- a/include/dsp/common.hpp
+++ b/include/dsp/common.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <common.hpp>
 #include <math.hpp>
 #include <simd/functions.hpp>
 
diff --git a/include/dsp/fft.hpp b/include/dsp/fft.hpp
index 603f4c12..6c88132c 100644
--- a/include/dsp/fft.hpp
+++ b/include/dsp/fft.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <dsp/common.hpp>
 #include <pffft.h>
 
+#include <dsp/common.hpp>
+
 
 namespace rack {
 namespace dsp {
diff --git a/include/dsp/fir.hpp b/include/dsp/fir.hpp
index f99b65de..c7de6e26 100644
--- a/include/dsp/fir.hpp
+++ b/include/dsp/fir.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <dsp/common.hpp>
 #include <pffft.h>
 
+#include <dsp/common.hpp>
+
 
 namespace rack {
 namespace dsp {
diff --git a/include/dsp/resampler.hpp b/include/dsp/resampler.hpp
index 40cebd86..ca04fc36 100644
--- a/include/dsp/resampler.hpp
+++ b/include/dsp/resampler.hpp
@@ -1,11 +1,10 @@
 #pragma once
+#include <speex/speex_resampler.h>
+
 #include <dsp/common.hpp>
 #include <dsp/ringbuffer.hpp>
 #include <dsp/fir.hpp>
 #include <dsp/window.hpp>
-#include <assert.h>
-#include <string.h>
-#include <speex/speex_resampler.h>
 
 
 namespace rack {
diff --git a/include/dsp/ringbuffer.hpp b/include/dsp/ringbuffer.hpp
index ea545937..fa051bbc 100644
--- a/include/dsp/ringbuffer.hpp
+++ b/include/dsp/ringbuffer.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include <dsp/common.hpp>
-#include <string.h>
 
 
 namespace rack {
diff --git a/include/engine/Engine.hpp b/include/engine/Engine.hpp
index 36a44dc2..caa8f396 100644
--- a/include/engine/Engine.hpp
+++ b/include/engine/Engine.hpp
@@ -1,9 +1,10 @@
 #pragma once
+#include <vector>
+
 #include <common.hpp>
 #include <engine/Module.hpp>
 #include <engine/Cable.hpp>
 #include <engine/ParamHandle.hpp>
-#include <vector>
 
 
 namespace rack {
diff --git a/include/engine/Module.hpp b/include/engine/Module.hpp
index 4cffb2a1..8c412e6c 100644
--- a/include/engine/Module.hpp
+++ b/include/engine/Module.hpp
@@ -1,4 +1,8 @@
 #pragma once
+#include <vector>
+
+#include <jansson.h>
+
 #include <common.hpp>
 #include <string.hpp>
 #include <plugin/Model.hpp>
@@ -7,8 +11,6 @@
 #include <engine/Light.hpp>
 #include <engine/ParamQuantity.hpp>
 #include <engine/PortInfo.hpp>
-#include <vector>
-#include <jansson.h>
 
 
 namespace rack {
diff --git a/include/engine/Param.hpp b/include/engine/Param.hpp
index 7dab778b..9931ff64 100644
--- a/include/engine/Param.hpp
+++ b/include/engine/Param.hpp
@@ -1,7 +1,8 @@
 #pragma once
+#include <jansson.h>
+
 #include <common.hpp>
 #include <math.hpp>
-#include <jansson.h>
 
 
 namespace rack {
diff --git a/include/event.hpp b/include/event.hpp
index d40e5969..a816088b 100644
--- a/include/event.hpp
+++ b/include/event.hpp
@@ -1,9 +1,10 @@
 #pragma once
-#include <common.hpp>
-#include <math.hpp>
 #include <vector>
 #include <set>
 
+#include <common.hpp>
+#include <math.hpp>
+
 
 
 /** Remaps Ctrl to Cmd on Mac
diff --git a/include/history.hpp b/include/history.hpp
index 99c54f95..30832795 100644
--- a/include/history.hpp
+++ b/include/history.hpp
@@ -1,11 +1,13 @@
 #pragma once
+#include <vector>
+#include <deque>
+
+#include <jansson.h>
+
 #include <common.hpp>
 #include <math.hpp>
 #include <color.hpp>
 #include <plugin/Model.hpp>
-#include <vector>
-#include <deque>
-#include <jansson.h>
 
 
 namespace rack {
diff --git a/include/math.hpp b/include/math.hpp
index 39f145ca..617f01b3 100644
--- a/include/math.hpp
+++ b/include/math.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <common.hpp>
 #include <complex>
 #include <algorithm> // for std::min, max
 
+#include <common.hpp>
+
 
 namespace rack {
 
diff --git a/include/midi.hpp b/include/midi.hpp
index f73beef7..1e17dc26 100644
--- a/include/midi.hpp
+++ b/include/midi.hpp
@@ -1,11 +1,13 @@
 #pragma once
-#include <common.hpp>
-#include <context.hpp>
 #include <vector>
 #include <queue>
 #include <set>
+
 #include <jansson.h>
 
+#include <common.hpp>
+#include <context.hpp>
+
 
 namespace rack {
 
diff --git a/include/network.hpp b/include/network.hpp
index 3d815e2b..4014c8f9 100644
--- a/include/network.hpp
+++ b/include/network.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <jansson.h>
 
+#include <common.hpp>
+
 
 namespace rack {
 
diff --git a/include/patch.hpp b/include/patch.hpp
index b1b0a906..8e7850a9 100644
--- a/include/patch.hpp
+++ b/include/patch.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <jansson.h>
 
+#include <common.hpp>
+
 
 namespace rack {
 
diff --git a/include/plugin.hpp b/include/plugin.hpp
index 6b68f969..eb2b81e0 100644
--- a/include/plugin.hpp
+++ b/include/plugin.hpp
@@ -1,8 +1,9 @@
 #pragma once
+#include <vector>
+
 #include <common.hpp>
 #include <plugin/Plugin.hpp>
 #include <plugin/Model.hpp>
-#include <vector>
 
 
 namespace rack {
diff --git a/include/plugin/Model.hpp b/include/plugin/Model.hpp
index 0c349544..6e8b6ebd 100644
--- a/include/plugin/Model.hpp
+++ b/include/plugin/Model.hpp
@@ -1,8 +1,10 @@
 #pragma once
+#include <set>
+
+#include <jansson.h>
+
 #include <common.hpp>
 #include <plugin/Plugin.hpp>
-#include <jansson.h>
-#include <set>
 
 
 namespace rack {
diff --git a/include/plugin/Plugin.hpp b/include/plugin/Plugin.hpp
index 111077be..ff941dfb 100644
--- a/include/plugin/Plugin.hpp
+++ b/include/plugin/Plugin.hpp
@@ -1,8 +1,10 @@
 #pragma once
-#include <common.hpp>
-#include <jansson.h>
 #include <vector>
 
+#include <jansson.h>
+
+#include <common.hpp>
+
 
 namespace rack {
 namespace plugin {
diff --git a/include/rack.hpp b/include/rack.hpp
index 2cc5965f..506c42a8 100644
--- a/include/rack.hpp
+++ b/include/rack.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-
 // The following headers are the "public" API of Rack.
 
 #include <common.hpp>
diff --git a/include/random.hpp b/include/random.hpp
index b4033662..2ba232cd 100644
--- a/include/random.hpp
+++ b/include/random.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include <common.hpp>
-#include <cstdint>
 
 
 namespace rack {
diff --git a/include/settings.hpp b/include/settings.hpp
index 28dc2abc..11d19c77 100644
--- a/include/settings.hpp
+++ b/include/settings.hpp
@@ -1,13 +1,15 @@
 #pragma once
-#include <common.hpp>
-#include <math.hpp>
-#include <color.hpp>
 #include <vector>
 #include <map>
 #include <list>
 #include <tuple>
+
 #include <jansson.h>
 
+#include <common.hpp>
+#include <math.hpp>
+#include <color.hpp>
+
 
 namespace rack {
 
diff --git a/include/string.hpp b/include/string.hpp
index 30779269..32cb5059 100644
--- a/include/string.hpp
+++ b/include/string.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <vector>
 
+#include <common.hpp>
+
 
 namespace rack {
 
diff --git a/include/svg.hpp b/include/svg.hpp
index a035f3b4..96d3e82b 100644
--- a/include/svg.hpp
+++ b/include/svg.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <common.hpp>
 #include <nanovg.h>
 #include <nanosvg.h>
 
+#include <common.hpp>
+
 
 namespace rack {
 
diff --git a/include/system.hpp b/include/system.hpp
index 49fa0dce..94fbaec2 100644
--- a/include/system.hpp
+++ b/include/system.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <list>
 
+#include <common.hpp>
+
 
 namespace rack {
 
diff --git a/include/tag.hpp b/include/tag.hpp
index d26b6e2e..ba8effd4 100644
--- a/include/tag.hpp
+++ b/include/tag.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <vector>
 
+#include <common.hpp>
+
 
 namespace rack {
 namespace tag {
diff --git a/include/ui/common.hpp b/include/ui/common.hpp
index 1d5e3ab6..b66274bc 100644
--- a/include/ui/common.hpp
+++ b/include/ui/common.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <common.hpp>
 #include <nanovg.h>
 #include <blendish.h>
 
+#include <common.hpp>
+
 /** Useful for menu items with a "true" boolean state */
 #define CHECKMARK_STRING "✔"
 #define CHECKMARK(_cond) ((_cond) ? CHECKMARK_STRING : "")
diff --git a/include/widget/Widget.hpp b/include/widget/Widget.hpp
index 3ada076c..4d63730b 100644
--- a/include/widget/Widget.hpp
+++ b/include/widget/Widget.hpp
@@ -1,10 +1,11 @@
 #pragma once
+#include <list>
+
 #include <common.hpp>
 #include <math.hpp>
 #include <window.hpp>
 #include <color.hpp>
 #include <event.hpp>
-#include <list>
 
 
 namespace rack {
diff --git a/include/window.hpp b/include/window.hpp
index 773ddb99..e0aaa382 100644
--- a/include/window.hpp
+++ b/include/window.hpp
@@ -1,9 +1,8 @@
 #pragma once
-#include <common.hpp>
-#include <math.hpp>
 
 #include <memory>
 #include <map>
+
 #define GLEW_STATIC
 #define GLEW_NO_GLU
 #include <GL/glew.h>
@@ -14,6 +13,9 @@
 #include <nanovg_gl_utils.h>
 #include <nanosvg.h>
 
+#include <common.hpp>
+#include <math.hpp>
+
 
 namespace rack {
 
diff --git a/src/Quantity.cpp b/src/Quantity.cpp
index ae9e010c..143228a7 100644
--- a/src/Quantity.cpp
+++ b/src/Quantity.cpp
@@ -1,6 +1,7 @@
+#include <tinyexpr.h>
+
 #include <Quantity.hpp>
 #include <string.hpp>
-#include <tinyexpr.h>
 
 
 namespace rack {
diff --git a/src/app/MenuBar.cpp b/src/app/MenuBar.cpp
index 5dfcbff6..1e577b52 100644
--- a/src/app/MenuBar.cpp
+++ b/src/app/MenuBar.cpp
@@ -1,3 +1,8 @@
+#include <thread>
+#include <utility>
+
+#include <osdialog.h>
+
 #include <app/MenuBar.hpp>
 #include <window.hpp>
 #include <engine/Engine.hpp>
@@ -17,9 +22,6 @@
 #include <plugin.hpp>
 #include <patch.hpp>
 #include <updater.hpp>
-#include <osdialog.h>
-#include <thread>
-#include <utility>
 
 
 namespace rack {
diff --git a/src/app/ModuleBrowser.cpp b/src/app/ModuleBrowser.cpp
index 6291b8e9..449ec0b8 100644
--- a/src/app/ModuleBrowser.cpp
+++ b/src/app/ModuleBrowser.cpp
@@ -1,3 +1,6 @@
+#include <set>
+#include <algorithm>
+
 #include <app/ModuleBrowser.hpp>
 #include <widget/OpaqueWidget.hpp>
 #include <widget/TransparentWidget.hpp>
@@ -25,9 +28,6 @@
 #include <settings.hpp>
 #include <tag.hpp>
 
-#include <set>
-#include <algorithm>
-
 
 namespace rack {
 namespace app {
diff --git a/src/app/ModuleWidget.cpp b/src/app/ModuleWidget.cpp
index eb5b0526..213cf3b0 100644
--- a/src/app/ModuleWidget.cpp
+++ b/src/app/ModuleWidget.cpp
@@ -1,3 +1,7 @@
+#include <thread>
+
+#include <osdialog.h>
+
 #include <app/ModuleWidget.hpp>
 #include <app/Scene.hpp>
 #include <engine/Engine.hpp>
@@ -13,9 +17,6 @@
 #include <string.hpp>
 #include <tag.hpp>
 
-#include <osdialog.h>
-#include <thread>
-
 
 namespace rack {
 namespace app {
diff --git a/src/app/RackWidget.cpp b/src/app/RackWidget.cpp
index e74a6ba8..c8b9d28e 100644
--- a/src/app/RackWidget.cpp
+++ b/src/app/RackWidget.cpp
@@ -1,3 +1,9 @@
+#include <map>
+#include <algorithm>
+#include <queue>
+
+#include <osdialog.h>
+
 #include <app/RackWidget.hpp>
 #include <widget/TransparentWidget.hpp>
 #include <app/RackRail.hpp>
@@ -9,10 +15,6 @@
 #include <context.hpp>
 #include <asset.hpp>
 #include <patch.hpp>
-#include <osdialog.h>
-#include <map>
-#include <algorithm>
-#include <queue>
 
 
 namespace rack {
diff --git a/src/app/Scene.cpp b/src/app/Scene.cpp
index 9127c9e9..88614732 100644
--- a/src/app/Scene.cpp
+++ b/src/app/Scene.cpp
@@ -1,3 +1,7 @@
+#include <thread>
+
+#include <osdialog.h>
+
 #include <app/Scene.hpp>
 #include <app/ModuleBrowser.hpp>
 #include <context.hpp>
@@ -7,8 +11,6 @@
 #include <settings.hpp>
 #include <patch.hpp>
 #include <asset.hpp>
-#include <osdialog.h>
-#include <thread>
 
 
 namespace rack {
diff --git a/src/asset.cpp b/src/asset.cpp
index c19844e5..0419dc32 100644
--- a/src/asset.cpp
+++ b/src/asset.cpp
@@ -1,10 +1,3 @@
-#include <asset.hpp>
-#include <system.hpp>
-#include <settings.hpp>
-#include <string.hpp>
-#include <plugin/Plugin.hpp>
-#include <app/common.hpp>
-
 #if defined ARCH_MAC
 	#include <CoreFoundation/CoreFoundation.h>
 	#include <CoreServices/CoreServices.h>
@@ -23,6 +16,13 @@
 	#include <pwd.h>
 #endif
 
+#include <asset.hpp>
+#include <system.hpp>
+#include <settings.hpp>
+#include <string.hpp>
+#include <plugin/Plugin.hpp>
+#include <app/common.hpp>
+
 
 namespace rack {
 namespace asset {
diff --git a/src/core/AudioInterface.cpp b/src/core/AudioInterface.cpp
index 1f65e69a..35d63338 100644
--- a/src/core/AudioInterface.cpp
+++ b/src/core/AudioInterface.cpp
@@ -1,12 +1,12 @@
-#include "plugin.hpp"
-#include <audio.hpp>
-#include <context.hpp>
 #include <mutex>
 #include <chrono>
 #include <thread>
-#include <mutex>
 #include <condition_variable>
 
+#include "plugin.hpp"
+#include <audio.hpp>
+#include <context.hpp>
+
 
 namespace rack {
 namespace core {
diff --git a/src/core/MIDI_CV.cpp b/src/core/MIDI_CV.cpp
index fe88bcfd..2ffe6c19 100644
--- a/src/core/MIDI_CV.cpp
+++ b/src/core/MIDI_CV.cpp
@@ -1,6 +1,7 @@
-#include "plugin.hpp"
 #include <algorithm>
 
+#include "plugin.hpp"
+
 
 namespace rack {
 namespace core {
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 2e38b62f..1d20a85e 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -1,11 +1,3 @@
-#include <engine/Engine.hpp>
-#include <settings.hpp>
-#include <system.hpp>
-#include <random.hpp>
-#include <context.hpp>
-#include <patch.hpp>
-#include <plugin.hpp>
-
 #include <algorithm>
 #include <thread>
 #include <condition_variable>
@@ -14,6 +6,14 @@
 #include <tuple>
 #include <pmmintrin.h>
 
+#include <engine/Engine.hpp>
+#include <settings.hpp>
+#include <system.hpp>
+#include <random.hpp>
+#include <context.hpp>
+#include <patch.hpp>
+#include <plugin.hpp>
+
 
 namespace rack {
 namespace engine {
diff --git a/src/keyboard.cpp b/src/keyboard.cpp
index 54a15f80..4ee8fa27 100644
--- a/src/keyboard.cpp
+++ b/src/keyboard.cpp
@@ -1,7 +1,8 @@
+#include <map>
+
 #include <keyboard.hpp>
 #include <midi.hpp>
 #include <window.hpp>
-#include <map>
 
 
 namespace rack {
diff --git a/src/logger.cpp b/src/logger.cpp
index 1ff81c6a..ab02d56c 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,8 +1,9 @@
+#include <mutex>
+
 #include <common.hpp>
 #include <asset.hpp>
 #include <settings.hpp>
 #include <system.hpp>
-#include <mutex>
 
 
 namespace rack {
diff --git a/src/midi.cpp b/src/midi.cpp
index 7bf39437..b5724058 100644
--- a/src/midi.cpp
+++ b/src/midi.cpp
@@ -1,8 +1,9 @@
+#include <map>
+#include <utility>
+
 #include <midi.hpp>
 #include <string.hpp>
 #include <system.hpp>
-#include <map>
-#include <utility>
 
 
 namespace rack {
diff --git a/src/network.cpp b/src/network.cpp
index c2663fef..1ffa4d97 100644
--- a/src/network.cpp
+++ b/src/network.cpp
@@ -1,8 +1,9 @@
-#include <network.hpp>
-#include <asset.hpp>
 #define CURL_STATICLIB
 #include <curl/curl.h>
 
+#include <network.hpp>
+#include <asset.hpp>
+
 
 namespace rack {
 namespace network {
diff --git a/src/patch.cpp b/src/patch.cpp
index d0242b04..4e0460a9 100644
--- a/src/patch.cpp
+++ b/src/patch.cpp
@@ -1,3 +1,7 @@
+#include <algorithm>
+
+#include <osdialog.h>
+
 #include <patch.hpp>
 #include <asset.hpp>
 #include <system.hpp>
@@ -8,9 +12,6 @@
 #include <app/RackWidget.hpp>
 #include <history.hpp>
 #include <settings.hpp>
-#include <algorithm>
-
-#include <osdialog.h>
 
 
 namespace rack {
diff --git a/src/plugin.cpp b/src/plugin.cpp
index 50684d77..7f11056e 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -1,25 +1,12 @@
-#include <plugin.hpp>
-#include <system.hpp>
-#include <network.hpp>
-#include <asset.hpp>
-#include <string.hpp>
-#include <context.hpp>
-#include <app/common.hpp>
-#include <plugin/callbacks.hpp>
-#include <settings.hpp>
-#include <engine/Module.hpp>
+#include <thread>
+#include <map>
+#include <stdexcept>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/param.h> // for MAXPATHLEN
 #include <fcntl.h>
-#include <thread>
-#include <map>
-#include <stdexcept>
-
-#include <jansson.h>
-
 #if defined ARCH_WIN
 	#include <windows.h>
 	#include <direct.h>
@@ -27,7 +14,20 @@
 	#include <dlfcn.h>
 #endif
 #include <dirent.h>
+
 #include <osdialog.h>
+#include <jansson.h>
+
+#include <plugin.hpp>
+#include <system.hpp>
+#include <network.hpp>
+#include <asset.hpp>
+#include <string.hpp>
+#include <context.hpp>
+#include <app/common.hpp>
+#include <plugin/callbacks.hpp>
+#include <settings.hpp>
+#include <engine/Module.hpp>
 
 
 namespace rack {
diff --git a/src/random.cpp b/src/random.cpp
index 7bc620d6..678e1e3d 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -1,8 +1,10 @@
-#include <random.hpp>
-#include <math.hpp>
+#include <atomic>
+
 #include <time.h>
 #include <sys/time.h>
-#include <atomic>
+
+#include <random.hpp>
+#include <math.hpp>
 
 
 namespace rack {
diff --git a/src/rtaudio.cpp b/src/rtaudio.cpp
index 72707e60..b26774a0 100644
--- a/src/rtaudio.cpp
+++ b/src/rtaudio.cpp
@@ -1,8 +1,3 @@
-#include <rtaudio.hpp>
-#include <audio.hpp>
-#include <string.hpp>
-#include <math.hpp>
-#include <system.hpp>
 #include <map>
 #include <algorithm>
 
@@ -13,6 +8,12 @@
 #include <RtAudio.h>
 #pragma GCC diagnostic pop
 
+#include <rtaudio.hpp>
+#include <audio.hpp>
+#include <string.hpp>
+#include <math.hpp>
+#include <system.hpp>
+
 
 namespace rack {
 
diff --git a/src/rtmidi.cpp b/src/rtmidi.cpp
index 7b93a4b7..e456470d 100644
--- a/src/rtmidi.cpp
+++ b/src/rtmidi.cpp
@@ -1,5 +1,3 @@
-#include <rtmidi.hpp>
-#include <midi.hpp>
 #include <map>
 
 #pragma GCC diagnostic push
@@ -9,6 +7,9 @@
 #include <rtmidi/RtMidi.h>
 #pragma GCC diagnostic pop
 
+#include <rtmidi.hpp>
+#include <midi.hpp>
+
 
 namespace rack {
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 7a90eb5c..db58545f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,3 +1,5 @@
+#include <jansson.h>
+
 #include <settings.hpp>
 #include <window.hpp>
 #include <plugin.hpp>
@@ -6,7 +8,6 @@
 #include <engine/Engine.hpp>
 #include <context.hpp>
 #include <patch.hpp>
-#include <jansson.h>
 
 
 namespace rack {
diff --git a/src/string.cpp b/src/string.cpp
index dde1dff5..d5b3e124 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -1,4 +1,3 @@
-#include <string.hpp>
 #include <locale> // for wstring_convert
 #include <codecvt> // for codecvt_utf8_utf16
 #include <cctype> // for tolower and toupper
@@ -6,6 +5,8 @@
 #include <libgen.h> // for dirname and basename
 #include <zlib.h>
 
+#include <string.hpp>
+
 
 namespace rack {
 namespace string {
diff --git a/src/system.cpp b/src/system.cpp
index 53eba432..82a8d2ba 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1,9 +1,7 @@
-#include <system.hpp>
-#include <string.hpp>
-
 #include <thread>
 #include <regex>
 #include <chrono>
+
 #include <dirent.h>
 #include <sys/stat.h>
 #include <cxxabi.h> // for __cxxabiv1::__cxa_demangle
@@ -31,6 +29,9 @@
 #define ZIP_STATIC
 #include <zip.h>
 
+#include <system.hpp>
+#include <string.hpp>
+
 
 namespace rack {
 namespace system {
diff --git a/src/tag.cpp b/src/tag.cpp
index 40aa91e4..a85383b3 100644
--- a/src/tag.cpp
+++ b/src/tag.cpp
@@ -1,6 +1,6 @@
+#include <map>
 #include <tag.hpp>
 #include <string.hpp>
-#include <map>
 
 
 namespace rack {
diff --git a/src/ui/Menu.cpp b/src/ui/Menu.cpp
index 577330fd..759fe184 100644
--- a/src/ui/Menu.cpp
+++ b/src/ui/Menu.cpp
@@ -1,5 +1,6 @@
 #include <ui/Menu.hpp>
 
+
 namespace rack {
 namespace ui {
 
diff --git a/src/ui/SequentialLayout.cpp b/src/ui/SequentialLayout.cpp
index 77519d2b..a28afd54 100644
--- a/src/ui/SequentialLayout.cpp
+++ b/src/ui/SequentialLayout.cpp
@@ -1,6 +1,7 @@
-#include <ui/SequentialLayout.hpp>
 #include <vector>
 
+#include <ui/SequentialLayout.hpp>
+
 
 namespace rack {
 namespace ui {
diff --git a/src/updater.cpp b/src/updater.cpp
index ebb77c28..e7938f9c 100644
--- a/src/updater.cpp
+++ b/src/updater.cpp
@@ -1,3 +1,5 @@
+#include <thread>
+
 #include <updater.hpp>
 #include <settings.hpp>
 #include <app/common.hpp>
@@ -6,7 +8,6 @@
 #include <context.hpp>
 #include <window.hpp>
 #include <asset.hpp>
-#include <thread>
 
 
 namespace rack {
diff --git a/src/widget/Widget.cpp b/src/widget/Widget.cpp
index 5e7f80e1..dfc94d02 100644
--- a/src/widget/Widget.cpp
+++ b/src/widget/Widget.cpp
@@ -1,6 +1,7 @@
+#include <algorithm>
+
 #include <widget/Widget.hpp>
 #include <context.hpp>
-#include <algorithm>
 
 
 namespace rack {
diff --git a/src/window.cpp b/src/window.cpp
index ac2a2161..11cb9339 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1,3 +1,15 @@
+#include <map>
+#include <queue>
+#include <thread>
+
+#if defined ARCH_MAC
+	// For CGAssociateMouseAndMouseCursorPosition
+	#include <ApplicationServices/ApplicationServices.h>
+#endif
+
+#include <stb_image_write.h>
+#include <osdialog.h>
+
 #include <window.hpp>
 #include <asset.hpp>
 #include <app/Scene.hpp>
@@ -10,18 +22,6 @@
 #include <plugin.hpp> // used in Window::screenshot
 #include <system.hpp> // used in Window::screenshot
 
-#include <map>
-#include <queue>
-#include <thread>
-
-#if defined ARCH_MAC
-	// For CGAssociateMouseAndMouseCursorPosition
-	#include <ApplicationServices/ApplicationServices.h>
-#endif
-
-#include <osdialog.h>
-#include <stb_image_write.h>
-
 
 namespace rack {