Cleanup includes more

include/color.hpp

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

include/dsp/digital.hpp

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "math.hpp"
 
 

include/dsp/filter.hpp

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "math.hpp"
 
 

include/dsp/fir.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "dsp/functions.hpp"
-#include "pffft.h"
+#include <pffft.h>
 
 
 namespace rack {

include/dsp/frame.hpp

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <stdlib.h>
 
 

include/dsp/functions.hpp

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "math.hpp"
 
 

include/dsp/minblep.hpp

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "math.hpp"
 
 

include/dsp/resampler.hpp

@@ -1,11 +1,10 @@
 #pragma once
-
-#include <assert.h>
-#include <string.h>
-#include <speex/speex_resampler.h>
 #include "frame.hpp"
 #include "ringbuffer.hpp"
 #include "fir.hpp"
+#include <assert.h>
+#include <string.h>
+#include <speex/speex_resampler.h>
 
 
 namespace rack {

include/dsp/ringbuffer.hpp

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

include/dsp/vumeter.hpp

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "math.hpp"
 
 

include/engine/Engine.hpp

@@ -1,8 +1,8 @@
 #pragma once
-#include <vector>
 #include "common.hpp"
 #include "engine/Module.hpp"
 #include "engine/Wire.hpp"
+#include <vector>
 
 
 namespace rack {

include/engine/Module.hpp

@@ -1,10 +1,10 @@
 #pragma once
-#include <vector>
 #include "common.hpp"
 #include "engine/Param.hpp"
 #include "engine/Input.hpp"
 #include "engine/Output.hpp"
 #include "engine/Light.hpp"
+#include <vector>
 #include <jansson.h>
 
 

include/rtmidi.hpp

@@ -7,7 +7,7 @@
 #ifndef __clang__
 #pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
-#include "rtmidi/RtMidi.h"
+#include <rtmidi/RtMidi.h>
 #pragma GCC diagnostic pop
 
 

include/ui/common.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "../common.hpp"
-#include "blendish.h"
+#include <blendish.h>
 
 #define CHECKMARK_STRING "✔"
 #define CHECKMARK(_cond) ((_cond) ? CHECKMARK_STRING : "")

include/widgets/Widget.hpp

@@ -1,10 +1,10 @@
 #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

@@ -4,10 +4,10 @@
 
 #include <memory>
 #define GLEW_STATIC
-#include "GL/glew.h"
-#include "GLFW/glfw3.h"
-#include "nanovg.h"
-#include "nanosvg.h"
+#include <GL/glew.h>
+#include <GLFW/glfw3.h>
+#include <nanovg.h>
+#include <nanosvg.h>
 
 
 #ifdef ARCH_MAC

src/Core/AudioInterface.cpp

@@ -1,13 +1,12 @@
-#include <assert.h>
+#include "Core.hpp"
+#include "audio.hpp"
+#include "dsp/resampler.hpp"
+#include "dsp/ringbuffer.hpp"
 #include <mutex>
 #include <chrono>
 #include <thread>
 #include <mutex>
 #include <condition_variable>
-#include "Core.hpp"
-#include "audio.hpp"
-#include "dsp/resampler.hpp"
-#include "dsp/ringbuffer.hpp"
 
 
 #define AUDIO_OUTPUTS 8

src/Core/MIDICCToCVInterface.cpp

@@ -1,8 +1,6 @@
 #include "Core.hpp"
 #include "midi.hpp"
 #include "dsp/filter.hpp"
-#include "window.hpp"
-#include "event.hpp"
 
 
 struct MIDICCToCVInterface : Module {

src/Core/MIDITriggerToCVInterface.cpp

@@ -1,6 +1,5 @@
 #include "Core.hpp"
 #include "midi.hpp"
-#include "engine/Engine.hpp"
 #include "event.hpp"
 
 

src/app/Scene.cpp

@@ -1,10 +1,10 @@
-#include <thread>
 #include "osdialog.h"
 #include "system.hpp"
 #include "network.hpp"
 #include "app/Scene.hpp"
 #include "app/ModuleBrowser.hpp"
 #include "app/RackScrollWidget.hpp"
+#include <thread>
 
 
 namespace rack {

src/engine/Engine.cpp

@@ -1,14 +1,13 @@
+#include "engine/Engine.hpp"
+
 #include <algorithm>
 #include <chrono>
 #include <thread>
 #include <condition_variable>
 #include <mutex>
-
 #include <xmmintrin.h>
 #include <pmmintrin.h>
 
-#include "engine/Engine.hpp"
-
 
 namespace rack {
 

src/main.cpp

@@ -11,8 +11,9 @@
 #include "app/Scene.hpp"
 #include "tags.hpp"
 #include "plugin/PluginManager.hpp"
+
 #include <unistd.h>
-#include "osdialog.h"
+#include <osdialog.h>
 
 #ifdef ARCH_WIN
 	#include <Windows.h>

src/midi.cpp

@@ -1,5 +1,5 @@
-#include "rack.hpp"
 #include "midi.hpp"
+#include "string.hpp"
 #include <map>
 
 

src/plugin/PluginManager.cpp

@@ -1,3 +1,11 @@
+#include "plugin/PluginManager.hpp"
+#include "system.hpp"
+#include "logger.hpp"
+#include "network.hpp"
+#include "asset.hpp"
+#include "string.hpp"
+#include "app/common.hpp"
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -18,15 +26,7 @@
 	#include <dlfcn.h>
 #endif
 #include <dirent.h>
-
-#include "plugin/PluginManager.hpp"
-#include "system.hpp"
-#include "logger.hpp"
-#include "network.hpp"
-#include "asset.hpp"
-#include "string.hpp"
-#include "app/common.hpp"
-#include "osdialog.h"
+#include <osdialog.h>
 
 
 namespace rack {

src/widgets/FramebufferWidget.cpp

@@ -1,6 +1,6 @@
 #include "widgets/FramebufferWidget.hpp"
-#include "nanovg_gl.h"
-#include "nanovg_gl_utils.h"
+#include <nanovg_gl.h>
+#include <nanovg_gl_utils.h>
 
 
 namespace rack {

src/window.cpp

@@ -15,21 +15,21 @@
 	#include <ApplicationServices/ApplicationServices.h>
 #endif
 
-#include "osdialog.h"
+#include <osdialog.h>
 
 #define NANOVG_GL2_IMPLEMENTATION 1
 // #define NANOVG_GL3_IMPLEMENTATION 1
 // #define NANOVG_GLES2_IMPLEMENTATION 1
 // #define NANOVG_GLES3_IMPLEMENTATION 1
-#include "nanovg_gl.h"
+#include <nanovg_gl.h>
 // Hack to get framebuffer objects working on OpenGL 2 (we blindly assume the extension is supported)
 #define NANOVG_FBO_VALID 1
-#include "nanovg_gl_utils.h"
+#include <nanovg_gl_utils.h>
 #define BLENDISH_IMPLEMENTATION
-#include "blendish.h"
+#include <blendish.h>
 #define NANOSVG_IMPLEMENTATION
 #define NANOSVG_ALL_COLOR_KEYWORDS
-#include "nanosvg.h"
+#include <nanosvg.h>
 
 
 namespace rack {