Change order of includes to C++ standard headers, library headers, and local project headers.

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 {

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 {

include/app/common.hpp

@@ -1,7 +1,8 @@
 #pragma once
+#include <jansson.h>
+
 #include <common.hpp>
 #include <math.hpp>
-#include <jansson.h>
 
 
 namespace rack {

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 {
 
 

include/color.hpp

@@ -1,7 +1,8 @@
 #pragma once
+#include <nanovg.h>
+
 #include <common.hpp>
 #include <string.hpp>
-#include <nanovg.h>
 
 
 namespace rack {

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 {
 

include/dsp/common.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <common.hpp>
 #include <math.hpp>
 #include <simd/functions.hpp>
 

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 {

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 {

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 {

include/dsp/ringbuffer.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include <dsp/common.hpp>
-#include <string.h>
 
 
 namespace rack {

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 {

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 {

include/engine/Param.hpp

@@ -1,7 +1,8 @@
 #pragma once
+#include <jansson.h>
+
 #include <common.hpp>
 #include <math.hpp>
-#include <jansson.h>
 
 
 namespace rack {

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

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 {

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 {
 

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 {
 

include/network.hpp

@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <jansson.h>
 
+#include <common.hpp>
+
 
 namespace rack {
 

include/patch.hpp

@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <jansson.h>
 
+#include <common.hpp>
+
 
 namespace rack {
 

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 {

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 {

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 {

include/rack.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-
 // The following headers are the "public" API of Rack.
 
 #include <common.hpp>

include/random.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include <common.hpp>
-#include <cstdint>
 
 
 namespace rack {

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 {
 

include/string.hpp

@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <vector>
 
+#include <common.hpp>
+
 
 namespace rack {
 

include/svg.hpp

@@ -1,8 +1,9 @@
 #pragma once
-#include <common.hpp>
 #include <nanovg.h>
 #include <nanosvg.h>
 
+#include <common.hpp>
+
 
 namespace rack {
 

include/system.hpp

@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <list>
 
+#include <common.hpp>
+
 
 namespace rack {
 

include/tag.hpp

@@ -1,7 +1,8 @@
 #pragma once
-#include <common.hpp>
 #include <vector>
 
+#include <common.hpp>
+
 
 namespace rack {
 namespace tag {

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 : "")

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 {

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 {
 

src/Quantity.cpp

@@ -1,6 +1,7 @@
+#include <tinyexpr.h>
+
 #include <Quantity.hpp>
 #include <string.hpp>
-#include <tinyexpr.h>
 
 
 namespace rack {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

src/core/MIDI_CV.cpp

@@ -1,6 +1,7 @@
-#include "plugin.hpp"
 #include <algorithm>
 
+#include "plugin.hpp"
+
 
 namespace rack {
 namespace core {

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 {

src/keyboard.cpp

@@ -1,7 +1,8 @@
+#include <map>
+
 #include <keyboard.hpp>
 #include <midi.hpp>
 #include <window.hpp>
-#include <map>
 
 
 namespace rack {

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 {

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 {

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 {

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 {

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 {

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 {

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 {
 

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 {
 

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 {

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 {

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 {

src/tag.cpp

@@ -1,6 +1,6 @@
+#include <map>
 #include <tag.hpp>
 #include <string.hpp>
-#include <map>
 
 
 namespace rack {

src/ui/Menu.cpp

@@ -1,5 +1,6 @@
 #include <ui/Menu.hpp>
 
+
 namespace rack {
 namespace ui {
 

src/ui/SequentialLayout.cpp

@@ -1,6 +1,7 @@
-#include <ui/SequentialLayout.hpp>
 #include <vector>
 
+#include <ui/SequentialLayout.hpp>
+
 
 namespace rack {
 namespace ui {

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 {

src/widget/Widget.cpp

@@ -1,6 +1,7 @@
+#include <algorithm>
+
 #include <widget/Widget.hpp>
 #include <context.hpp>
-#include <algorithm>
 
 
 namespace rack {

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 {