egl/haiku: Cleanup includes; minor build fix

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26322>

src/egl/drivers/haiku/egl_haiku.cpp

@@ -46,8 +46,8 @@
 #include "util/u_atomic.h"
 #include <mapi/glapi/glapi.h>
 
+#include "hgl/hgl_sw_winsys.h"
 #include "hgl_context.h"
-#include "hgl_sw_winsys.h"
 
 extern "C" {
 #include "target-helpers/inline_sw_helper.h"

src/egl/meson.build

@@ -146,7 +146,11 @@ elif with_platform_haiku
     '-D_EGL_BUILT_IN_DRIVER_HAIKU',
   ]
   files_egl += files('drivers/haiku/egl_haiku.cpp')
-  incs_for_egl += [include_directories('../mapi', '../mesa', '../gallium/auxiliary', '../gallium/drivers', '../gallium/winsys', '../gallium/frontends/hgl', '../gallium/winsys/sw/hgl')]
+
+  incs_for_egl += [inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_gallium_winsys, inc_gallium_winsys_sw]
+  incs_for_egl += [inc_mesa, inc_mapi]
+  incs_for_egl += [include_directories('../gallium/frontends/hgl')]
+
   link_for_egl += [libmesa, libgallium, libswhgl, libsthgl]
   deps_for_egl += [cpp.find_library('be'), driver_swrast]
 elif with_platform_windows