refactor library includes, build file

21 files changed, 64 insertions, 42 deletions

diff --git a/src/administration.cpp b/src/administration.cpp
index 9b0144e..f69ae9d 100644
--- a/src/administration.cpp
+++ b/src/administration.cpp
@@ -14,8 +14,8 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <assert.h>
 #include <time.h>
+#include <assert.h>
 
 #include "memops.hpp"
 #include "logger.hpp"
diff --git a/src/administration_reader.cpp b/src/administration_reader.cpp
index 0b5c233..e481c10 100644
--- a/src/administration_reader.cpp
+++ b/src/administration_reader.cpp
@@ -14,9 +14,10 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <zip.h>
-#include <xml.h>
 #include <time.h>
+#include <zip/src/zip.h>
+#include <xml.c/src/xml.h>
+#include <tinyfiledialogs/tinyfiledialogs.h>
 
 #include "logger.hpp"
 #include "strops.hpp"
@@ -24,7 +25,6 @@
 #include "locales.hpp"
 #include "administration_reader.hpp"
 #include "administration_writer.hpp"
-#include "tinyfiledialogs.h"
 
 bool administration_reader::open_new()
 {
diff --git a/src/administration_writer.cpp b/src/administration_writer.cpp
index c1637f4..e0a6ae7 100644
--- a/src/administration_writer.cpp
+++ b/src/administration_writer.cpp
@@ -14,20 +14,20 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <zip.h>
-#include <xml.h>
 #include <threads.h>
+#include <zip/src/zip.h>
+#include <xml.c/src/xml.h>
+#include <tinyfiledialogs/tinyfiledialogs.h>
 
+#include "ui.hpp"
 #include "config.hpp"
 #include "memops.hpp"
 #include "logger.hpp"
-#include "ui.hpp"
 #include "locales.hpp"
 #include "strops.hpp"
+#include "file_templates.hpp"
 #include "administration_reader.hpp"
 #include "administration_writer.hpp"
-#include "tinyfiledialogs.h"
-#include "file_templates.hpp"
 
 static mtx_t _save_file_mutex;
 static bool _is_writing = false;
diff --git a/src/exporter.cpp b/src/exporter.cpp
index e296973..74c77c1 100644
--- a/src/exporter.cpp
+++ b/src/exporter.cpp
@@ -14,10 +14,11 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+
 #include <threads.h>
+#include <cpp-httplib/httplib.h>
 
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "httplib.h"
 #include "logger.hpp"
 #include "strops.hpp"
 #include "memops.hpp"
diff --git a/src/importer.cpp b/src/importer.cpp
index 0ae0d79..fd3e90e 100644
--- a/src/importer.cpp
+++ b/src/importer.cpp
@@ -14,10 +14,11 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+
 #include <threads.h>
+#include <cpp-httplib/httplib.h>
 
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "httplib.h"
 #include "logger.hpp"
 #include "strops.hpp"
 #include "memops.hpp"
diff --git a/src/logger.cpp b/src/logger.cpp
index e2c33e2..40fdfc8 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -15,8 +15,8 @@
 */
 
 #include <time.h>
+#include <timer_lib/timer.h>
 
-#include "timer.h"
 #include "memops.hpp"
 #include "strops.hpp"
 #include "logger.hpp"
diff --git a/src/main_linux.cpp b/src/main_linux.cpp
index 9e91f7c..5c36209 100644
--- a/src/main_linux.cpp
+++ b/src/main_linux.cpp
@@ -11,22 +11,22 @@
 // **Prefer using the code in the example_glfw_opengl2/ folder**
 // See imgui_impl_glfw.cpp for details.
 
-#include "imgui.h"
-#include "imgui_impl_glfw.h"
-#include "imgui_impl_opengl2.h"
+#include <imgui/imgui.h>
+#include <imgui/backends/imgui_impl_glfw.h>
+#include <imgui/backends/imgui_impl_opengl2.h>
 #include <stdio.h>
 #ifdef __APPLE__
 #define GL_SILENCE_DEPRECATION
 #endif
 #include <GLFW/glfw3.h>
+#include <timer_lib/timer.h>
+#include <IconFontCppHeaders/IconsFontAwesome5.h>
 
-#include "timer.h"
 #include "ui.hpp"
 #include "administration.hpp"
 #include "administration_writer.hpp"
 #include "administration_reader.hpp"
 
-#include "IconFontCppHeaders/IconsFontAwesome5.h"
 
 // [Win32] Our example includes a copy of glfw3.lib pre-compiled with VS2010 to maximize ease of testing and compatibility with old VS compilers.
 // To link with VS2010-era libraries, VS2015+ requires linking with legacy_stdio_definitions.lib, which we do using this pragma.
diff --git a/src/main_windows.cpp b/src/main_windows.cpp
index 974949b..47c9a42 100644
--- a/src/main_windows.cpp
+++ b/src/main_windows.cpp
@@ -16,12 +16,12 @@
 
 #ifdef win64
 
-#include "imgui.h"
+#include "imgui/imgui.h"
 #include "imgui_impl_win32.h"
 #include "imgui_impl_dx11.h"
 #include <d3d11.h>
 #include <tchar.h>
-#include "timer.h"
+#include "timer_lib/timer.h"
 #include "ui.hpp"
 #include "administration.hpp"
 #include "administration_writer.hpp"
diff --git a/src/providers/DeepSeek.cpp b/src/providers/DeepSeek.cpp
index 8a5b42e..2fc73c9 100644
--- a/src/providers/DeepSeek.cpp
+++ b/src/providers/DeepSeek.cpp
@@ -15,7 +15,8 @@
 */
 
 #define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "httplib.h"
+#include <cpp-httplib/httplib.h>
+
 #include "strops.hpp"
 #include "memops.hpp"
 #include "logger.hpp"
diff --git a/src/providers/MailerSend.cpp b/src/providers/MailerSend.cpp
index 122b7b2..ab07907 100644
--- a/src/providers/MailerSend.cpp
+++ b/src/providers/MailerSend.cpp
@@ -15,7 +15,7 @@
 */
 
 #define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "httplib.h"
+#include <cpp-httplib/httplib.h>
 
 #include "memops.hpp"
 #include "strops.hpp"
diff --git a/src/providers/openAI.cpp b/src/providers/openAI.cpp
index 6c60541..62a2ae8 100644
--- a/src/providers/openAI.cpp
+++ b/src/providers/openAI.cpp
@@ -14,10 +14,10 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <threads.h>
-
 #define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "httplib.h"
+
+#include <threads.h>
+#include <cpp-httplib/httplib.h>
 
 #include "memops.hpp"
 #include "strops.hpp"
diff --git a/src/ui/imgui_extensions.cpp b/src/ui/imgui_extensions.cpp
index 4268746..b3fc748 100644
--- a/src/ui/imgui_extensions.cpp
+++ b/src/ui/imgui_extensions.cpp
@@ -1,4 +1,21 @@
+/*
+* Copyright (c) 2025 Aldrik Ramaekers <aldrik.ramaekers@gmail.com>
+* 
+* Permission to use, copy, modify, and/or distribute this software for any
+* purpose with or without fee is hereby granted, provided that the above
+* copyright notice and this permission notice appear in all copies.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
 #include <time.h>
+#include <tinyfiledialogs/tinyfiledialogs.h>
 
 #include "ui.hpp"
 #include "strops.hpp"
@@ -6,7 +23,6 @@
 #include "config.hpp"
 #include "locales.hpp"
 #include "countries.hpp"
-#include "tinyfiledialogs.h"
 #include "administration.hpp"
 #include "administration_writer.hpp"
 
diff --git a/src/ui/ui_contacts.cpp b/src/ui/ui_contacts.cpp
index f3581dd..b1fa01b 100644
--- a/src/ui/ui_contacts.cpp
+++ b/src/ui/ui_contacts.cpp
@@ -14,8 +14,9 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <imgui/imgui.h>
+
 #include "ui.hpp"
-#include "imgui.h"
 #include "strops.hpp"
 #include "config.hpp"
 #include "memops.hpp"
diff --git a/src/ui/ui_earnings.cpp b/src/ui/ui_earnings.cpp
index afe0210..b93bd75 100644
--- a/src/ui/ui_earnings.cpp
+++ b/src/ui/ui_earnings.cpp
@@ -14,9 +14,9 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <imgui/imgui.h>
 
 #include "ui.hpp"
-#include "imgui.h"
 #include "memops.hpp"
 #include "locales.hpp"
 #include "administration.hpp"
diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index 45a0646..1e74508 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -15,10 +15,10 @@
 */
 
 #include <time.h>
+#include <imgui/imgui.h>
 #include <ImGuiDatePicker/ImGuiDatePicker.hpp>
 
 #include "ui.hpp"
-#include "imgui.h"
 #include "memops.hpp"
 #include "strops.hpp"
 #include "locales.hpp"
diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 78e5b31..06f1456 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -15,10 +15,10 @@
 */
 
 #include <time.h>
+#include <imgui/imgui.h>
 #include <ImGuiDatePicker/ImGuiDatePicker.hpp>
 
 #include "ui.hpp"
-#include "imgui.h"
 #include "memops.hpp"
 #include "config.hpp"
 #include "strops.hpp"
diff --git a/src/ui/ui_log.cpp b/src/ui/ui_log.cpp
index 1f4aa84..08cb803 100644
--- a/src/ui/ui_log.cpp
+++ b/src/ui/ui_log.cpp
@@ -14,8 +14,9 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <imgui/imgui.h>
+
 #include "ui.hpp"
-#include "imgui.h"
 #include "logger.hpp"
 #include "locales.hpp"
 
diff --git a/src/ui/ui_main.cpp b/src/ui/ui_main.cpp
index ed6fbec..0fff65d 100644
--- a/src/ui/ui_main.cpp
+++ b/src/ui/ui_main.cpp
@@ -14,11 +14,12 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <imgui/imgui.h>
+#include <tinyfiledialogs/tinyfiledialogs.h>
+
 #include "ui.hpp"
-#include "imgui.h"
 #include "administration.hpp"
 #include "locales.hpp"
-#include "tinyfiledialogs.h"
 #include "administration_writer.hpp"
 #include "administration_reader.hpp"
 
diff --git a/src/ui/ui_projects.cpp b/src/ui/ui_projects.cpp
index b3241f4..a43cd9b 100644
--- a/src/ui/ui_projects.cpp
+++ b/src/ui/ui_projects.cpp
@@ -14,8 +14,9 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <imgui/imgui.h>
+
 #include "ui.hpp"
-#include "imgui.h"
 #include "administration.hpp"
 #include "administration_writer.hpp"
 #include "locales.hpp"
diff --git a/src/ui/ui_setup.cpp b/src/ui/ui_setup.cpp
index 8693b60..069c336 100644
--- a/src/ui/ui_setup.cpp
+++ b/src/ui/ui_setup.cpp
@@ -14,19 +14,18 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <GLFW/glfw3.h>
+#include <imgui/imgui.h>
+#include <IconFontCppHeaders/IconsFontAwesome5.h>
+
 #include "ui.hpp"
-#include "imgui.h"
 #include "strops.hpp"
 #include "config.hpp"
 #include "locales.hpp"
 #include "administration_writer.hpp"
 #include "administration_reader.hpp"
 
-#include <GLFW/glfw3.h>
-
-#include "stb/stb_image.h"
-
-#include "IconFontCppHeaders/IconsFontAwesome5.h"
+#include <stb/stb_image.h>
 
 int ui::load_image(const char* filename)
 {
diff --git a/src/ui/ui_tax.cpp b/src/ui/ui_tax.cpp
index 1b1e374..f4176a6 100644
--- a/src/ui/ui_tax.cpp
+++ b/src/ui/ui_tax.cpp
@@ -14,9 +14,9 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <imgui/imgui.h>
 
 #include "ui.hpp"
-#include "imgui.h"
 #include "memops.hpp"
 #include "strops.hpp"
 #include "locales.hpp"