matplotlib · ksunden · Mar 12, 2024 · Feb 23, 2024
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -4,7 +4,6 @@
 
 #include <Python.h>
 #include "_backend_agg.h"
-#include "mplutils.h"
 
 RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi)
     : width(width),

diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -7,14 +7,15 @@
 #define MPL_BACKEND_AGG_H
 
 #include <cmath>
-#include <vector>
 #include <algorithm>
 
 #include "agg_alpha_mask_u8.h"
 #include "agg_conv_curve.h"
 #include "agg_conv_dash.h"
 #include "agg_conv_stroke.h"
+#include "agg_conv_transform.h"
 #include "agg_image_accessors.h"
+#include "agg_path_storage.h"
 #include "agg_pixfmt_amask_adaptor.h"
 #include "agg_pixfmt_gray.h"
 #include "agg_pixfmt_rgba.h"
@@ -25,7 +26,6 @@
 #include "agg_scanline_bin.h"
 #include "agg_scanline_p.h"
 #include "agg_scanline_storage_aa.h"
-#include "agg_scanline_storage_bin.h"
 #include "agg_scanline_u.h"
 #include "agg_span_allocator.h"
 #include "agg_span_converter.h"
@@ -34,7 +34,6 @@
 #include "agg_span_image_filter_rgba.h"
 #include "agg_span_interpolator_linear.h"
 #include "agg_span_pattern_rgba.h"
-#include "util/agg_color_conv_rgb8.h"
 
 #include "_backend_agg_basic_types.h"
 #include "path_converters.h"

diff --git a/src/_backend_agg_basic_types.h b/src/_backend_agg_basic_types.h
@@ -8,6 +8,7 @@
 
 #include "agg_color_rgba.h"
 #include "agg_math_stroke.h"
+#include "agg_trans_affine.h"
 #include "path_converters.h"
 
 #include "py_adaptors.h"

diff --git a/src/_image_resample.h b/src/_image_resample.h
@@ -6,7 +6,6 @@
 #include "agg_image_accessors.h"
 #include "agg_path_storage.h"
 #include "agg_pixfmt_gray.h"
-#include "agg_pixfmt_rgb.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_renderer_base.h"
 #include "agg_renderer_scanline.h"

diff --git a/src/_path.h b/src/_path.h
@@ -14,7 +14,6 @@
 #include "agg_conv_curve.h"
 #include "agg_conv_stroke.h"
 #include "agg_conv_transform.h"
-#include "agg_path_storage.h"
 #include "agg_trans_affine.h"
 
 #include "path_converters.h"

diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -10,12 +10,10 @@
 // you can get it at https://python-pillow.org/
 
 #include <Python.h>
-#include <memory>
 #include <new>
 #include <stdexcept>
 #include <string>
 #include <tuple>
-#include <vector>
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
@@ -48,6 +46,8 @@ static inline PyObject *PyErr_SetFromWindowsErr(int ierr) {
 #endif
 
 #ifdef WIN32_DLL
+#include <vector>
+
 #include <windows.h>
 #include <commctrl.h>
 #define PSAPI_VERSION 1

diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -5,8 +5,8 @@
 
   Python wrapper for TrueType conversion library in ../ttconv.
  */
+
 #include <pybind11/pybind11.h>
-#include "mplutils.h"
 #include "pprdrv.h"
 #include <vector>
 

diff --git a/src/array.h b/src/array.h
@@ -6,6 +6,9 @@
 #ifndef MPL_SCALAR_H
 #define MPL_SCALAR_H
 
+#include <cstddef>
+#include <stdexcept>
+
 namespace array
 {
 

diff --git a/src/ft2font.h b/src/ft2font.h
@@ -9,10 +9,10 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
-#include <vector>
-#include<set>
-#include <stdint.h>
+#include <cstdint>
+#include <set>
 #include <unordered_map>
+#include <vector>
 
 extern "C" {
 #include <ft2build.h>

diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -2,13 +2,11 @@
 #include "ft2font.h"
 #include "py_converters.h"
 #include "py_exceptions.h"
-#include "numpy_cpp.h"
 
 // From Python
 #include <structmember.h>
 
 #include <set>
-#include <algorithm>
 
 static PyObject *convert_xys_to_array(std::vector<double> &xys)
 {

diff --git a/src/mplutils.h b/src/mplutils.h
@@ -7,7 +7,6 @@
 #define PY_SSIZE_T_CLEAN
 
 #include <Python.h>
-#include <stdint.h>
 
 #ifdef _POSIX_C_SOURCE
 #    undef _POSIX_C_SOURCE

diff --git a/src/path_converters.h b/src/path_converters.h
@@ -4,8 +4,8 @@
 #define MPL_PATH_CONVERTERS_H
 
 #include <cmath>
-#include <stdint.h>
-#include "agg_path_storage.h"
+#include <cstdint>
+
 #include "agg_clip_liang_barsky.h"
 #include "mplutils.h"
 #include "agg_conv_segmentator.h"

diff --git a/src/py_adaptors.h b/src/py_adaptors.h
@@ -12,6 +12,7 @@
 
 #include "numpy/arrayobject.h"
 
+#include "agg_basics.h"
 #include "py_exceptions.h"
 
 extern "C" {