Cleanup Includes/Add PushMessage(string, string)

source/DrawV2.cpp

@@ -1,6 +1,5 @@
 #include <citro2d.h>
 
-#include <algorithm>
 #include <renderd7/DrawV2.hpp>
 #include <renderd7/global_db.hpp>
 #include <renderd7/internal_db.hpp>
@@ -238,4 +237,4 @@ void Image(RenderD7::Image *img, const R7Vec2 &pos, const R7Vec2 &scale) {
     C2D_DrawImageAt(img->get(), pos.x, pos.y, 0.5f, nullptr, scale.x, scale.y);
 }
 }  // namespace Draw2
-}  // namespace RenderD7
+}  // namespace RenderD7

source/FileSystem.cpp

@@ -8,7 +8,6 @@
 // Debugging
 #include <algorithm>
 #include <filesystem>
-#include <memory>
 #include <renderd7/stringtool.hpp>
 
 bool ___dir__predicate__(const RenderD7::FileSystem::Entry &lhs,
@@ -68,4 +67,4 @@ RenderD7::FileSystem::GetDirContentsExt(
   }
   std::sort(res.begin(), res.end(), ___dir__predicate__);
   return res;
-}
+}

source/Memory.cpp

@@ -51,4 +51,4 @@ size_t GetTotalFreed() { return metrics.t_TotalFreed; }
 
 size_t GetCurrent() { return metrics.t_CurrentlyAllocated(); }
 }  // namespace Memory
-}  // namespace RenderD7
+}  // namespace RenderD7

source/Tasks.cpp

@@ -3,6 +3,7 @@
 #include <string.h>
 
 #include <renderd7/Tasks.hpp>
+#include <vector>
 
 static std::vector<Thread> threads;
 
@@ -19,4 +20,4 @@ void RenderD7::Tasks::destroy(void) {
     threadJoin(threads.at(i), U64_MAX);
     threadFree(threads.at(i));
   }
-}
+}

source/Time.cpp

@@ -4,7 +4,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <fstream>
 #include <memory>
 #include <renderd7/Time.hpp>
 #include <string>

source/internal_db.cpp

@@ -1,5 +1,4 @@
 #include <arpa/inet.h>
-#include <errno.h>
 #include <malloc.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -7,7 +6,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <filesystem>
 #include <renderd7/FileSystem.hpp>
 #include <renderd7/external/json.hpp>
 #include <renderd7/renderd7.hpp>
@@ -253,4 +251,4 @@ void ServerThread(RenderD7::Parameter param) {
 void IdbServer() {
   rd7i_idb_server.initialize(ServerThread);
   rd7i_idb_server.start(true);
-}
+}

source/nimg.cpp

@@ -1,15 +1,13 @@
-#include <filesystem>
 #include <fstream>
-#include <map>
+#include <iostream>
 #include <renderd7/nimg.hpp>
-#include <sstream>
 
 // Use an Npi simplifier cause I am lazy
 #define reca_cc(x) reinterpret_cast<const char*>(x)
 #define reca_c(x) reinterpret_cast<char*>(x)
-#define pak32(q, w, e, r)                                       \
-  ((((q)&0xff) << 0) | (((w)&0xff) << 8) | (((e)&0xff) << 16) | \
-   (((r)&0xff) << 24))
+#define pak32(q, w, e, r)                                             \
+  ((((q) & 0xff) << 0) | (((w) & 0xff) << 8) | (((e) & 0xff) << 16) | \
+   (((r) & 0xff) << 24))
 
 // Stupid RLE Algorithm
 void npi_compress(std::vector<unsigned char>& ret,
@@ -116,4 +114,4 @@ void NIMG_Save(nimg image, std::string path) {
   // Close stream
   fout.close();
 }
-}  // namespace RenderD7
+}  // namespace RenderD7

source/renderd7.cpp

@@ -1,4 +1,3 @@
-#include <regex>
 #include <renderd7/DrawV2.hpp>  // Switch to Draw2
 #include <renderd7/Hid.hpp>     // Integate HidApi
 #include <renderd7/Message.hpp>
@@ -12,6 +11,10 @@
 #include <renderd7/external/json.hpp>
 #include <renderd7/internal_db.hpp>
 
+// C++ includes
+#include <filesystem>
+#include <random>
+
 static void RD7i_ExitHook() {
   C2D_TextBufDelete(rd7i_text_buffer);
   C2D_TextBufDelete(rd7i_d2_dimbuf);
@@ -599,10 +602,10 @@ void RenderD7::RSettings::Draw(void) const {
     // List Bg
     for (int i = 0; i < 12; i++) {
       if ((i % 2 == 0))
-        RenderD7::Draw2::RFS(R7Vec2(0, 40 + (i)*15), R7Vec2(400, 15),
+        RenderD7::Draw2::RFS(R7Vec2(0, 40 + (i) * 15), R7Vec2(400, 15),
                              RenderD7::StyleColor(RD7Color_List0));
       else
-        RenderD7::Draw2::RFS(R7Vec2(0, 40 + (i)*15), R7Vec2(400, 15),
+        RenderD7::Draw2::RFS(R7Vec2(0, 40 + (i) * 15), R7Vec2(400, 15),
                              RenderD7::StyleColor(RD7Color_List1));
     }
 
@@ -821,4 +824,4 @@ float RenderD7::GetTime() { return rd7i_time; }
 
 std::string RenderD7::GetAppDirectory() {
   return "sdmc:/RenderD7/Apps/" + rd7i_app_name;
-}
+}