diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47e0e01..ba70832 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,14 +19,21 @@ INCLUDE ("cmake-common/misc-macros.cmake")
 SET (SDL_BUILDING_LIBRARY ON)
 FIND_PACKAGE (SDL3 REQUIRED)
 
+IF (SDL3_FOUND)
+    MESSAGE (STATUS "SDL3 found")
+    get_target_property (SDL3_INCLUDE_DIRS SDL3::Headers INTERFACE_INCLUDE_DIRECTORIES)
+    SET (SAC2C_EXTRA_INC "-I${SDL3_INCLUDE_DIRS}")
+ENDIF ()
+
 # X11 is needed for X-forwarding over SSH
 FIND_PACKAGE (X11 QUIET)
 
 IF (X11_FOUND)
     MESSAGE (STATUS "X11 found")
     SET (SAC2C_CC_FLAGS "-DHAVE_X11")
-    SET (SAC2C_EXTRA_INC "-I${X11_INCLUDE_DIR}")
-    SET (SAC2C_CPP_INC "-Xl" "-lX11" "-Xtl" "-lX11")
+    SET (SAC2C_EXTRA_INC "${SAC2C_EXTRA_INC}" "-I${X11_INCLUDE_DIR}")
+    get_filename_component (X11_LIBRARY_PATH ${X11_X11_LIB} DIRECTORY)
+    SET (SAC2C_CPP_INC "-Xl" "-L${X11_LIBRARY_PATH}" "-Xl" "-lX11" "-Xtl" "-L${X11_LIBRARY_PATH}" "-Xtl" "-lX11")
 ENDIF ()
 
 # Check if sac2c suppports building generically