From 8464d2efd1529acd84e5f008bd75a1c95d2e0bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20du=20Hamel?= <stephduh@live.fr>
Date: Sat, 25 Oct 2025 21:21:02 +0200
Subject: [PATCH] Fix (most) clangd include-related warnings

---
 clip.hpp              | 1 +
 examples/cli/main.cpp | 2 --
 ggml_extend.hpp       | 8 ++------
 stable-diffusion.cpp  | 1 -
 util.cpp              | 3 +--
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/clip.hpp b/clip.hpp
index 296ca9aae..c4123b32c 100644
--- a/clip.hpp
+++ b/clip.hpp
@@ -1,6 +1,7 @@
 #ifndef __CLIP_HPP__
 #define __CLIP_HPP__
 
+#include <regex>
 #include "ggml_extend.hpp"
 #include "model.h"
 
diff --git a/examples/cli/main.cpp b/examples/cli/main.cpp
index 8f938c9b4..416c82997 100644
--- a/examples/cli/main.cpp
+++ b/examples/cli/main.cpp
@@ -4,8 +4,6 @@
 #include <filesystem>
 #include <functional>
 #include <iostream>
-#include <map>
-#include <random>
 #include <regex>
 #include <sstream>
 #include <string>
diff --git a/ggml_extend.hpp b/ggml_extend.hpp
index 66797941d..c8ecb4314 100644
--- a/ggml_extend.hpp
+++ b/ggml_extend.hpp
@@ -9,13 +9,9 @@
 #include <fstream>
 #include <functional>
 #include <iostream>
-#include <iterator>
 #include <map>
 #include <memory>
-#include <random>
-#include <regex>
 #include <set>
-#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -282,7 +278,7 @@ __STATIC_INLINE__ void ggml_tensor_diff(
     ggml_tensor_iter(a, [&](ggml_tensor* a, int64_t i0, int64_t i1, int64_t i2, int64_t i3) {
         float a_value = ggml_tensor_get_f32(a, i0, i1, i2, i3);
         float b_value = ggml_tensor_get_f32(b, i0, i1, i2, i3);
-        if (abs(a_value - b_value) > gap) {
+        if (std::abs(a_value - b_value) > gap) {
             LOG_WARN("[%ld, %ld, %ld, %ld] %f %f", i3, i2, i1, i0, a_value, b_value);
         }
     });
@@ -876,7 +872,7 @@ __STATIC_INLINE__ void sd_tiling_non_square(ggml_tensor* input,
     ggml_tensor* input_tile  = ggml_new_tensor_4d(tiles_ctx, GGML_TYPE_F32, input_tile_size_x, input_tile_size_y, input->ne[2], input->ne[3]);
     ggml_tensor* output_tile = ggml_new_tensor_4d(tiles_ctx, GGML_TYPE_F32, output_tile_size_x, output_tile_size_y, output->ne[2], output->ne[3]);
     int num_tiles            = num_tiles_x * num_tiles_y;
-    LOG_INFO("processing %i tiles", num_tiles);
+    LOG_DEBUG("processing %i tiles", num_tiles);
     pretty_progress(0, num_tiles, 0.0f);
     int tile_count = 1;
     bool last_y = false, last_x = false;
diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp
index f9fe8a5a3..d89090c68 100644
--- a/stable-diffusion.cpp
+++ b/stable-diffusion.cpp
@@ -10,7 +10,6 @@
 #include "control.hpp"
 #include "denoiser.hpp"
 #include "diffusion_model.hpp"
-#include "esrgan.hpp"
 #include "lora.hpp"
 #include "pmid.hpp"
 #include "tae.hpp"
diff --git a/util.cpp b/util.cpp
index d6d067525..11434f96e 100644
--- a/util.cpp
+++ b/util.cpp
@@ -5,12 +5,12 @@
 #include <cstdarg>
 #include <fstream>
 #include <locale>
+#include <regex>
 #include <sstream>
 #include <string>
 #include <thread>
 #include <unordered_set>
 #include <vector>
-#include "preprocessing.hpp"
 
 #if defined(__APPLE__) && defined(__MACH__)
 #include <sys/sysctl.h>
@@ -23,7 +23,6 @@
 #endif
 
 #include "ggml-cpu.h"
-#include "ggml.h"
 #include "stable-diffusion.h"
 
 #define STB_IMAGE_RESIZE_IMPLEMENTATION