Clean up includes

include/audio.hpp

@@ -1,5 +1,5 @@
 #pragma once
-
+#include "common.hpp"
 #include <jansson.h>
 
 #pragma GCC diagnostic push
@@ -9,8 +9,6 @@
 #include <RtAudio.h>
 #pragma GCC diagnostic pop
 
-#include "common.hpp"
-
 
 namespace rack {
 

include/event.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include "common.hpp"
 #include "math.hpp"
 #include <vector>
 

include/keyboard.hpp

@@ -1,7 +1,7 @@
 #pragma once
-#include <map>
 #include "common.hpp"
 #include "midi.hpp"
+#include <map>
 
 
 namespace rack {

include/math.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include <algorithm> // for std::min, max
 #include "common.hpp"
+#include <algorithm> // for std::min, max
 
 
 namespace rack {

include/midi.hpp

@@ -1,9 +1,9 @@
 #pragma once
+#include "common.hpp"
 #include <vector>
 #include <queue>
 #include <set>
 #include <jansson.h>
-#include "common.hpp"
 
 
 namespace rack {

include/network.hpp

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

include/rack0.hpp

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

include/random.hpp

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

include/rtmidi.hpp

@@ -1,5 +1,5 @@
 #pragma once
-
+#include "common.hpp"
 #include "midi.hpp"
 #include <map>
 

include/string.hpp

@@ -1,8 +1,5 @@
 #pragma once
-
 #include "common.hpp"
-#include <algorithm> // for transform
-#include <libgen.h> // for dirname and basename
 
 
 namespace rack {

include/system.hpp

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

include/tags.hpp

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

include/window.hpp

@@ -1,4 +1,7 @@
 #pragma once
+#include "common.hpp"
+#include "math.hpp"
+
 #include <memory>
 #define GLEW_STATIC
 #include "GL/glew.h"
@@ -6,9 +9,6 @@
 #include "nanovg.h"
 #include "nanosvg.h"
 
-#include "common.hpp"
-#include "math.hpp"
-
 
 #ifdef ARCH_MAC
 	#define WINDOW_MOD_KEY_NAME "Cmd"

src/asset.cpp

@@ -1,3 +1,6 @@
+#include "asset.hpp"
+#include "system.hpp"
+
 #if ARCH_MAC
 	#include <CoreFoundation/CoreFoundation.h>
 	#include <pwd.h>
@@ -15,9 +18,6 @@
 	#include <pwd.h>
 #endif
 
-#include "asset.hpp"
-#include "system.hpp"
-
 
 namespace rack {
 namespace asset {

src/audio.cpp

@@ -1,5 +1,7 @@
-#include "rack.hpp"
 #include "audio.hpp"
+#include "logger.hpp"
+#include "string.hpp"
+#include "math.hpp"
 #include "bridge.hpp"
 
 

src/bridge.cpp

@@ -1,3 +1,8 @@
+#include "bridge.hpp"
+#include "string.hpp"
+#include "logger.hpp"
+#include "dsp/ringbuffer.hpp"
+
 #include <unistd.h>
 #if ARCH_WIN
 	#include <winsock2.h>
@@ -11,10 +16,6 @@
 
 #include <thread>
 
-#include "rack.hpp"
-#include "bridge.hpp"
-#include "dsp/ringbuffer.hpp"
-
 
 namespace rack {
 

src/gamepad.cpp

@@ -1,5 +1,6 @@
-#include "rack.hpp"
 #include "gamepad.hpp"
+#include "string.hpp"
+#include "window.hpp"
 
 
 namespace rack {

src/keyboard.cpp

@@ -1,5 +1,5 @@
-#include "rack.hpp"
 #include "keyboard.hpp"
+#include "window.hpp"
 
 
 namespace rack {

src/logger.cpp

@@ -1,6 +1,6 @@
-#include <chrono>
 #include "logger.hpp"
 #include "asset.hpp"
+#include <chrono>
 
 
 namespace rack {

src/main.cpp

@@ -1,5 +1,4 @@
-#include <unistd.h>
-#include "osdialog.h"
+#include "common.hpp"
 #include "random.hpp"
 #include "logger.hpp"
 #include "asset.hpp"
@@ -12,6 +11,8 @@
 #include "app/Scene.hpp"
 #include "tags.hpp"
 #include "plugin/PluginManager.hpp"
+#include <unistd.h>
+#include "osdialog.h"
 
 #ifdef ARCH_WIN
 	#include <Windows.h>

src/midi.cpp

@@ -1,9 +1,6 @@
 #include "rack.hpp"
 #include "midi.hpp"
-#include "rtmidi.hpp"
-#include "bridge.hpp"
-#include "gamepad.hpp"
-#include "keyboard.hpp"
+#include <map>
 
 
 namespace rack {

src/network.cpp

@@ -1,9 +1,8 @@
+#include "network.hpp"
 #define CURL_STATICLIB
 #include <curl/curl.h>
 #include <openssl/sha.h>
 
-#include "network.hpp"
-
 
 namespace rack {
 namespace network {

src/random.cpp

@@ -1,7 +1,7 @@
-#include <time.h>
-#include <sys/time.h>
 #include "random.hpp"
 #include "math.hpp"
+#include <time.h>
+#include <sys/time.h>
 
 
 namespace rack {

src/rtmidi.cpp

@@ -1,6 +1,5 @@
-#include <map>
-#include "rack.hpp"
 #include "rtmidi.hpp"
+#include <map>
 
 
 namespace rack {

src/string.cpp

@@ -1,4 +1,6 @@
 #include "string.hpp"
+#include <algorithm> // for transform
+#include <libgen.h> // for dirname and basename
 
 
 namespace rack {

src/system.cpp

@@ -1,3 +1,4 @@
+#include "system.hpp"
 #include <dirent.h>
 #include <sys/stat.h>
 
@@ -6,8 +7,6 @@
 	#include <shellapi.h>
 #endif
 
-#include "system.hpp"
-
 
 namespace rack {
 namespace system {

src/window.cpp

@@ -1,3 +1,11 @@
+#include "window.hpp"
+#include "logger.hpp"
+#include "asset.hpp"
+#include "app/Scene.hpp"
+#include "keyboard.hpp"
+#include "gamepad.hpp"
+#include "event.hpp"
+
 #include <map>
 #include <queue>
 #include <thread>
@@ -7,16 +15,8 @@
 	#include <ApplicationServices/ApplicationServices.h>
 #endif
 
-
 #include "osdialog.h"
 
-#include "logger.hpp"
-#include "asset.hpp"
-#include "app/Scene.hpp"
-#include "keyboard.hpp"
-#include "gamepad.hpp"
-#include "event.hpp"
-
 #define NANOVG_GL2_IMPLEMENTATION 1
 // #define NANOVG_GL3_IMPLEMENTATION 1
 // #define NANOVG_GLES2_IMPLEMENTATION 1