From 7e4db0a80e60135df148b764d506df2e143968c6 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 22 Sep 2020 13:33:05 +1000
Subject: [PATCH] Prefix other header includes

---
 src/Tk/tkImaging.c |  2 +-
 src/decode.c       | 16 ++++++++--------
 src/display.c      |  2 +-
 src/encode.c       | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c
index 161a835fbd2..a0d9d38eb2a 100644
--- a/src/Tk/tkImaging.c
+++ b/src/Tk/tkImaging.c
@@ -39,7 +39,7 @@
  * See the README file for information on usage and redistribution.
  */
 
-#include "Imaging.h"
+#include "../libImaging/Imaging.h"
 #include "_tkmini.h"
 
 #include <stdlib.h>
diff --git a/src/decode.c b/src/decode.c
index d647e8acec3..0ce381aa190 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -34,10 +34,10 @@
 
 #include "libImaging/Imaging.h"
 
-#include "Gif.h"
-#include "Raw.h"
-#include "Bit.h"
-#include "Sgi.h"
+#include "libImaging/Gif.h"
+#include "libImaging/Raw.h"
+#include "libImaging/Bit.h"
+#include "libImaging/Sgi.h"
 
 
 /* -------------------------------------------------------------------- */
@@ -509,7 +509,7 @@ PyImaging_HexDecoderNew(PyObject* self, PyObject* args)
 
 #ifdef HAVE_LIBTIFF
 
-#include "TiffDecode.h"
+#include "libImaging/TiffDecode.h"
 
 #include <string.h>
 
@@ -807,7 +807,7 @@ PyImaging_XbmDecoderNew(PyObject* self, PyObject* args)
 
 #ifdef HAVE_LIBZ
 
-#include "ZipCodecs.h"
+#include "libImaging/ZipCodecs.h"
 
 PyObject*
 PyImaging_ZipDecoderNew(PyObject* self, PyObject* args)
@@ -859,7 +859,7 @@ PyImaging_ZipDecoderNew(PyObject* self, PyObject* args)
 #undef  INT16
 #undef  INT32
 
-#include "Jpeg.h"
+#include "libImaging/Jpeg.h"
 
 PyObject*
 PyImaging_JpegDecoderNew(PyObject* self, PyObject* args)
@@ -916,7 +916,7 @@ PyImaging_JpegDecoderNew(PyObject* self, PyObject* args)
 
 #ifdef HAVE_OPENJPEG
 
-#include "Jpeg2K.h"
+#include "libImaging/Jpeg2K.h"
 
 PyObject*
 PyImaging_Jpeg2KDecoderNew(PyObject* self, PyObject* args)
diff --git a/src/display.c b/src/display.c
index 11686ff737a..2eb4a58556d 100644
--- a/src/display.c
+++ b/src/display.c
@@ -32,7 +32,7 @@
 
 #ifdef _WIN32
 
-#include "ImDib.h"
+#include "libImaging/ImDib.h"
 
 #if SIZEOF_VOID_P == 8
 #define F_HANDLE "K"
diff --git a/src/encode.c b/src/encode.c
index 5f65929f19b..41f28722c53 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -26,7 +26,7 @@
 #include "Python.h"
 
 #include "libImaging/Imaging.h"
-#include "Gif.h"
+#include "libImaging/Gif.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h> /* write */
@@ -578,7 +578,7 @@ PyImaging_XbmEncoderNew(PyObject* self, PyObject* args)
 
 #ifdef HAVE_LIBZ
 
-#include "ZipCodecs.h"
+#include "libImaging/ZipCodecs.h"
 
 PyObject*
 PyImaging_ZipEncoderNew(PyObject* self, PyObject* args)
@@ -648,7 +648,7 @@ PyImaging_ZipEncoderNew(PyObject* self, PyObject* args)
 
 #ifdef HAVE_LIBTIFF
 
-#include "TiffDecode.h"
+#include "libImaging/TiffDecode.h"
 
 #include <string.h>
 
@@ -975,7 +975,7 @@ PyImaging_LibTiffEncoderNew(PyObject* self, PyObject* args)
 #undef  INT16
 #undef  INT32
 
-#include "Jpeg.h"
+#include "libImaging/Jpeg.h"
 
 static unsigned int* get_qtables_arrays(PyObject* qtables, int* qtablesLen) {
     PyObject* tables;
@@ -1145,7 +1145,7 @@ PyImaging_JpegEncoderNew(PyObject* self, PyObject* args)
 
 #ifdef HAVE_OPENJPEG
 
-#include "Jpeg2K.h"
+#include "libImaging/Jpeg2K.h"
 
 static void
 j2k_decode_coord_tuple(PyObject *tuple, int *x, int *y)