diff --git a/include/dsp/window.hpp b/include/dsp/window.hpp
index 6e50413f..a6a5e1f8 100644
--- a/include/dsp/window.hpp
+++ b/include/dsp/window.hpp
@@ -1,5 +1,7 @@
 #pragma once
 #include <math.hpp>
+#include <simd/Vector.hpp>
+#include <simd/functions.hpp>
 
 
 namespace rack {
diff --git a/include/rack.hpp b/include/rack.hpp
index 46d87626..243f89ca 100644
--- a/include/rack.hpp
+++ b/include/rack.hpp
@@ -11,92 +11,100 @@
 #include <asset.hpp>
 #include <window/Window.hpp>
 #include <context.hpp>
+#include <audio.hpp>
 #include <midi.hpp>
 #include <settings.hpp>
 #include <helpers.hpp>
 #include <componentlibrary.hpp>
 
-#include <widget/event.hpp>
-#include <widget/Widget.hpp>
 #include <widget/TransparentWidget.hpp>
+#include <widget/OpenGlWidget.hpp>
 #include <widget/OpaqueWidget.hpp>
+#include <widget/FramebufferWidget.hpp>
 #include <widget/TransformWidget.hpp>
+#include <widget/event.hpp>
 #include <widget/ZoomWidget.hpp>
 #include <widget/SvgWidget.hpp>
-#include <widget/FramebufferWidget.hpp>
-#include <widget/OpenGlWidget.hpp>
+#include <widget/Widget.hpp>
 
-#include <ui/SequentialLayout.hpp>
-#include <ui/Label.hpp>
-#include <ui/List.hpp>
-#include <ui/MenuOverlay.hpp>
 #include <ui/Tooltip.hpp>
-#include <ui/TextField.hpp>
-#include <ui/PasswordField.hpp>
-#include <ui/ScrollWidget.hpp>
-#include <ui/Slider.hpp>
-#include <ui/Menu.hpp>
+#include <ui/MenuLabel.hpp>
 #include <ui/MenuEntry.hpp>
+#include <ui/List.hpp>
+#include <ui/TooltipOverlay.hpp>
+#include <ui/Slider.hpp>
+#include <ui/Scrollbar.hpp>
+#include <ui/ProgressBar.hpp>
 #include <ui/MenuSeparator.hpp>
-#include <ui/MenuLabel.hpp>
+#include <ui/MenuOverlay.hpp>
+#include <ui/Label.hpp>
+#include <ui/TextField.hpp>
+#include <ui/SequentialLayout.hpp>
 #include <ui/MenuItem.hpp>
 #include <ui/Button.hpp>
 #include <ui/ChoiceButton.hpp>
-#include <ui/RadioButton.hpp>
 #include <ui/OptionButton.hpp>
-#include <ui/ProgressBar.hpp>
+#include <ui/RadioButton.hpp>
+#include <ui/Menu.hpp>
+#include <ui/ScrollWidget.hpp>
+#include <ui/PasswordField.hpp>
 
-#include <app/AudioWidget.hpp>
+#include <app/SliderKnob.hpp>
+#include <app/MultiLightWidget.hpp>
+#include <app/MidiWidget.hpp>
 #include <app/CircularShadow.hpp>
-#include <app/Knob.hpp>
+#include <app/AudioWidget.hpp>
 #include <app/LedDisplay.hpp>
-#include <app/LightWidget.hpp>
-#include <app/MidiWidget.hpp>
 #include <app/ModuleLightWidget.hpp>
-#include <app/ModuleWidget.hpp>
-#include <app/MultiLightWidget.hpp>
-#include <app/ParamWidget.hpp>
-#include <app/PortWidget.hpp>
+#include <app/LightWidget.hpp>
 #include <app/RailWidget.hpp>
-#include <app/Scene.hpp>
+#include <app/PortWidget.hpp>
+#include <app/CableWidget.hpp>
+#include <app/Switch.hpp>
 #include <app/RackScrollWidget.hpp>
+#include <app/Knob.hpp>
+#include <app/Scene.hpp>
 #include <app/RackWidget.hpp>
-#include <app/SvgButton.hpp>
+#include <app/ParamWidget.hpp>
 #include <app/SvgKnob.hpp>
 #include <app/SvgPanel.hpp>
 #include <app/SvgPort.hpp>
+#include <app/SvgSwitch.hpp>
 #include <app/SvgScrew.hpp>
+#include <app/ModuleWidget.hpp>
 #include <app/SvgSlider.hpp>
-#include <app/SvgSwitch.hpp>
-#include <app/MenuBar.hpp>
-#include <app/CableWidget.hpp>
+#include <app/SvgButton.hpp>
 
-#include <engine/Engine.hpp>
 #include <engine/Param.hpp>
+#include <engine/ParamHandle.hpp>
+#include <engine/LightInfo.hpp>
+#include <engine/PortInfo.hpp>
+#include <engine/Light.hpp>
+#include <engine/Cable.hpp>
 #include <engine/Port.hpp>
+#include <engine/ParamQuantity.hpp>
 #include <engine/Module.hpp>
-#include <engine/Param.hpp>
-#include <engine/Cable.hpp>
+#include <engine/Engine.hpp>
 
 #include <plugin/Plugin.hpp>
 #include <plugin/Model.hpp>
 #include <plugin/callbacks.hpp>
 
-#include <dsp/common.hpp>
-#include <dsp/digital.hpp>
+#include <dsp/window.hpp>
+#include <dsp/ode.hpp>
+#include <dsp/minblep.hpp>
 #include <dsp/fft.hpp>
-#include <dsp/filter.hpp>
+#include <dsp/ringbuffer.hpp>
+#include <dsp/resampler.hpp>
 #include <dsp/fir.hpp>
+#include <dsp/approx.hpp>
 #include <dsp/midi.hpp>
-#include <dsp/minblep.hpp>
-#include <dsp/ode.hpp>
-#include <dsp/resampler.hpp>
-#include <dsp/ringbuffer.hpp>
 #include <dsp/vumeter.hpp>
-#include <dsp/window.hpp>
-#include <dsp/approx.hpp>
+#include <dsp/filter.hpp>
+#include <dsp/digital.hpp>
+#include <dsp/common.hpp>
 
-#include <simd/vector.hpp>
+#include <simd/Vector.hpp>
 #include <simd/functions.hpp>
 
 
diff --git a/include/simd/vector.hpp b/include/simd/Vector.hpp
similarity index 100%
rename from include/simd/vector.hpp
rename to include/simd/Vector.hpp
diff --git a/include/simd/functions.hpp b/include/simd/functions.hpp
index 1c22ce63..314ddd7c 100644
--- a/include/simd/functions.hpp
+++ b/include/simd/functions.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <simd/vector.hpp>
+#include <simd/Vector.hpp>
 #include <simd/sse_mathfun_extension.h>
 #include <common.hpp>
 #include <math.hpp>