diff --git a/setup.py b/setup.py
index b2129fbd4..4e07d0604 100755
--- a/setup.py
+++ b/setup.py
@@ -355,8 +355,6 @@ class pil_build_ext(build_ext):
         library_dirs = []
         include_dirs = []
 
-        _add_directory(include_dirs, "src/libImaging")
-
         pkg_config = None
         if _cmd_exists(os.environ.get("PKG_CONFIG", "pkg-config")):
             pkg_config = _pkg_config
@@ -765,7 +763,7 @@ class pil_build_ext(build_ext):
             self._remove_extension("PIL._webp")
 
         tk_libs = ["psapi"] if sys.platform == "win32" else []
-        self._update_extension("PIL._imagingtk", tk_libs, include_dirs=["src/Tk"])
+        self._update_extension("PIL._imagingtk", tk_libs)
 
         build_ext.build_extensions(self)
 
diff --git a/src/_imagingft.c b/src/_imagingft.c
index e64e959c6..4883f2bf8 100644
--- a/src/_imagingft.c
+++ b/src/_imagingft.c
@@ -49,7 +49,7 @@
 #define FT_ERROR_START_LIST  {
 #define FT_ERROR_END_LIST    { 0, 0 } };
 
-#include <raqm.h>
+#include "libImaging/raqm.h"
 
 #define LAYOUT_FALLBACK 0
 #define LAYOUT_RAQM 1