From 517c3e1c7f58bff42fd3f732bc45473b172e7e45 Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Sun, 15 Sep 2024 15:36:27 +0200
Subject: [PATCH] import global libs correctly

---
 src/_imaging.c                   | 6 ++----
 src/libImaging/ImagingPlatform.h | 6 ++----
 src/libImaging/Jpeg2KDecode.c    | 1 -
 src/libImaging/QuantPngQuant.c   | 6 +++---
 src/libImaging/ZipCodecs.h       | 2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/_imaging.c b/src/_imaging.c
index b84784caf..c100b103d 100644
--- a/src/_imaging.c
+++ b/src/_imaging.c
@@ -72,11 +72,11 @@
  */
 
 #ifdef HAVE_LIBJPEG
-#include "jconfig.h"
+#include <jconfig.h>
 #endif
 
 #ifdef HAVE_LIBZ
-#include "zlib.h"
+#include <zlib.h>
 #endif
 
 #ifdef HAVE_LIBTIFF
@@ -85,8 +85,6 @@
 
 #include "libImaging/Imaging.h"
 
-#include <stddef.h>
-
 #undef VERBOSE
 
 #define B16(p, i) ((((int)p[(i)]) << 8) + p[(i) + 1])
diff --git a/src/libImaging/ImagingPlatform.h b/src/libImaging/ImagingPlatform.h
index 3a3875daf..635ade21c 100644
--- a/src/libImaging/ImagingPlatform.h
+++ b/src/libImaging/ImagingPlatform.h
@@ -28,20 +28,18 @@
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
-
 #ifdef _WIN64
 #define F_HANDLE "K"
 #else
 #define F_HANDLE "k"
 #endif
-
 #endif /* _WIN32 */
 
+#include <stdint.h>
+
 /* We have to define types instead of using typedef because the JPEG lib also
    defines their own types with the same names, so we need to be able to undef
    ours before including the JPEG code. */
-#include <stdint.h>
-
 #define INT8 int8_t
 #define UINT8 uint8_t
 #define INT16 int16_t
diff --git a/src/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c
index fc927d2f0..052ab3e23 100644
--- a/src/libImaging/Jpeg2KDecode.c
+++ b/src/libImaging/Jpeg2KDecode.c
@@ -17,7 +17,6 @@
 
 #ifdef HAVE_OPENJPEG
 
-#include <stdlib.h>
 #include "Jpeg2K.h"
 
 typedef struct {
diff --git a/src/libImaging/QuantPngQuant.c b/src/libImaging/QuantPngQuant.c
index a2258c3a2..52f127515 100644
--- a/src/libImaging/QuantPngQuant.c
+++ b/src/libImaging/QuantPngQuant.c
@@ -8,15 +8,15 @@
  *
  */
 
+#ifdef HAVE_LIBIMAGEQUANT
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libimagequant.h>
 
 #include "QuantPngQuant.h"
 
-#ifdef HAVE_LIBIMAGEQUANT
-#include "libimagequant.h"
-
 int
 quantize_pngquant(
     Pixel *pixelData,
diff --git a/src/libImaging/ZipCodecs.h b/src/libImaging/ZipCodecs.h
index 50218b6c6..42f1a7101 100644
--- a/src/libImaging/ZipCodecs.h
+++ b/src/libImaging/ZipCodecs.h
@@ -7,7 +7,7 @@
  * Copyright (c) Fredrik Lundh 1996.
  */
 
-#include "zlib.h"
+#include <zlib.h>
 
 /* modes */
 #define ZIP_PNG 0            /* continuous, filtered image data */