diff --git a/docs/sourcetree.html b/docs/sourcetree.html
index 8825cd6580b..0e726cf89b9 100644
--- a/docs/sourcetree.html
+++ b/docs/sourcetree.html
@@ -77,7 +77,7 @@ each directory.
     <li><b>program</b> - Vertex/fragment shader and GLSL compiler code
     <li><b>sparc</b> - Assembly code/optimizations for SPARC systems
         (not used with Gallium)
-    <li><b>state_tracker</b> - State tracker / driver for Gallium.  This
+    <li><b>state_tracker</b> - Translator from Mesa to Gallium.  This
         is basically a Mesa device driver that speaks to Gallium.  This
         directory may be moved to src/mesa/drivers/gallium at some point.
     <li><b>swrast</b> - Software rasterization module.  For drawing points,
@@ -127,7 +127,7 @@ each directory.
           vertex shaders.
           Geometry shaders will also be implemented in this module.
       <li><b>cso_cache</b> - Constant State Objects Cache.  Used to filter out
-          redundant state changes between state trackers and drivers.
+          redundant state changes between frontends and drivers.
       <li><b>gallivm</b> - LLVM module for Gallium.  For LLVM-based
            compilation, optimization and code generation for TGSI shaders.
            Incomplete.
@@ -144,17 +144,17 @@ each directory.
           creation, memory management, 2D blitting, simple rendering, etc.
       <li>XXX more
       </ul>
-    <li><b>state_trackers</b> -
+    <li><b>frontends</b> -
        <ul>
-       <li><b>clover</b> - OpenCL state tracker
-       <li><b>dri</b> - Meta state tracker for DRI drivers
-       <li><b>glx</b> - Meta state tracker for GLX
-       <li><b>wgl</b> - Windows WGL state tracker
-       <li><b>xa</b> - XA state tracker
-       <li><b>xvmc</b> - XvMC state tracker
-       <li><b>vdpau</b> - VDPAU state tracker
-       <li><b>va</b> - VA-API state tracker
-       <li><b>omx_bellagio</b> - OpenMAX Bellagio state tracker
+       <li><b>clover</b> - OpenCL frontend
+       <li><b>dri</b> - Meta frontend for DRI drivers
+       <li><b>glx</b> - Meta frontend for GLX
+       <li><b>wgl</b> - Windows WGL frontend
+       <li><b>xa</b> - XA frontend
+       <li><b>xvmc</b> - XvMC frontend
+       <li><b>vdpau</b> - VDPAU frontend
+       <li><b>va</b> - VA-API frontend
+       <li><b>omx_bellagio</b> - OpenMAX Bellagio frontend
        </ul>
     <li><b>winsys</b> -
        <ul>
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 59ee0e0f68b..78e821581b9 100644
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -46,7 +46,7 @@ SUBDIRS += winsys/vc4/drm drivers/vc4
 SUBDIRS += winsys/virgl/common winsys/virgl/drm winsys/virgl/vtest drivers/virgl
 SUBDIRS += winsys/svga/drm drivers/svga
 SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly
-SUBDIRS += state_trackers/dri
+SUBDIRS += frontends/dri
 SUBDIRS += winsys/iris/drm drivers/iris
 SUBDIRS += winsys/lima/drm drivers/lima
 SUBDIRS += winsys/panfrost/drm drivers/panfrost
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index e0ffa5f4d0a..5017d5fe247 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -45,12 +45,12 @@ if env['platform'] == 'windows':
 if not env['embedded']:
     if env['x11']:
         SConscript([
-            'state_trackers/glx/xlib/SConscript',
+            'frontends/glx/xlib/SConscript',
             'targets/libgl-xlib/SConscript',
         ])
 
     if env['platform'] == 'windows':
         SConscript([
-            'state_trackers/wgl/SConscript',
+            'frontends/wgl/SConscript',
             'targets/libgl-gdi/SConscript',
         ])
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
index a0d9c8a7dec..b57df804e56 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
@@ -34,7 +34,7 @@
 #define PIPE_LOADER_H
 
 #include "pipe/p_compiler.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/xmlconfig.h"
 
 #ifdef __cplusplus
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 7d90285a484..5d6865be1b0 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -39,7 +39,7 @@
 
 #include "loader.h"
 #include "target-helpers/drm_helper_public.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "pipe_loader_priv.h"
 
 #include "util/u_memory.h"
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
index c2a3896b8f7..74329e4cba9 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
@@ -38,9 +38,9 @@
 #include "sw/null/null_sw_winsys.h"
 #include "sw/wrapper/wrapper_sw_winsys.h"
 #include "target-helpers/sw_helper_public.h"
-#include "state_tracker/drisw_api.h"
-#include "state_tracker/sw_driver.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/drisw_api.h"
+#include "frontend/sw_driver.h"
+#include "frontend/sw_winsys.h"
 
 struct pipe_loader_sw_device {
    struct pipe_loader_device base;
diff --git a/src/gallium/auxiliary/postprocess/ADDING b/src/gallium/auxiliary/postprocess/ADDING
index 3735835142a..67e6bdf9c1f 100644
--- a/src/gallium/auxiliary/postprocess/ADDING
+++ b/src/gallium/auxiliary/postprocess/ADDING
@@ -65,7 +65,7 @@ drivers/dri/common/xmlpool/t_options.h, and regenerate options.h by running make
 directory. Use the name you put into filters.h as the config option name.
 
 With driconf aware of the option, make Gallium aware of it too. Add it to
-state_trackers/dri/common/dri_screen.c in a proper section, specifying its default value and
+frontends/dri/common/dri_screen.c in a proper section, specifying its default value and
 the accepted range (if applicable).
 
 Do check that __driNConfigOptions is still correct after the addition.
diff --git a/src/gallium/auxiliary/renderonly/renderonly.c b/src/gallium/auxiliary/renderonly/renderonly.c
index bfb6b758fbe..2daf36920c0 100644
--- a/src/gallium/auxiliary/renderonly/renderonly.c
+++ b/src/gallium/auxiliary/renderonly/renderonly.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <xf86drm.h>
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "pipe/p_screen.h"
 #include "util/format/u_format.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/auxiliary/renderonly/renderonly.h b/src/gallium/auxiliary/renderonly/renderonly.h
index a8d6a686ed4..fe13fea1495 100644
--- a/src/gallium/auxiliary/renderonly/renderonly.h
+++ b/src/gallium/auxiliary/renderonly/renderonly.h
@@ -28,7 +28,7 @@
 #define RENDERONLY_H
 
 #include <stdint.h>
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "pipe/p_state.h"
 
 struct renderonly_scanout {
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
index 01b65d6c7f8..6010631e9a6 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include "target-helpers/inline_debug_helper.h"
 #include "target-helpers/drm_helper_public.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/xmlpool.h"
 
 #ifdef GALLIUM_I915
diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
index c89ef14a6fb..6106cc02044 100644
--- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
@@ -4,7 +4,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 #ifdef GALLIUM_SWR
 #include "swr/swr_public.h"
diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h
index e129819477d..76cfe14f1d0 100644
--- a/src/gallium/auxiliary/target-helpers/sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/sw_helper.h
@@ -5,7 +5,7 @@
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
 #include "target-helpers/sw_helper_public.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 
 /* Helper function to choose and instantiate one of the software rasterizers:
diff --git a/src/gallium/auxiliary/util/u_tests.c b/src/gallium/auxiliary/util/u_tests.c
index 00f75906173..a0e9561eeb6 100644
--- a/src/gallium/auxiliary/util/u_tests.c
+++ b/src/gallium/auxiliary/util/u_tests.c
@@ -38,7 +38,7 @@
 #include "tgsi/tgsi_strings.h"
 #include "tgsi/tgsi_text.h"
 #include "cso_cache/cso_context.h"
-#include "state_tracker/winsys_handle.h"
+#include "frontend/winsys_handle.h"
 #include <stdio.h>
 
 #define TOLERANCE 0.01
diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c
index 1905516a761..524f9f3a162 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_dri.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c
@@ -42,7 +42,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "pipe-loader/pipe_loader.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "util/u_memory.h"
 #include "util/crc32.h"
diff --git a/src/gallium/auxiliary/vl/vl_winsys_drm.c b/src/gallium/auxiliary/vl/vl_winsys_drm.c
index 9014b97bdfd..bae0405e1f6 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_drm.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_drm.c
@@ -29,7 +29,7 @@
 
 #include "pipe/p_screen.h"
 #include "pipe-loader/pipe_loader.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "util/u_memory.h"
 #include "vl/vl_winsys.h"
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 9fbacd3c49b..d5f445881f3 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -45,7 +45,7 @@
 #include "util/u_screen.h"
 #include "util/u_string.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "drm-uapi/drm_fourcc.h"
 
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 2b89d6afb1e..0586271fe6f 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -48,7 +48,7 @@
 #include <errno.h>
 
 /* XXX this should go away, needed for 'struct winsys_handle' */
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 /* A private modifier for now, so we have a way to request tiled but not
  * compressed.  It would perhaps be good to get real modifiers for the
diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h
index 1e273260936..7db4174cb21 100644
--- a/src/gallium/drivers/i915/i915_context.h
+++ b/src/gallium/drivers/i915/i915_context.h
@@ -289,7 +289,7 @@ struct i915_context {
    struct blitter_context* blitter;
 };
 
-/* A flag for each state_tracker state object:
+/* A flag for each frontend state object:
  */
 #define I915_NEW_VIEWPORT      0x1
 #define I915_NEW_RASTERIZER    0x2
diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index f3c38ae3237..e90f2dc7574 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -113,7 +113,7 @@ i915_create_blend_state(struct pipe_context *pipe,
       unsigned dstA   = blend->rt[0].alpha_dst_factor;
 
       /* Special handling for MIN/MAX filter modes handled at
-       * state_tracker level.
+       * frontend level.
        */
 
       if (srcA != srcRGB ||
diff --git a/src/gallium/drivers/iris/iris_screen.h b/src/gallium/drivers/iris/iris_screen.h
index 5ec58f6c216..9ee111c911a 100644
--- a/src/gallium/drivers/iris/iris_screen.h
+++ b/src/gallium/drivers/iris/iris_screen.h
@@ -24,7 +24,7 @@
 #define IRIS_SCREEN_H
 
 #include "pipe/p_screen.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/disk_cache.h"
 #include "util/slab.h"
 #include "util/u_screen.h"
diff --git a/src/gallium/drivers/lima/lima_bo.c b/src/gallium/drivers/lima/lima_bo.c
index cccf2f64cac..9e6d46b05de 100644
--- a/src/gallium/drivers/lima/lima_bo.c
+++ b/src/gallium/drivers/lima/lima_bo.c
@@ -34,7 +34,7 @@
 #include "util/os_time.h"
 #include "os/os_mman.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "lima_screen.h"
 #include "lima_bo.h"
diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
index 4644ea402c9..aa5e1f21d66 100644
--- a/src/gallium/drivers/lima/lima_resource.c
+++ b/src/gallium/drivers/lima/lima_resource.c
@@ -35,7 +35,7 @@
 #include "util/u_drm.h"
 #include "renderonly/renderonly.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "drm-uapi/drm_fourcc.h"
 #include "drm-uapi/lima_drm.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index a980700b16e..e3f1f70237c 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -52,7 +52,7 @@
 #include "lp_rast.h"
 #include "lp_cs_tpool.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 #include "nir.h"
 
diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index 6b46e82756d..d7ec3591c6e 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -53,7 +53,7 @@
 #include "lp_setup_context.h"
 #include "lp_screen.h"
 #include "lp_state.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 #include "draw/draw_context.h"
 #include "draw/draw_vbuf.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c
index 38210d444f5..1092ea513d7 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c
@@ -44,7 +44,7 @@
 #include "lp_screen.h"
 #include "lp_memory.h"
 #include "lp_cs_tpool.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 #include "nir/nir_to_tgsi_info.h"
 #include "nir_serialize.h"
 struct lp_cs_job_info {
diff --git a/src/gallium/drivers/llvmpipe/lp_state_sampler.c b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
index 0851213a798..6c5511e3e81 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_sampler.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
@@ -38,7 +38,7 @@
 #include "lp_screen.h"
 #include "lp_state.h"
 #include "lp_debug.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 
 static void *
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index fa7a1ff1129..cbeaf3fd0ba 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -51,7 +51,7 @@
 #include "lp_state.h"
 #include "lp_rast.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 
 #ifdef DEBUG
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index de9cce3812a..7f90784b8ed 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -26,7 +26,7 @@
 #include <compiler/glsl_types.h>
 
 /* XXX this should go away */
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 int nouveau_mesa_debug = 0;
 
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
index c897e4e8b97..578335d7001 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
@@ -24,7 +24,7 @@
 
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/u_inlines.h"
 #include "util/format/u_format.h"
 
diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 443df15d257..2ccbe6d7acd 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include "drm-uapi/drm_fourcc.h"
 
-#include "state_tracker/winsys_handle.h"
+#include "frontend/winsys_handle.h"
 #include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "util/u_surface.h"
diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index 84c50431cd5..be5818794c6 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -36,7 +36,7 @@
 #include "util/u_memory.h"
 
 #include "pipe/p_screen.h"
-#include "state_tracker/winsys_handle.h"
+#include "frontend/winsys_handle.h"
 
 /* These formats are supported by swapping their bytes.
  * The swizzles must be set exactly like their non-swapped counterparts,
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 6b2f5956d9d..edbe9f97efa 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -33,7 +33,7 @@
 #include "util/u_pack_color.h"
 #include "util/u_surface.h"
 #include "util/os_time.h"
-#include "state_tracker/winsys_handle.h"
+#include "frontend/winsys_handle.h"
 #include <errno.h>
 #include <inttypes.h>
 
diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index 46bdd4d5843..edb5944aec3 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -27,7 +27,7 @@
 #include "si_pipe.h"
 #include "si_query.h"
 #include "sid.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/format/u_format.h"
 #include "util/os_time.h"
 #include "util/u_log.h"
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 41910c10a31..f9d43bd6ea8 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -37,7 +37,7 @@
 #include "pipe/p_screen.h"
 #include "draw/draw_context.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 #include "tgsi/tgsi_exec.h"
 
 #include "sp_texture.h"
diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c
index 14e44d1de9f..2755f26bea2 100644
--- a/src/gallium/drivers/softpipe/sp_state_sampler.c
+++ b/src/gallium/drivers/softpipe/sp_state_sampler.c
@@ -41,7 +41,7 @@
 #include "sp_tex_sample.h"
 #include "sp_tex_tile_cache.h"
 #include "sp_screen.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 
 /**
diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index a8f0e6cee5a..c9a22a97891 100644
--- a/src/gallium/drivers/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
@@ -44,7 +44,7 @@
 #include "sp_texture.h"
 #include "sp_screen.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 
 /**
diff --git a/src/gallium/drivers/svga/svga_context.h b/src/gallium/drivers/svga/svga_context.h
index fc63ec34670..60afb2b6740 100644
--- a/src/gallium/drivers/svga/svga_context.h
+++ b/src/gallium/drivers/svga/svga_context.h
@@ -603,7 +603,7 @@ struct svga_context
    boolean disable_rasterizer; /* Set if to disable rasterization */
 };
 
-/* A flag for each state_tracker state object:
+/* A flag for each frontend state object:
  */
 #define SVGA_NEW_BLEND               0x1
 #define SVGA_NEW_DEPTH_STENCIL_ALPHA 0x2
diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp
index ef5b4524c1a..2939637f1c5 100644
--- a/src/gallium/drivers/swr/swr_screen.cpp
+++ b/src/gallium/drivers/swr/swr_screen.cpp
@@ -38,7 +38,7 @@
 #include "util/u_string.h"
 #include "util/u_screen.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 #include "jit_api.h"
 
diff --git a/src/gallium/drivers/tegra/tegra_screen.c b/src/gallium/drivers/tegra/tegra_screen.c
index 9ec3f6fe1d4..73efb8e904e 100644
--- a/src/gallium/drivers/tegra/tegra_screen.c
+++ b/src/gallium/drivers/tegra/tegra_screen.c
@@ -37,7 +37,7 @@
 #include "util/u_debug.h"
 #include "util/u_inlines.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "nouveau/drm/nouveau_drm_public.h"
 
diff --git a/src/gallium/drivers/v3d/v3d_screen.h b/src/gallium/drivers/v3d/v3d_screen.h
index f9ff26f18f8..586b3925065 100644
--- a/src/gallium/drivers/v3d/v3d_screen.h
+++ b/src/gallium/drivers/v3d/v3d_screen.h
@@ -27,7 +27,7 @@
 #include "pipe/p_screen.h"
 #include "renderonly/renderonly.h"
 #include "os/os_thread.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/list.h"
 #include "util/slab.h"
 #include "broadcom/common/v3d_debug.h"
diff --git a/src/gallium/drivers/v3d/v3dx_emit.c b/src/gallium/drivers/v3d/v3dx_emit.c
index 18c2473955b..bcad6cddac6 100644
--- a/src/gallium/drivers/v3d/v3dx_emit.c
+++ b/src/gallium/drivers/v3d/v3dx_emit.c
@@ -799,7 +799,7 @@ v3dX(emit_state)(struct pipe_context *pctx)
         if (v3d->dirty & VC5_DIRTY_SAMPLE_STATE) {
                 cl_emit(&job->bcl, SAMPLE_STATE, state) {
                         /* Note: SampleCoverage was handled at the
-                         * state_tracker level by converting to sample_mask.
+                         * frontend level by converting to sample_mask.
                          */
                         state.coverage = 1.0;
                         state.mask = job->msaa ? v3d->sample_mask : 0xf;
diff --git a/src/gallium/drivers/vc4/vc4_screen.h b/src/gallium/drivers/vc4/vc4_screen.h
index fa4becd8a3c..2a5a160354e 100644
--- a/src/gallium/drivers/vc4/vc4_screen.h
+++ b/src/gallium/drivers/vc4/vc4_screen.h
@@ -27,7 +27,7 @@
 #include "pipe/p_screen.h"
 #include "renderonly/renderonly.h"
 #include "os/os_thread.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/list.h"
 #include "util/slab.h"
 
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 5467fe487b9..b1ab56699f6 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -33,7 +33,7 @@
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 static void
 zink_resource_destroy(struct pipe_screen *pscreen,
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 92263a26eee..feb7fdb6d3a 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -37,7 +37,7 @@
 #include "util/u_screen.h"
 #include "util/u_string.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 static const struct debug_named_value
 debug_options[] = {
diff --git a/src/gallium/state_trackers/README b/src/gallium/frontends/README
similarity index 100%
rename from src/gallium/state_trackers/README
rename to src/gallium/frontends/README
diff --git a/src/gallium/state_trackers/clover/Doxyfile b/src/gallium/frontends/clover/Doxyfile
similarity index 100%
rename from src/gallium/state_trackers/clover/Doxyfile
rename to src/gallium/frontends/clover/Doxyfile
diff --git a/src/gallium/state_trackers/clover/Makefile.sources b/src/gallium/frontends/clover/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/clover/Makefile.sources
rename to src/gallium/frontends/clover/Makefile.sources
diff --git a/src/gallium/state_trackers/clover/api/context.cpp b/src/gallium/frontends/clover/api/context.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/context.cpp
rename to src/gallium/frontends/clover/api/context.cpp
diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/frontends/clover/api/device.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/device.cpp
rename to src/gallium/frontends/clover/api/device.cpp
diff --git a/src/gallium/state_trackers/clover/api/dispatch.cpp b/src/gallium/frontends/clover/api/dispatch.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/dispatch.cpp
rename to src/gallium/frontends/clover/api/dispatch.cpp
diff --git a/src/gallium/state_trackers/clover/api/dispatch.hpp b/src/gallium/frontends/clover/api/dispatch.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/dispatch.hpp
rename to src/gallium/frontends/clover/api/dispatch.hpp
diff --git a/src/gallium/state_trackers/clover/api/event.cpp b/src/gallium/frontends/clover/api/event.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/event.cpp
rename to src/gallium/frontends/clover/api/event.cpp
diff --git a/src/gallium/state_trackers/clover/api/interop.cpp b/src/gallium/frontends/clover/api/interop.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/interop.cpp
rename to src/gallium/frontends/clover/api/interop.cpp
diff --git a/src/gallium/state_trackers/clover/api/kernel.cpp b/src/gallium/frontends/clover/api/kernel.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/kernel.cpp
rename to src/gallium/frontends/clover/api/kernel.cpp
diff --git a/src/gallium/state_trackers/clover/api/memory.cpp b/src/gallium/frontends/clover/api/memory.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/memory.cpp
rename to src/gallium/frontends/clover/api/memory.cpp
diff --git a/src/gallium/state_trackers/clover/api/platform.cpp b/src/gallium/frontends/clover/api/platform.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/platform.cpp
rename to src/gallium/frontends/clover/api/platform.cpp
diff --git a/src/gallium/state_trackers/clover/api/program.cpp b/src/gallium/frontends/clover/api/program.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/program.cpp
rename to src/gallium/frontends/clover/api/program.cpp
diff --git a/src/gallium/state_trackers/clover/api/queue.cpp b/src/gallium/frontends/clover/api/queue.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/queue.cpp
rename to src/gallium/frontends/clover/api/queue.cpp
diff --git a/src/gallium/state_trackers/clover/api/sampler.cpp b/src/gallium/frontends/clover/api/sampler.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/sampler.cpp
rename to src/gallium/frontends/clover/api/sampler.cpp
diff --git a/src/gallium/state_trackers/clover/api/transfer.cpp b/src/gallium/frontends/clover/api/transfer.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/transfer.cpp
rename to src/gallium/frontends/clover/api/transfer.cpp
diff --git a/src/gallium/state_trackers/clover/api/util.hpp b/src/gallium/frontends/clover/api/util.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/api/util.hpp
rename to src/gallium/frontends/clover/api/util.hpp
diff --git a/src/gallium/state_trackers/clover/core/compiler.hpp b/src/gallium/frontends/clover/core/compiler.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/compiler.hpp
rename to src/gallium/frontends/clover/core/compiler.hpp
diff --git a/src/gallium/state_trackers/clover/core/context.cpp b/src/gallium/frontends/clover/core/context.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/context.cpp
rename to src/gallium/frontends/clover/core/context.cpp
diff --git a/src/gallium/state_trackers/clover/core/context.hpp b/src/gallium/frontends/clover/core/context.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/context.hpp
rename to src/gallium/frontends/clover/core/context.hpp
diff --git a/src/gallium/state_trackers/clover/core/device.cpp b/src/gallium/frontends/clover/core/device.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/device.cpp
rename to src/gallium/frontends/clover/core/device.cpp
diff --git a/src/gallium/state_trackers/clover/core/device.hpp b/src/gallium/frontends/clover/core/device.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/device.hpp
rename to src/gallium/frontends/clover/core/device.hpp
diff --git a/src/gallium/state_trackers/clover/core/error.hpp b/src/gallium/frontends/clover/core/error.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/error.hpp
rename to src/gallium/frontends/clover/core/error.hpp
diff --git a/src/gallium/state_trackers/clover/core/event.cpp b/src/gallium/frontends/clover/core/event.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/event.cpp
rename to src/gallium/frontends/clover/core/event.cpp
diff --git a/src/gallium/state_trackers/clover/core/event.hpp b/src/gallium/frontends/clover/core/event.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/event.hpp
rename to src/gallium/frontends/clover/core/event.hpp
diff --git a/src/gallium/state_trackers/clover/core/format.cpp b/src/gallium/frontends/clover/core/format.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/format.cpp
rename to src/gallium/frontends/clover/core/format.cpp
diff --git a/src/gallium/state_trackers/clover/core/format.hpp b/src/gallium/frontends/clover/core/format.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/format.hpp
rename to src/gallium/frontends/clover/core/format.hpp
diff --git a/src/gallium/state_trackers/clover/core/kernel.cpp b/src/gallium/frontends/clover/core/kernel.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/kernel.cpp
rename to src/gallium/frontends/clover/core/kernel.cpp
diff --git a/src/gallium/state_trackers/clover/core/kernel.hpp b/src/gallium/frontends/clover/core/kernel.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/kernel.hpp
rename to src/gallium/frontends/clover/core/kernel.hpp
diff --git a/src/gallium/state_trackers/clover/core/memory.cpp b/src/gallium/frontends/clover/core/memory.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/memory.cpp
rename to src/gallium/frontends/clover/core/memory.cpp
diff --git a/src/gallium/state_trackers/clover/core/memory.hpp b/src/gallium/frontends/clover/core/memory.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/memory.hpp
rename to src/gallium/frontends/clover/core/memory.hpp
diff --git a/src/gallium/state_trackers/clover/core/module.cpp b/src/gallium/frontends/clover/core/module.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/module.cpp
rename to src/gallium/frontends/clover/core/module.cpp
diff --git a/src/gallium/state_trackers/clover/core/module.hpp b/src/gallium/frontends/clover/core/module.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/module.hpp
rename to src/gallium/frontends/clover/core/module.hpp
diff --git a/src/gallium/state_trackers/clover/core/object.hpp b/src/gallium/frontends/clover/core/object.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/object.hpp
rename to src/gallium/frontends/clover/core/object.hpp
diff --git a/src/gallium/state_trackers/clover/core/platform.cpp b/src/gallium/frontends/clover/core/platform.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/platform.cpp
rename to src/gallium/frontends/clover/core/platform.cpp
diff --git a/src/gallium/state_trackers/clover/core/platform.hpp b/src/gallium/frontends/clover/core/platform.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/platform.hpp
rename to src/gallium/frontends/clover/core/platform.hpp
diff --git a/src/gallium/state_trackers/clover/core/program.cpp b/src/gallium/frontends/clover/core/program.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/program.cpp
rename to src/gallium/frontends/clover/core/program.cpp
diff --git a/src/gallium/state_trackers/clover/core/program.hpp b/src/gallium/frontends/clover/core/program.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/program.hpp
rename to src/gallium/frontends/clover/core/program.hpp
diff --git a/src/gallium/state_trackers/clover/core/property.hpp b/src/gallium/frontends/clover/core/property.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/property.hpp
rename to src/gallium/frontends/clover/core/property.hpp
diff --git a/src/gallium/state_trackers/clover/core/queue.cpp b/src/gallium/frontends/clover/core/queue.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/queue.cpp
rename to src/gallium/frontends/clover/core/queue.cpp
diff --git a/src/gallium/state_trackers/clover/core/queue.hpp b/src/gallium/frontends/clover/core/queue.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/queue.hpp
rename to src/gallium/frontends/clover/core/queue.hpp
diff --git a/src/gallium/state_trackers/clover/core/resource.cpp b/src/gallium/frontends/clover/core/resource.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/resource.cpp
rename to src/gallium/frontends/clover/core/resource.cpp
diff --git a/src/gallium/state_trackers/clover/core/resource.hpp b/src/gallium/frontends/clover/core/resource.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/resource.hpp
rename to src/gallium/frontends/clover/core/resource.hpp
diff --git a/src/gallium/state_trackers/clover/core/sampler.cpp b/src/gallium/frontends/clover/core/sampler.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/sampler.cpp
rename to src/gallium/frontends/clover/core/sampler.cpp
diff --git a/src/gallium/state_trackers/clover/core/sampler.hpp b/src/gallium/frontends/clover/core/sampler.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/sampler.hpp
rename to src/gallium/frontends/clover/core/sampler.hpp
diff --git a/src/gallium/state_trackers/clover/core/timestamp.cpp b/src/gallium/frontends/clover/core/timestamp.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/timestamp.cpp
rename to src/gallium/frontends/clover/core/timestamp.cpp
diff --git a/src/gallium/state_trackers/clover/core/timestamp.hpp b/src/gallium/frontends/clover/core/timestamp.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/core/timestamp.hpp
rename to src/gallium/frontends/clover/core/timestamp.hpp
diff --git a/src/gallium/state_trackers/clover/llvm/codegen.hpp b/src/gallium/frontends/clover/llvm/codegen.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/codegen.hpp
rename to src/gallium/frontends/clover/llvm/codegen.hpp
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp b/src/gallium/frontends/clover/llvm/codegen/bitcode.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
rename to src/gallium/frontends/clover/llvm/codegen/bitcode.cpp
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp b/src/gallium/frontends/clover/llvm/codegen/common.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/codegen/common.cpp
rename to src/gallium/frontends/clover/llvm/codegen/common.cpp
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp b/src/gallium/frontends/clover/llvm/codegen/native.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/codegen/native.cpp
rename to src/gallium/frontends/clover/llvm/codegen/native.cpp
diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/compat.hpp
rename to src/gallium/frontends/clover/llvm/compat.hpp
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/invocation.cpp
rename to src/gallium/frontends/clover/llvm/invocation.cpp
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.hpp b/src/gallium/frontends/clover/llvm/invocation.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/invocation.hpp
rename to src/gallium/frontends/clover/llvm/invocation.hpp
diff --git a/src/gallium/state_trackers/clover/llvm/metadata.hpp b/src/gallium/frontends/clover/llvm/metadata.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/metadata.hpp
rename to src/gallium/frontends/clover/llvm/metadata.hpp
diff --git a/src/gallium/state_trackers/clover/llvm/util.hpp b/src/gallium/frontends/clover/llvm/util.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/llvm/util.hpp
rename to src/gallium/frontends/clover/llvm/util.hpp
diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/frontends/clover/meson.build
similarity index 100%
rename from src/gallium/state_trackers/clover/meson.build
rename to src/gallium/frontends/clover/meson.build
diff --git a/src/gallium/state_trackers/clover/nir/invocation.cpp b/src/gallium/frontends/clover/nir/invocation.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/nir/invocation.cpp
rename to src/gallium/frontends/clover/nir/invocation.cpp
diff --git a/src/gallium/state_trackers/clover/nir/invocation.hpp b/src/gallium/frontends/clover/nir/invocation.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/nir/invocation.hpp
rename to src/gallium/frontends/clover/nir/invocation.hpp
diff --git a/src/gallium/state_trackers/clover/spirv/invocation.cpp b/src/gallium/frontends/clover/spirv/invocation.cpp
similarity index 100%
rename from src/gallium/state_trackers/clover/spirv/invocation.cpp
rename to src/gallium/frontends/clover/spirv/invocation.cpp
diff --git a/src/gallium/state_trackers/clover/spirv/invocation.hpp b/src/gallium/frontends/clover/spirv/invocation.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/spirv/invocation.hpp
rename to src/gallium/frontends/clover/spirv/invocation.hpp
diff --git a/src/gallium/state_trackers/clover/util/adaptor.hpp b/src/gallium/frontends/clover/util/adaptor.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/adaptor.hpp
rename to src/gallium/frontends/clover/util/adaptor.hpp
diff --git a/src/gallium/state_trackers/clover/util/algebra.hpp b/src/gallium/frontends/clover/util/algebra.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/algebra.hpp
rename to src/gallium/frontends/clover/util/algebra.hpp
diff --git a/src/gallium/state_trackers/clover/util/algorithm.hpp b/src/gallium/frontends/clover/util/algorithm.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/algorithm.hpp
rename to src/gallium/frontends/clover/util/algorithm.hpp
diff --git a/src/gallium/state_trackers/clover/util/factor.hpp b/src/gallium/frontends/clover/util/factor.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/factor.hpp
rename to src/gallium/frontends/clover/util/factor.hpp
diff --git a/src/gallium/state_trackers/clover/util/functional.hpp b/src/gallium/frontends/clover/util/functional.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/functional.hpp
rename to src/gallium/frontends/clover/util/functional.hpp
diff --git a/src/gallium/state_trackers/clover/util/lazy.hpp b/src/gallium/frontends/clover/util/lazy.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/lazy.hpp
rename to src/gallium/frontends/clover/util/lazy.hpp
diff --git a/src/gallium/state_trackers/clover/util/pointer.hpp b/src/gallium/frontends/clover/util/pointer.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/pointer.hpp
rename to src/gallium/frontends/clover/util/pointer.hpp
diff --git a/src/gallium/state_trackers/clover/util/range.hpp b/src/gallium/frontends/clover/util/range.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/range.hpp
rename to src/gallium/frontends/clover/util/range.hpp
diff --git a/src/gallium/state_trackers/clover/util/tuple.hpp b/src/gallium/frontends/clover/util/tuple.hpp
similarity index 100%
rename from src/gallium/state_trackers/clover/util/tuple.hpp
rename to src/gallium/frontends/clover/util/tuple.hpp
diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/frontends/dri/Android.mk
similarity index 100%
rename from src/gallium/state_trackers/dri/Android.mk
rename to src/gallium/frontends/dri/Android.mk
diff --git a/src/gallium/state_trackers/dri/Makefile.sources b/src/gallium/frontends/dri/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/dri/Makefile.sources
rename to src/gallium/frontends/dri/Makefile.sources
diff --git a/src/gallium/frontends/dri/SConscript b/src/gallium/frontends/dri/SConscript
new file mode 100644
index 00000000000..fa48fb8a0d7
--- /dev/null
+++ b/src/gallium/frontends/dri/SConscript
@@ -0,0 +1,30 @@
+#######################################################################
+# SConscript for dri state_tracker
+
+Import('*')
+
+env = env.Clone()
+
+env.PkgUseModules(['DRM'])
+
+env.Append(CPPPATH = [
+    '#/src',
+    '#/src/mapi',
+    '#/src/mesa',
+    '#/src/mesa/drivers/dri/common',
+    xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
+])
+
+sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES')
+
+# XXX: if HAVE_DRISW
+sources.append(env.ParseSourceList('Makefile.sources', 'drisw_SOURCES'))
+
+# XXX: if HAVE_DRI2
+sources.append(env.ParseSourceList('Makefile.sources', 'dri2_SOURCES'))
+
+st_dri = env.ConvenienceLibrary(
+    target = 'st_dri',
+    source = sources
+)
+Export('st_dri')
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
similarity index 99%
rename from src/gallium/state_trackers/dri/dri2.c
rename to src/gallium/frontends/dri/dri2.c
index ec78d0985ed..334934b85c7 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/frontends/dri/dri2.c
@@ -35,7 +35,7 @@
 #include "util/u_inlines.h"
 #include "util/format/u_format.h"
 #include "util/u_debug.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "state_tracker/st_cb_bufferobjects.h"
 #include "state_tracker/st_cb_fbo.h"
 #include "state_tracker/st_cb_texture.h"
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/frontends/dri/dri_context.c
similarity index 99%
rename from src/gallium/state_trackers/dri/dri_context.c
rename to src/gallium/frontends/dri/dri_context.c
index 082a9ced91d..6e53ca90ad4 100644
--- a/src/gallium/state_trackers/dri/dri_context.c
+++ b/src/gallium/frontends/dri/dri_context.c
@@ -34,7 +34,7 @@
 #include "dri_screen.h"
 #include "dri_drawable.h"
 #include "dri_context.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "pipe/p_context.h"
 #include "pipe-loader/pipe_loader.h"
diff --git a/src/gallium/state_trackers/dri/dri_context.h b/src/gallium/frontends/dri/dri_context.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_context.h
rename to src/gallium/frontends/dri/dri_context.h
diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/frontends/dri/dri_drawable.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_drawable.c
rename to src/gallium/frontends/dri/dri_drawable.c
diff --git a/src/gallium/state_trackers/dri/dri_drawable.h b/src/gallium/frontends/dri/dri_drawable.h
similarity index 99%
rename from src/gallium/state_trackers/dri/dri_drawable.h
rename to src/gallium/frontends/dri/dri_drawable.h
index d57ff1d84e0..71cc6070090 100644
--- a/src/gallium/state_trackers/dri/dri_drawable.h
+++ b/src/gallium/frontends/dri/dri_drawable.h
@@ -30,7 +30,7 @@
 
 #include "pipe/p_compiler.h"
 #include "pipe/p_format.h"
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 
 struct pipe_surface;
 struct st_framebuffer;
diff --git a/src/gallium/state_trackers/dri/dri_helpers.c b/src/gallium/frontends/dri/dri_helpers.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_helpers.c
rename to src/gallium/frontends/dri/dri_helpers.c
diff --git a/src/gallium/state_trackers/dri/dri_helpers.h b/src/gallium/frontends/dri/dri_helpers.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_helpers.h
rename to src/gallium/frontends/dri/dri_helpers.h
diff --git a/src/gallium/state_trackers/dri/dri_query_renderer.c b/src/gallium/frontends/dri/dri_query_renderer.c
similarity index 98%
rename from src/gallium/state_trackers/dri/dri_query_renderer.c
rename to src/gallium/frontends/dri/dri_query_renderer.c
index 2417f40a6ad..9a78fa38da6 100644
--- a/src/gallium/state_trackers/dri/dri_query_renderer.c
+++ b/src/gallium/frontends/dri/dri_query_renderer.c
@@ -1,7 +1,7 @@
 #include "dri_query_renderer.h"
 
 #include "util/u_inlines.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "utils.h"
 #include "dri_screen.h"
diff --git a/src/gallium/state_trackers/dri/dri_query_renderer.h b/src/gallium/frontends/dri/dri_query_renderer.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_query_renderer.h
rename to src/gallium/frontends/dri/dri_query_renderer.h
diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c
similarity index 99%
rename from src/gallium/state_trackers/dri/dri_screen.c
rename to src/gallium/frontends/dri/dri_screen.c
index 4f1bf166125..fee392bba31 100644
--- a/src/gallium/state_trackers/dri/dri_screen.c
+++ b/src/gallium/frontends/dri/dri_screen.c
@@ -40,7 +40,7 @@
 #include "pipe/p_format.h"
 #include "pipe-loader/pipe_loader.h"
 #include "state_tracker/st_gl_api.h" /* for st_gl_api_create */
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "util/u_debug.h"
 #include "util/format/u_format_s3tc.h"
diff --git a/src/gallium/state_trackers/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h
similarity index 98%
rename from src/gallium/state_trackers/dri/dri_screen.h
rename to src/gallium/frontends/dri/dri_screen.h
index 1586439bba3..e330aa1f2ac 100644
--- a/src/gallium/state_trackers/dri/dri_screen.h
+++ b/src/gallium/frontends/dri/dri_screen.h
@@ -37,8 +37,8 @@
 #include "pipe/p_compiler.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
-#include "state_tracker/st_api.h"
-#include "state_tracker/opencl_interop.h"
+#include "frontend/api.h"
+#include "frontend/opencl_interop.h"
 #include "os/os_thread.h"
 #include "postprocess/filters.h"
 
diff --git a/src/gallium/state_trackers/dri/drisw.c b/src/gallium/frontends/dri/drisw.c
similarity index 99%
rename from src/gallium/state_trackers/dri/drisw.c
rename to src/gallium/frontends/dri/drisw.c
index 4afa69f891d..fcdc59ceec8 100644
--- a/src/gallium/state_trackers/dri/drisw.c
+++ b/src/gallium/frontends/dri/drisw.c
@@ -32,7 +32,7 @@
 #include "util/u_box.h"
 #include "pipe/p_context.h"
 #include "pipe-loader/pipe_loader.h"
-#include "state_tracker/drisw_api.h"
+#include "frontend/drisw_api.h"
 #include "state_tracker/st_context.h"
 
 #include "dri_screen.h"
diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/frontends/dri/meson.build
similarity index 100%
rename from src/gallium/state_trackers/dri/meson.build
rename to src/gallium/frontends/dri/meson.build
diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.sources b/src/gallium/frontends/glx/xlib/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/glx/xlib/Makefile.sources
rename to src/gallium/frontends/glx/xlib/Makefile.sources
diff --git a/src/gallium/state_trackers/glx/xlib/SConscript b/src/gallium/frontends/glx/xlib/SConscript
similarity index 100%
rename from src/gallium/state_trackers/glx/xlib/SConscript
rename to src/gallium/frontends/glx/xlib/SConscript
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/frontends/glx/xlib/glx_api.c
similarity index 100%
rename from src/gallium/state_trackers/glx/xlib/glx_api.c
rename to src/gallium/frontends/glx/xlib/glx_api.c
diff --git a/src/gallium/state_trackers/glx/xlib/glx_getproc.c b/src/gallium/frontends/glx/xlib/glx_getproc.c
similarity index 100%
rename from src/gallium/state_trackers/glx/xlib/glx_getproc.c
rename to src/gallium/frontends/glx/xlib/glx_getproc.c
diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c b/src/gallium/frontends/glx/xlib/glx_usefont.c
similarity index 100%
rename from src/gallium/state_trackers/glx/xlib/glx_usefont.c
rename to src/gallium/frontends/glx/xlib/glx_usefont.c
diff --git a/src/gallium/state_trackers/glx/xlib/meson.build b/src/gallium/frontends/glx/xlib/meson.build
similarity index 100%
rename from src/gallium/state_trackers/glx/xlib/meson.build
rename to src/gallium/frontends/glx/xlib/meson.build
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/frontends/glx/xlib/xm_api.c
similarity index 99%
rename from src/gallium/state_trackers/glx/xlib/xm_api.c
rename to src/gallium/frontends/glx/xlib/xm_api.c
index 94a787b422a..e0e0b2d992c 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/frontends/glx/xlib/xm_api.c
@@ -61,7 +61,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 
 #include "util/u_atomic.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.h b/src/gallium/frontends/glx/xlib/xm_api.h
similarity index 99%
rename from src/gallium/state_trackers/glx/xlib/xm_api.h
rename to src/gallium/frontends/glx/xlib/xm_api.h
index 9684b5a17e1..04eefda0b07 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.h
+++ b/src/gallium/frontends/glx/xlib/xm_api.h
@@ -58,10 +58,10 @@ and create a window, you must do the following to use the X/Mesa interface:
 
 
 #include "main/mtypes.h" /* for gl_config */
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 #include "os/os_thread.h"
 
-#include "state_tracker/xlibsw_api.h"
+#include "frontend/xlibsw_api.h"
 
 # include <X11/Xlib.h>
 # include <X11/Xlibint.h>
diff --git a/src/gallium/state_trackers/glx/xlib/xm_public.h b/src/gallium/frontends/glx/xlib/xm_public.h
similarity index 100%
rename from src/gallium/state_trackers/glx/xlib/xm_public.h
rename to src/gallium/frontends/glx/xlib/xm_public.h
diff --git a/src/gallium/state_trackers/glx/xlib/xm_st.c b/src/gallium/frontends/glx/xlib/xm_st.c
similarity index 100%
rename from src/gallium/state_trackers/glx/xlib/xm_st.c
rename to src/gallium/frontends/glx/xlib/xm_st.c
diff --git a/src/gallium/state_trackers/glx/xlib/xm_st.h b/src/gallium/frontends/glx/xlib/xm_st.h
similarity index 98%
rename from src/gallium/state_trackers/glx/xlib/xm_st.h
rename to src/gallium/frontends/glx/xlib/xm_st.h
index 0a15afcd77c..6d92a38e0dd 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_st.h
+++ b/src/gallium/frontends/glx/xlib/xm_st.h
@@ -29,7 +29,7 @@
 #define _XM_ST_H_
 
 #include "pipe/p_compiler.h"
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 
 #include "xm_api.h"
 
diff --git a/src/gallium/state_trackers/hgl/.editorconfig b/src/gallium/frontends/hgl/.editorconfig
similarity index 100%
rename from src/gallium/state_trackers/hgl/.editorconfig
rename to src/gallium/frontends/hgl/.editorconfig
diff --git a/src/gallium/frontends/hgl/SConscript b/src/gallium/frontends/hgl/SConscript
new file mode 100644
index 00000000000..d2389c80802
--- /dev/null
+++ b/src/gallium/frontends/hgl/SConscript
@@ -0,0 +1,24 @@
+#######################################################################
+# SConscript for Haiku state_tracker
+
+Import('*')
+
+env = env.Clone()
+
+env.Append(CPPPATH = [
+    '#/src',
+    '#/src/mapi',
+    '#/src/mesa',
+    '#/include/HaikuGL',
+])
+
+sources = [
+    'hgl.c',
+    'bitmap_wrapper.cpp',
+]
+
+st_haiku = env.ConvenienceLibrary(
+    target = 'st_haiku',
+    source = sources
+)
+Export('st_haiku')
diff --git a/src/gallium/state_trackers/hgl/bitmap_wrapper.cpp b/src/gallium/frontends/hgl/bitmap_wrapper.cpp
similarity index 100%
rename from src/gallium/state_trackers/hgl/bitmap_wrapper.cpp
rename to src/gallium/frontends/hgl/bitmap_wrapper.cpp
diff --git a/src/gallium/state_trackers/hgl/bitmap_wrapper.h b/src/gallium/frontends/hgl/bitmap_wrapper.h
similarity index 100%
rename from src/gallium/state_trackers/hgl/bitmap_wrapper.h
rename to src/gallium/frontends/hgl/bitmap_wrapper.h
diff --git a/src/gallium/state_trackers/hgl/hgl.c b/src/gallium/frontends/hgl/hgl.c
similarity index 98%
rename from src/gallium/state_trackers/hgl/hgl.c
rename to src/gallium/frontends/hgl/hgl.c
index f7dc7a6d3db..74cd81fc7bb 100644
--- a/src/gallium/state_trackers/hgl/hgl.c
+++ b/src/gallium/frontends/hgl/hgl.c
@@ -22,13 +22,13 @@
 
 
 #ifdef DEBUG
-#   define TRACE(x...) printf("hgl:state_tracker: " x)
+#   define TRACE(x...) printf("hgl:frontend: " x)
 #   define CALLED() TRACE("CALLED: %s\n", __PRETTY_FUNCTION__)
 #else
 #   define TRACE(x...)
 #   define CALLED()
 #endif
-#define ERROR(x...) printf("hgl:state_tracker: " x)
+#define ERROR(x...) printf("hgl:frontend: " x)
 
 
 // Perform a safe void to hgl_context cast
@@ -247,7 +247,7 @@ hgl_create_st_framebuffer(struct hgl_context* context)
 	else
 		buffer->target = PIPE_TEXTURE_RECT;
 
-	// Prepare our state_tracker interface
+	// Prepare our frontend interface
 	buffer->stfbi->flush_front = hgl_st_framebuffer_flush_front;
 	buffer->stfbi->validate = hgl_st_framebuffer_validate;
 	buffer->stfbi->visual = context->stVisual;
diff --git a/src/gallium/state_trackers/hgl/hgl_context.h b/src/gallium/frontends/hgl/hgl_context.h
similarity index 91%
rename from src/gallium/state_trackers/hgl/hgl_context.h
rename to src/gallium/frontends/hgl/hgl_context.h
index e2ebfbad4bc..26a61f069a4 100644
--- a/src/gallium/state_trackers/hgl/hgl_context.h
+++ b/src/gallium/frontends/hgl/hgl_context.h
@@ -14,8 +14,8 @@
 #include "pipe/p_screen.h"
 #include "postprocess/filters.h"
 
-#include "state_tracker/st_api.h"
-#include "state_tracker/st_manager.h"
+#include "frontend/api.h"
+#include "frontend/st_manager.h"
 #include "os/os_thread.h"
 
 #include "bitmap_wrapper.h"
@@ -87,17 +87,17 @@ struct hgl_context
 // hgl_buffer from statetracker interface
 struct hgl_buffer* hgl_st_framebuffer(struct st_framebuffer_iface *stfbi);
 
-// hgl state_tracker api
+// hgl frontend
 struct st_api* hgl_create_st_api(void);
 
-// hgl state_tracker framebuffer
+// hgl framebuffer
 struct hgl_buffer* hgl_create_st_framebuffer(struct hgl_context* context);
 
-// hgl state_tracker manager
+// hgl manager
 struct st_manager* hgl_create_st_manager(struct hgl_context* screen);
 void hgl_destroy_st_manager(struct st_manager *manager);
 
-// hgl state_tracker visual
+// hgl visual
 struct st_visual* hgl_create_st_visual(ulong options);
 void hgl_destroy_st_visual(struct st_visual* visual);
 
diff --git a/src/gallium/state_trackers/hgl/meson.build b/src/gallium/frontends/hgl/meson.build
similarity index 100%
rename from src/gallium/state_trackers/hgl/meson.build
rename to src/gallium/frontends/hgl/meson.build
diff --git a/src/gallium/state_trackers/nine/.editorconfig b/src/gallium/frontends/nine/.editorconfig
similarity index 100%
rename from src/gallium/state_trackers/nine/.editorconfig
rename to src/gallium/frontends/nine/.editorconfig
diff --git a/src/gallium/state_trackers/nine/Makefile.sources b/src/gallium/frontends/nine/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/nine/Makefile.sources
rename to src/gallium/frontends/nine/Makefile.sources
diff --git a/src/gallium/state_trackers/nine/README b/src/gallium/frontends/nine/README
similarity index 100%
rename from src/gallium/state_trackers/nine/README
rename to src/gallium/frontends/nine/README
diff --git a/src/gallium/state_trackers/nine/adapter9.c b/src/gallium/frontends/nine/adapter9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/adapter9.c
rename to src/gallium/frontends/nine/adapter9.c
diff --git a/src/gallium/state_trackers/nine/adapter9.h b/src/gallium/frontends/nine/adapter9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/adapter9.h
rename to src/gallium/frontends/nine/adapter9.h
diff --git a/src/gallium/state_trackers/nine/authenticatedchannel9.c b/src/gallium/frontends/nine/authenticatedchannel9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/authenticatedchannel9.c
rename to src/gallium/frontends/nine/authenticatedchannel9.c
diff --git a/src/gallium/state_trackers/nine/authenticatedchannel9.h b/src/gallium/frontends/nine/authenticatedchannel9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/authenticatedchannel9.h
rename to src/gallium/frontends/nine/authenticatedchannel9.h
diff --git a/src/gallium/state_trackers/nine/basetexture9.c b/src/gallium/frontends/nine/basetexture9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/basetexture9.c
rename to src/gallium/frontends/nine/basetexture9.c
diff --git a/src/gallium/state_trackers/nine/basetexture9.h b/src/gallium/frontends/nine/basetexture9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/basetexture9.h
rename to src/gallium/frontends/nine/basetexture9.h
diff --git a/src/gallium/state_trackers/nine/buffer9.c b/src/gallium/frontends/nine/buffer9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/buffer9.c
rename to src/gallium/frontends/nine/buffer9.c
diff --git a/src/gallium/state_trackers/nine/buffer9.h b/src/gallium/frontends/nine/buffer9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/buffer9.h
rename to src/gallium/frontends/nine/buffer9.h
diff --git a/src/gallium/state_trackers/nine/cryptosession9.c b/src/gallium/frontends/nine/cryptosession9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/cryptosession9.c
rename to src/gallium/frontends/nine/cryptosession9.c
diff --git a/src/gallium/state_trackers/nine/cryptosession9.h b/src/gallium/frontends/nine/cryptosession9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/cryptosession9.h
rename to src/gallium/frontends/nine/cryptosession9.h
diff --git a/src/gallium/state_trackers/nine/cubetexture9.c b/src/gallium/frontends/nine/cubetexture9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/cubetexture9.c
rename to src/gallium/frontends/nine/cubetexture9.c
diff --git a/src/gallium/state_trackers/nine/cubetexture9.h b/src/gallium/frontends/nine/cubetexture9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/cubetexture9.h
rename to src/gallium/frontends/nine/cubetexture9.h
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/frontends/nine/device9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/device9.c
rename to src/gallium/frontends/nine/device9.c
diff --git a/src/gallium/state_trackers/nine/device9.h b/src/gallium/frontends/nine/device9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/device9.h
rename to src/gallium/frontends/nine/device9.h
diff --git a/src/gallium/state_trackers/nine/device9ex.c b/src/gallium/frontends/nine/device9ex.c
similarity index 100%
rename from src/gallium/state_trackers/nine/device9ex.c
rename to src/gallium/frontends/nine/device9ex.c
diff --git a/src/gallium/state_trackers/nine/device9ex.h b/src/gallium/frontends/nine/device9ex.h
similarity index 100%
rename from src/gallium/state_trackers/nine/device9ex.h
rename to src/gallium/frontends/nine/device9ex.h
diff --git a/src/gallium/state_trackers/nine/device9video.c b/src/gallium/frontends/nine/device9video.c
similarity index 100%
rename from src/gallium/state_trackers/nine/device9video.c
rename to src/gallium/frontends/nine/device9video.c
diff --git a/src/gallium/state_trackers/nine/device9video.h b/src/gallium/frontends/nine/device9video.h
similarity index 100%
rename from src/gallium/state_trackers/nine/device9video.h
rename to src/gallium/frontends/nine/device9video.h
diff --git a/src/gallium/state_trackers/nine/guid.c b/src/gallium/frontends/nine/guid.c
similarity index 100%
rename from src/gallium/state_trackers/nine/guid.c
rename to src/gallium/frontends/nine/guid.c
diff --git a/src/gallium/state_trackers/nine/guid.h b/src/gallium/frontends/nine/guid.h
similarity index 100%
rename from src/gallium/state_trackers/nine/guid.h
rename to src/gallium/frontends/nine/guid.h
diff --git a/src/gallium/state_trackers/nine/indexbuffer9.c b/src/gallium/frontends/nine/indexbuffer9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/indexbuffer9.c
rename to src/gallium/frontends/nine/indexbuffer9.c
diff --git a/src/gallium/state_trackers/nine/indexbuffer9.h b/src/gallium/frontends/nine/indexbuffer9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/indexbuffer9.h
rename to src/gallium/frontends/nine/indexbuffer9.h
diff --git a/src/gallium/state_trackers/nine/iunknown.c b/src/gallium/frontends/nine/iunknown.c
similarity index 100%
rename from src/gallium/state_trackers/nine/iunknown.c
rename to src/gallium/frontends/nine/iunknown.c
diff --git a/src/gallium/state_trackers/nine/iunknown.h b/src/gallium/frontends/nine/iunknown.h
similarity index 100%
rename from src/gallium/state_trackers/nine/iunknown.h
rename to src/gallium/frontends/nine/iunknown.h
diff --git a/src/gallium/state_trackers/nine/meson.build b/src/gallium/frontends/nine/meson.build
similarity index 100%
rename from src/gallium/state_trackers/nine/meson.build
rename to src/gallium/frontends/nine/meson.build
diff --git a/src/gallium/state_trackers/nine/nine_buffer_upload.c b/src/gallium/frontends/nine/nine_buffer_upload.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_buffer_upload.c
rename to src/gallium/frontends/nine/nine_buffer_upload.c
diff --git a/src/gallium/state_trackers/nine/nine_buffer_upload.h b/src/gallium/frontends/nine/nine_buffer_upload.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_buffer_upload.h
rename to src/gallium/frontends/nine/nine_buffer_upload.h
diff --git a/src/gallium/state_trackers/nine/nine_csmt_helper.h b/src/gallium/frontends/nine/nine_csmt_helper.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_csmt_helper.h
rename to src/gallium/frontends/nine/nine_csmt_helper.h
diff --git a/src/gallium/state_trackers/nine/nine_debug.c b/src/gallium/frontends/nine/nine_debug.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_debug.c
rename to src/gallium/frontends/nine/nine_debug.c
diff --git a/src/gallium/state_trackers/nine/nine_debug.h b/src/gallium/frontends/nine/nine_debug.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_debug.h
rename to src/gallium/frontends/nine/nine_debug.h
diff --git a/src/gallium/state_trackers/nine/nine_defines.h b/src/gallium/frontends/nine/nine_defines.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_defines.h
rename to src/gallium/frontends/nine/nine_defines.h
diff --git a/src/gallium/state_trackers/nine/nine_dump.c b/src/gallium/frontends/nine/nine_dump.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_dump.c
rename to src/gallium/frontends/nine/nine_dump.c
diff --git a/src/gallium/state_trackers/nine/nine_dump.h b/src/gallium/frontends/nine/nine_dump.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_dump.h
rename to src/gallium/frontends/nine/nine_dump.h
diff --git a/src/gallium/state_trackers/nine/nine_ff.c b/src/gallium/frontends/nine/nine_ff.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_ff.c
rename to src/gallium/frontends/nine/nine_ff.c
diff --git a/src/gallium/state_trackers/nine/nine_ff.h b/src/gallium/frontends/nine/nine_ff.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_ff.h
rename to src/gallium/frontends/nine/nine_ff.h
diff --git a/src/gallium/state_trackers/nine/nine_flags.h b/src/gallium/frontends/nine/nine_flags.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_flags.h
rename to src/gallium/frontends/nine/nine_flags.h
diff --git a/src/gallium/state_trackers/nine/nine_helpers.c b/src/gallium/frontends/nine/nine_helpers.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_helpers.c
rename to src/gallium/frontends/nine/nine_helpers.c
diff --git a/src/gallium/state_trackers/nine/nine_helpers.h b/src/gallium/frontends/nine/nine_helpers.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_helpers.h
rename to src/gallium/frontends/nine/nine_helpers.h
diff --git a/src/gallium/state_trackers/nine/nine_limits.h b/src/gallium/frontends/nine/nine_limits.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_limits.h
rename to src/gallium/frontends/nine/nine_limits.h
diff --git a/src/gallium/state_trackers/nine/nine_lock.c b/src/gallium/frontends/nine/nine_lock.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_lock.c
rename to src/gallium/frontends/nine/nine_lock.c
diff --git a/src/gallium/state_trackers/nine/nine_lock.h b/src/gallium/frontends/nine/nine_lock.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_lock.h
rename to src/gallium/frontends/nine/nine_lock.h
diff --git a/src/gallium/state_trackers/nine/nine_pdata.h b/src/gallium/frontends/nine/nine_pdata.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_pdata.h
rename to src/gallium/frontends/nine/nine_pdata.h
diff --git a/src/gallium/state_trackers/nine/nine_pipe.c b/src/gallium/frontends/nine/nine_pipe.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_pipe.c
rename to src/gallium/frontends/nine/nine_pipe.c
diff --git a/src/gallium/state_trackers/nine/nine_pipe.h b/src/gallium/frontends/nine/nine_pipe.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_pipe.h
rename to src/gallium/frontends/nine/nine_pipe.h
diff --git a/src/gallium/state_trackers/nine/nine_queue.c b/src/gallium/frontends/nine/nine_queue.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_queue.c
rename to src/gallium/frontends/nine/nine_queue.c
diff --git a/src/gallium/state_trackers/nine/nine_queue.h b/src/gallium/frontends/nine/nine_queue.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_queue.h
rename to src/gallium/frontends/nine/nine_queue.h
diff --git a/src/gallium/state_trackers/nine/nine_quirk.c b/src/gallium/frontends/nine/nine_quirk.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_quirk.c
rename to src/gallium/frontends/nine/nine_quirk.c
diff --git a/src/gallium/state_trackers/nine/nine_quirk.h b/src/gallium/frontends/nine/nine_quirk.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_quirk.h
rename to src/gallium/frontends/nine/nine_quirk.h
diff --git a/src/gallium/state_trackers/nine/nine_shader.c b/src/gallium/frontends/nine/nine_shader.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_shader.c
rename to src/gallium/frontends/nine/nine_shader.c
diff --git a/src/gallium/state_trackers/nine/nine_shader.h b/src/gallium/frontends/nine/nine_shader.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_shader.h
rename to src/gallium/frontends/nine/nine_shader.h
diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/frontends/nine/nine_state.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_state.c
rename to src/gallium/frontends/nine/nine_state.c
diff --git a/src/gallium/state_trackers/nine/nine_state.h b/src/gallium/frontends/nine/nine_state.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nine_state.h
rename to src/gallium/frontends/nine/nine_state.h
diff --git a/src/gallium/state_trackers/nine/nineexoverlayextension.c b/src/gallium/frontends/nine/nineexoverlayextension.c
similarity index 100%
rename from src/gallium/state_trackers/nine/nineexoverlayextension.c
rename to src/gallium/frontends/nine/nineexoverlayextension.c
diff --git a/src/gallium/state_trackers/nine/nineexoverlayextension.h b/src/gallium/frontends/nine/nineexoverlayextension.h
similarity index 100%
rename from src/gallium/state_trackers/nine/nineexoverlayextension.h
rename to src/gallium/frontends/nine/nineexoverlayextension.h
diff --git a/src/gallium/state_trackers/nine/pixelshader9.c b/src/gallium/frontends/nine/pixelshader9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/pixelshader9.c
rename to src/gallium/frontends/nine/pixelshader9.c
diff --git a/src/gallium/state_trackers/nine/pixelshader9.h b/src/gallium/frontends/nine/pixelshader9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/pixelshader9.h
rename to src/gallium/frontends/nine/pixelshader9.h
diff --git a/src/gallium/state_trackers/nine/query9.c b/src/gallium/frontends/nine/query9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/query9.c
rename to src/gallium/frontends/nine/query9.c
diff --git a/src/gallium/state_trackers/nine/query9.h b/src/gallium/frontends/nine/query9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/query9.h
rename to src/gallium/frontends/nine/query9.h
diff --git a/src/gallium/state_trackers/nine/resource9.c b/src/gallium/frontends/nine/resource9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/resource9.c
rename to src/gallium/frontends/nine/resource9.c
diff --git a/src/gallium/state_trackers/nine/resource9.h b/src/gallium/frontends/nine/resource9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/resource9.h
rename to src/gallium/frontends/nine/resource9.h
diff --git a/src/gallium/state_trackers/nine/stateblock9.c b/src/gallium/frontends/nine/stateblock9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/stateblock9.c
rename to src/gallium/frontends/nine/stateblock9.c
diff --git a/src/gallium/state_trackers/nine/stateblock9.h b/src/gallium/frontends/nine/stateblock9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/stateblock9.h
rename to src/gallium/frontends/nine/stateblock9.h
diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/frontends/nine/surface9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/surface9.c
rename to src/gallium/frontends/nine/surface9.c
diff --git a/src/gallium/state_trackers/nine/surface9.h b/src/gallium/frontends/nine/surface9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/surface9.h
rename to src/gallium/frontends/nine/surface9.h
diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/frontends/nine/swapchain9.c
similarity index 99%
rename from src/gallium/state_trackers/nine/swapchain9.c
rename to src/gallium/frontends/nine/swapchain9.c
index 8a1b1bf145a..e3426b481cd 100644
--- a/src/gallium/state_trackers/nine/swapchain9.c
+++ b/src/gallium/frontends/nine/swapchain9.c
@@ -32,7 +32,7 @@
 #include "util/u_inlines.h"
 #include "util/u_surface.h"
 #include "hud/hud_context.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "threadpool.h"
 
diff --git a/src/gallium/state_trackers/nine/swapchain9.h b/src/gallium/frontends/nine/swapchain9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/swapchain9.h
rename to src/gallium/frontends/nine/swapchain9.h
diff --git a/src/gallium/state_trackers/nine/swapchain9ex.c b/src/gallium/frontends/nine/swapchain9ex.c
similarity index 100%
rename from src/gallium/state_trackers/nine/swapchain9ex.c
rename to src/gallium/frontends/nine/swapchain9ex.c
diff --git a/src/gallium/state_trackers/nine/swapchain9ex.h b/src/gallium/frontends/nine/swapchain9ex.h
similarity index 100%
rename from src/gallium/state_trackers/nine/swapchain9ex.h
rename to src/gallium/frontends/nine/swapchain9ex.h
diff --git a/src/gallium/state_trackers/nine/texture9.c b/src/gallium/frontends/nine/texture9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/texture9.c
rename to src/gallium/frontends/nine/texture9.c
diff --git a/src/gallium/state_trackers/nine/texture9.h b/src/gallium/frontends/nine/texture9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/texture9.h
rename to src/gallium/frontends/nine/texture9.h
diff --git a/src/gallium/state_trackers/nine/threadpool.c b/src/gallium/frontends/nine/threadpool.c
similarity index 99%
rename from src/gallium/state_trackers/nine/threadpool.c
rename to src/gallium/frontends/nine/threadpool.c
index 3ce6cd57524..eb852b65dc6 100644
--- a/src/gallium/state_trackers/nine/threadpool.c
+++ b/src/gallium/frontends/nine/threadpool.c
@@ -32,7 +32,7 @@
 #include "util/u_inlines.h"
 #include "util/u_surface.h"
 #include "hud/hud_context.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "os/os_thread.h"
 #include "threadpool.h"
diff --git a/src/gallium/state_trackers/nine/threadpool.h b/src/gallium/frontends/nine/threadpool.h
similarity index 100%
rename from src/gallium/state_trackers/nine/threadpool.h
rename to src/gallium/frontends/nine/threadpool.h
diff --git a/src/gallium/state_trackers/nine/vertexbuffer9.c b/src/gallium/frontends/nine/vertexbuffer9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/vertexbuffer9.c
rename to src/gallium/frontends/nine/vertexbuffer9.c
diff --git a/src/gallium/state_trackers/nine/vertexbuffer9.h b/src/gallium/frontends/nine/vertexbuffer9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/vertexbuffer9.h
rename to src/gallium/frontends/nine/vertexbuffer9.h
diff --git a/src/gallium/state_trackers/nine/vertexdeclaration9.c b/src/gallium/frontends/nine/vertexdeclaration9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/vertexdeclaration9.c
rename to src/gallium/frontends/nine/vertexdeclaration9.c
diff --git a/src/gallium/state_trackers/nine/vertexdeclaration9.h b/src/gallium/frontends/nine/vertexdeclaration9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/vertexdeclaration9.h
rename to src/gallium/frontends/nine/vertexdeclaration9.h
diff --git a/src/gallium/state_trackers/nine/vertexshader9.c b/src/gallium/frontends/nine/vertexshader9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/vertexshader9.c
rename to src/gallium/frontends/nine/vertexshader9.c
diff --git a/src/gallium/state_trackers/nine/vertexshader9.h b/src/gallium/frontends/nine/vertexshader9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/vertexshader9.h
rename to src/gallium/frontends/nine/vertexshader9.h
diff --git a/src/gallium/state_trackers/nine/volume9.c b/src/gallium/frontends/nine/volume9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/volume9.c
rename to src/gallium/frontends/nine/volume9.c
diff --git a/src/gallium/state_trackers/nine/volume9.h b/src/gallium/frontends/nine/volume9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/volume9.h
rename to src/gallium/frontends/nine/volume9.h
diff --git a/src/gallium/state_trackers/nine/volumetexture9.c b/src/gallium/frontends/nine/volumetexture9.c
similarity index 100%
rename from src/gallium/state_trackers/nine/volumetexture9.c
rename to src/gallium/frontends/nine/volumetexture9.c
diff --git a/src/gallium/state_trackers/nine/volumetexture9.h b/src/gallium/frontends/nine/volumetexture9.h
similarity index 100%
rename from src/gallium/state_trackers/nine/volumetexture9.h
rename to src/gallium/frontends/nine/volumetexture9.h
diff --git a/src/gallium/state_trackers/omx/Makefile.sources b/src/gallium/frontends/omx/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/omx/Makefile.sources
rename to src/gallium/frontends/omx/Makefile.sources
diff --git a/src/gallium/state_trackers/omx/bellagio/Makefile.sources b/src/gallium/frontends/omx/bellagio/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/Makefile.sources
rename to src/gallium/frontends/omx/bellagio/Makefile.sources
diff --git a/src/gallium/state_trackers/omx/bellagio/entrypoint.c b/src/gallium/frontends/omx/bellagio/entrypoint.c
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/entrypoint.c
rename to src/gallium/frontends/omx/bellagio/entrypoint.c
diff --git a/src/gallium/state_trackers/omx/bellagio/entrypoint.h b/src/gallium/frontends/omx/bellagio/entrypoint.h
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/entrypoint.h
rename to src/gallium/frontends/omx/bellagio/entrypoint.h
diff --git a/src/gallium/state_trackers/omx/bellagio/vid_dec.c b/src/gallium/frontends/omx/bellagio/vid_dec.c
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/vid_dec.c
rename to src/gallium/frontends/omx/bellagio/vid_dec.c
diff --git a/src/gallium/state_trackers/omx/bellagio/vid_dec.h b/src/gallium/frontends/omx/bellagio/vid_dec.h
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/vid_dec.h
rename to src/gallium/frontends/omx/bellagio/vid_dec.h
diff --git a/src/gallium/state_trackers/omx/bellagio/vid_dec_h264.c b/src/gallium/frontends/omx/bellagio/vid_dec_h264.c
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/vid_dec_h264.c
rename to src/gallium/frontends/omx/bellagio/vid_dec_h264.c
diff --git a/src/gallium/state_trackers/omx/bellagio/vid_dec_h265.c b/src/gallium/frontends/omx/bellagio/vid_dec_h265.c
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/vid_dec_h265.c
rename to src/gallium/frontends/omx/bellagio/vid_dec_h265.c
diff --git a/src/gallium/state_trackers/omx/bellagio/vid_dec_mpeg12.c b/src/gallium/frontends/omx/bellagio/vid_dec_mpeg12.c
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/vid_dec_mpeg12.c
rename to src/gallium/frontends/omx/bellagio/vid_dec_mpeg12.c
diff --git a/src/gallium/state_trackers/omx/bellagio/vid_enc.c b/src/gallium/frontends/omx/bellagio/vid_enc.c
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/vid_enc.c
rename to src/gallium/frontends/omx/bellagio/vid_enc.c
diff --git a/src/gallium/state_trackers/omx/bellagio/vid_enc.h b/src/gallium/frontends/omx/bellagio/vid_enc.h
similarity index 100%
rename from src/gallium/state_trackers/omx/bellagio/vid_enc.h
rename to src/gallium/frontends/omx/bellagio/vid_enc.h
diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/frontends/omx/meson.build
similarity index 100%
rename from src/gallium/state_trackers/omx/meson.build
rename to src/gallium/frontends/omx/meson.build
diff --git a/src/gallium/state_trackers/omx/tizonia/Makefile.sources b/src/gallium/frontends/omx/tizonia/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/Makefile.sources
rename to src/gallium/frontends/omx/tizonia/Makefile.sources
diff --git a/src/gallium/state_trackers/omx/tizonia/entrypoint.c b/src/gallium/frontends/omx/tizonia/entrypoint.c
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/entrypoint.c
rename to src/gallium/frontends/omx/tizonia/entrypoint.c
diff --git a/src/gallium/state_trackers/omx/tizonia/entrypoint.h b/src/gallium/frontends/omx/tizonia/entrypoint.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/entrypoint.h
rename to src/gallium/frontends/omx/tizonia/entrypoint.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264d.c b/src/gallium/frontends/omx/tizonia/h264d.c
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264d.c
rename to src/gallium/frontends/omx/tizonia/h264d.c
diff --git a/src/gallium/state_trackers/omx/tizonia/h264d.h b/src/gallium/frontends/omx/tizonia/h264d.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264d.h
rename to src/gallium/frontends/omx/tizonia/h264d.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264dinport.c b/src/gallium/frontends/omx/tizonia/h264dinport.c
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264dinport.c
rename to src/gallium/frontends/omx/tizonia/h264dinport.c
diff --git a/src/gallium/state_trackers/omx/tizonia/h264dinport.h b/src/gallium/frontends/omx/tizonia/h264dinport.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264dinport.h
rename to src/gallium/frontends/omx/tizonia/h264dinport.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264dinport_decls.h b/src/gallium/frontends/omx/tizonia/h264dinport_decls.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264dinport_decls.h
rename to src/gallium/frontends/omx/tizonia/h264dinport_decls.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264dprc.c b/src/gallium/frontends/omx/tizonia/h264dprc.c
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264dprc.c
rename to src/gallium/frontends/omx/tizonia/h264dprc.c
diff --git a/src/gallium/state_trackers/omx/tizonia/h264dprc.h b/src/gallium/frontends/omx/tizonia/h264dprc.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264dprc.h
rename to src/gallium/frontends/omx/tizonia/h264dprc.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264e.c b/src/gallium/frontends/omx/tizonia/h264e.c
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264e.c
rename to src/gallium/frontends/omx/tizonia/h264e.c
diff --git a/src/gallium/state_trackers/omx/tizonia/h264e.h b/src/gallium/frontends/omx/tizonia/h264e.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264e.h
rename to src/gallium/frontends/omx/tizonia/h264e.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264einport.c b/src/gallium/frontends/omx/tizonia/h264einport.c
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264einport.c
rename to src/gallium/frontends/omx/tizonia/h264einport.c
diff --git a/src/gallium/state_trackers/omx/tizonia/h264einport.h b/src/gallium/frontends/omx/tizonia/h264einport.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264einport.h
rename to src/gallium/frontends/omx/tizonia/h264einport.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264einport_decls.h b/src/gallium/frontends/omx/tizonia/h264einport_decls.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264einport_decls.h
rename to src/gallium/frontends/omx/tizonia/h264einport_decls.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264eoutport.c b/src/gallium/frontends/omx/tizonia/h264eoutport.c
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264eoutport.c
rename to src/gallium/frontends/omx/tizonia/h264eoutport.c
diff --git a/src/gallium/state_trackers/omx/tizonia/h264eoutport.h b/src/gallium/frontends/omx/tizonia/h264eoutport.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264eoutport.h
rename to src/gallium/frontends/omx/tizonia/h264eoutport.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264eoutport_decls.h b/src/gallium/frontends/omx/tizonia/h264eoutport_decls.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264eoutport_decls.h
rename to src/gallium/frontends/omx/tizonia/h264eoutport_decls.h
diff --git a/src/gallium/state_trackers/omx/tizonia/h264eprc.c b/src/gallium/frontends/omx/tizonia/h264eprc.c
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264eprc.c
rename to src/gallium/frontends/omx/tizonia/h264eprc.c
diff --git a/src/gallium/state_trackers/omx/tizonia/h264eprc.h b/src/gallium/frontends/omx/tizonia/h264eprc.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/h264eprc.h
rename to src/gallium/frontends/omx/tizonia/h264eprc.h
diff --git a/src/gallium/state_trackers/omx/tizonia/names.h b/src/gallium/frontends/omx/tizonia/names.h
similarity index 100%
rename from src/gallium/state_trackers/omx/tizonia/names.h
rename to src/gallium/frontends/omx/tizonia/names.h
diff --git a/src/gallium/state_trackers/omx/vid_dec_common.c b/src/gallium/frontends/omx/vid_dec_common.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec_common.c
rename to src/gallium/frontends/omx/vid_dec_common.c
diff --git a/src/gallium/state_trackers/omx/vid_dec_common.h b/src/gallium/frontends/omx/vid_dec_common.h
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec_common.h
rename to src/gallium/frontends/omx/vid_dec_common.h
diff --git a/src/gallium/state_trackers/omx/vid_dec_h264_common.c b/src/gallium/frontends/omx/vid_dec_h264_common.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec_h264_common.c
rename to src/gallium/frontends/omx/vid_dec_h264_common.c
diff --git a/src/gallium/state_trackers/omx/vid_dec_h264_common.h b/src/gallium/frontends/omx/vid_dec_h264_common.h
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_dec_h264_common.h
rename to src/gallium/frontends/omx/vid_dec_h264_common.h
diff --git a/src/gallium/state_trackers/omx/vid_enc_common.c b/src/gallium/frontends/omx/vid_enc_common.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_enc_common.c
rename to src/gallium/frontends/omx/vid_enc_common.c
diff --git a/src/gallium/state_trackers/omx/vid_enc_common.h b/src/gallium/frontends/omx/vid_enc_common.h
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_enc_common.h
rename to src/gallium/frontends/omx/vid_enc_common.h
diff --git a/src/gallium/state_trackers/omx/vid_omx_common.c b/src/gallium/frontends/omx/vid_omx_common.c
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_omx_common.c
rename to src/gallium/frontends/omx/vid_omx_common.c
diff --git a/src/gallium/state_trackers/omx/vid_omx_common.h b/src/gallium/frontends/omx/vid_omx_common.h
similarity index 100%
rename from src/gallium/state_trackers/omx/vid_omx_common.h
rename to src/gallium/frontends/omx/vid_omx_common.h
diff --git a/src/gallium/frontends/osmesa/Makefile.sources b/src/gallium/frontends/osmesa/Makefile.sources
new file mode 100644
index 00000000000..f8008efdec5
--- /dev/null
+++ b/src/gallium/frontends/osmesa/Makefile.sources
@@ -0,0 +1,2 @@
+C_SOURCES := \
+	osmesa.c
diff --git a/src/gallium/frontends/osmesa/SConscript b/src/gallium/frontends/osmesa/SConscript
new file mode 100644
index 00000000000..be67d0fe739
--- /dev/null
+++ b/src/gallium/frontends/osmesa/SConscript
@@ -0,0 +1,24 @@
+import os
+
+Import('*')
+
+env = env.Clone()
+
+env.Append(CPPPATH = [
+    '#src/mapi',
+    '#src/mesa',
+    '.',
+])
+
+if env['platform'] == 'windows':
+    env.AppendUnique(CPPDEFINES = [
+        'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+        'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
+        '_GLAPI_NO_EXPORTS', # prevent _glapi_* from being declared __declspec(dllimport)
+    ])
+
+st_osmesa = env.ConvenienceLibrary(
+    target ='st_osmesa',
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
+)
+Export('st_osmesa')
diff --git a/src/gallium/state_trackers/osmesa/meson.build b/src/gallium/frontends/osmesa/meson.build
similarity index 100%
rename from src/gallium/state_trackers/osmesa/meson.build
rename to src/gallium/frontends/osmesa/meson.build
diff --git a/src/gallium/state_trackers/osmesa/osmesa.c b/src/gallium/frontends/osmesa/osmesa.c
similarity index 99%
rename from src/gallium/state_trackers/osmesa/osmesa.c
rename to src/gallium/frontends/osmesa/osmesa.c
index b1890a33c46..8689c1113a3 100644
--- a/src/gallium/state_trackers/osmesa/osmesa.c
+++ b/src/gallium/frontends/osmesa/osmesa.c
@@ -69,7 +69,7 @@
 #include "postprocess/filters.h"
 #include "postprocess/postprocess.h"
 
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 #include "state_tracker/st_gl_api.h"
 
 
diff --git a/src/gallium/state_trackers/va/Makefile.sources b/src/gallium/frontends/va/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/va/Makefile.sources
rename to src/gallium/frontends/va/Makefile.sources
diff --git a/src/gallium/state_trackers/va/buffer.c b/src/gallium/frontends/va/buffer.c
similarity index 99%
rename from src/gallium/state_trackers/va/buffer.c
rename to src/gallium/frontends/va/buffer.c
index 0691b7023b2..5ab90186a1a 100644
--- a/src/gallium/state_trackers/va/buffer.c
+++ b/src/gallium/frontends/va/buffer.c
@@ -27,7 +27,7 @@
  **************************************************************************/
 
 #include "pipe/p_screen.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/u_memory.h"
 #include "util/u_handle_table.h"
 #include "util/u_transfer.h"
diff --git a/src/gallium/state_trackers/va/config.c b/src/gallium/frontends/va/config.c
similarity index 100%
rename from src/gallium/state_trackers/va/config.c
rename to src/gallium/frontends/va/config.c
diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/frontends/va/context.c
similarity index 100%
rename from src/gallium/state_trackers/va/context.c
rename to src/gallium/frontends/va/context.c
diff --git a/src/gallium/state_trackers/va/display.c b/src/gallium/frontends/va/display.c
similarity index 100%
rename from src/gallium/state_trackers/va/display.c
rename to src/gallium/frontends/va/display.c
diff --git a/src/gallium/state_trackers/va/image.c b/src/gallium/frontends/va/image.c
similarity index 100%
rename from src/gallium/state_trackers/va/image.c
rename to src/gallium/frontends/va/image.c
diff --git a/src/gallium/state_trackers/va/meson.build b/src/gallium/frontends/va/meson.build
similarity index 100%
rename from src/gallium/state_trackers/va/meson.build
rename to src/gallium/frontends/va/meson.build
diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/frontends/va/picture.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture.c
rename to src/gallium/frontends/va/picture.c
diff --git a/src/gallium/state_trackers/va/picture_h264.c b/src/gallium/frontends/va/picture_h264.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_h264.c
rename to src/gallium/frontends/va/picture_h264.c
diff --git a/src/gallium/state_trackers/va/picture_h264_enc.c b/src/gallium/frontends/va/picture_h264_enc.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_h264_enc.c
rename to src/gallium/frontends/va/picture_h264_enc.c
diff --git a/src/gallium/state_trackers/va/picture_hevc.c b/src/gallium/frontends/va/picture_hevc.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_hevc.c
rename to src/gallium/frontends/va/picture_hevc.c
diff --git a/src/gallium/state_trackers/va/picture_hevc_enc.c b/src/gallium/frontends/va/picture_hevc_enc.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_hevc_enc.c
rename to src/gallium/frontends/va/picture_hevc_enc.c
diff --git a/src/gallium/state_trackers/va/picture_mjpeg.c b/src/gallium/frontends/va/picture_mjpeg.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_mjpeg.c
rename to src/gallium/frontends/va/picture_mjpeg.c
diff --git a/src/gallium/state_trackers/va/picture_mpeg12.c b/src/gallium/frontends/va/picture_mpeg12.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_mpeg12.c
rename to src/gallium/frontends/va/picture_mpeg12.c
diff --git a/src/gallium/state_trackers/va/picture_mpeg4.c b/src/gallium/frontends/va/picture_mpeg4.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_mpeg4.c
rename to src/gallium/frontends/va/picture_mpeg4.c
diff --git a/src/gallium/state_trackers/va/picture_vc1.c b/src/gallium/frontends/va/picture_vc1.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_vc1.c
rename to src/gallium/frontends/va/picture_vc1.c
diff --git a/src/gallium/state_trackers/va/picture_vp9.c b/src/gallium/frontends/va/picture_vp9.c
similarity index 100%
rename from src/gallium/state_trackers/va/picture_vp9.c
rename to src/gallium/frontends/va/picture_vp9.c
diff --git a/src/gallium/state_trackers/va/postproc.c b/src/gallium/frontends/va/postproc.c
similarity index 100%
rename from src/gallium/state_trackers/va/postproc.c
rename to src/gallium/frontends/va/postproc.c
diff --git a/src/gallium/state_trackers/va/subpicture.c b/src/gallium/frontends/va/subpicture.c
similarity index 100%
rename from src/gallium/state_trackers/va/subpicture.c
rename to src/gallium/frontends/va/subpicture.c
diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/frontends/va/surface.c
similarity index 99%
rename from src/gallium/state_trackers/va/surface.c
rename to src/gallium/frontends/va/surface.c
index bfad93f8f3d..964d316bc46 100644
--- a/src/gallium/state_trackers/va/surface.c
+++ b/src/gallium/frontends/va/surface.c
@@ -29,7 +29,7 @@
 #include "pipe/p_screen.h"
 #include "pipe/p_video_codec.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "util/u_memory.h"
 #include "util/u_handle_table.h"
diff --git a/src/gallium/state_trackers/va/va_private.h b/src/gallium/frontends/va/va_private.h
similarity index 100%
rename from src/gallium/state_trackers/va/va_private.h
rename to src/gallium/frontends/va/va_private.h
diff --git a/src/gallium/state_trackers/vdpau/Makefile.sources b/src/gallium/frontends/vdpau/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/vdpau/Makefile.sources
rename to src/gallium/frontends/vdpau/Makefile.sources
diff --git a/src/gallium/state_trackers/vdpau/bitmap.c b/src/gallium/frontends/vdpau/bitmap.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/bitmap.c
rename to src/gallium/frontends/vdpau/bitmap.c
diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/frontends/vdpau/decode.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/decode.c
rename to src/gallium/frontends/vdpau/decode.c
diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/frontends/vdpau/device.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/device.c
rename to src/gallium/frontends/vdpau/device.c
diff --git a/src/gallium/state_trackers/vdpau/ftab.c b/src/gallium/frontends/vdpau/ftab.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/ftab.c
rename to src/gallium/frontends/vdpau/ftab.c
diff --git a/src/gallium/state_trackers/vdpau/htab.c b/src/gallium/frontends/vdpau/htab.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/htab.c
rename to src/gallium/frontends/vdpau/htab.c
diff --git a/src/gallium/state_trackers/vdpau/meson.build b/src/gallium/frontends/vdpau/meson.build
similarity index 100%
rename from src/gallium/state_trackers/vdpau/meson.build
rename to src/gallium/frontends/vdpau/meson.build
diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/frontends/vdpau/mixer.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/mixer.c
rename to src/gallium/frontends/vdpau/mixer.c
diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/frontends/vdpau/output.c
similarity index 99%
rename from src/gallium/state_trackers/vdpau/output.c
rename to src/gallium/frontends/vdpau/output.c
index ac8fc550bc7..75a9f016e90 100644
--- a/src/gallium/state_trackers/vdpau/output.c
+++ b/src/gallium/frontends/vdpau/output.c
@@ -36,7 +36,7 @@
 
 #include "vl/vl_csc.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "vdpau_private.h"
 
diff --git a/src/gallium/state_trackers/vdpau/preemption.c b/src/gallium/frontends/vdpau/preemption.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/preemption.c
rename to src/gallium/frontends/vdpau/preemption.c
diff --git a/src/gallium/state_trackers/vdpau/presentation.c b/src/gallium/frontends/vdpau/presentation.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/presentation.c
rename to src/gallium/frontends/vdpau/presentation.c
diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/frontends/vdpau/query.c
similarity index 100%
rename from src/gallium/state_trackers/vdpau/query.c
rename to src/gallium/frontends/vdpau/query.c
diff --git a/src/gallium/state_trackers/vdpau/surface.c b/src/gallium/frontends/vdpau/surface.c
similarity index 99%
rename from src/gallium/state_trackers/vdpau/surface.c
rename to src/gallium/frontends/vdpau/surface.c
index 4158e6bcfe6..bce4400b0ee 100644
--- a/src/gallium/state_trackers/vdpau/surface.c
+++ b/src/gallium/frontends/vdpau/surface.c
@@ -37,7 +37,7 @@
 #include "util/u_video.h"
 #include "vl/vl_defines.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "vdpau_private.h"
 
diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/frontends/vdpau/vdpau_private.h
similarity index 99%
rename from src/gallium/state_trackers/vdpau/vdpau_private.h
rename to src/gallium/frontends/vdpau/vdpau_private.h
index 80bb5aee0fe..1f46f31a549 100644
--- a/src/gallium/state_trackers/vdpau/vdpau_private.h
+++ b/src/gallium/frontends/vdpau/vdpau_private.h
@@ -36,9 +36,9 @@
 #include "pipe/p_compiler.h"
 #include "pipe/p_video_codec.h"
 
-#include "state_tracker/vdpau_interop.h"
-#include "state_tracker/vdpau_dmabuf.h"
-#include "state_tracker/vdpau_funcs.h"
+#include "frontend/vdpau_interop.h"
+#include "frontend/vdpau_dmabuf.h"
+#include "frontend/vdpau_funcs.h"
 
 #include "util/u_debug.h"
 #include "util/u_rect.h"
diff --git a/src/gallium/state_trackers/wgl/Makefile.sources b/src/gallium/frontends/wgl/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/wgl/Makefile.sources
rename to src/gallium/frontends/wgl/Makefile.sources
diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/frontends/wgl/SConscript
similarity index 100%
rename from src/gallium/state_trackers/wgl/SConscript
rename to src/gallium/frontends/wgl/SConscript
diff --git a/src/gallium/state_trackers/wgl/gldrv.h b/src/gallium/frontends/wgl/gldrv.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/gldrv.h
rename to src/gallium/frontends/wgl/gldrv.h
diff --git a/src/gallium/state_trackers/wgl/meson.build b/src/gallium/frontends/wgl/meson.build
similarity index 100%
rename from src/gallium/state_trackers/wgl/meson.build
rename to src/gallium/frontends/wgl/meson.build
diff --git a/src/gallium/state_trackers/wgl/opengl32.def b/src/gallium/frontends/wgl/opengl32.def
similarity index 100%
rename from src/gallium/state_trackers/wgl/opengl32.def
rename to src/gallium/frontends/wgl/opengl32.def
diff --git a/src/gallium/state_trackers/wgl/opengl32.mingw.def b/src/gallium/frontends/wgl/opengl32.mingw.def
similarity index 100%
rename from src/gallium/state_trackers/wgl/opengl32.mingw.def
rename to src/gallium/frontends/wgl/opengl32.mingw.def
diff --git a/src/gallium/state_trackers/wgl/stw_context.c b/src/gallium/frontends/wgl/stw_context.c
similarity index 99%
rename from src/gallium/state_trackers/wgl/stw_context.c
rename to src/gallium/frontends/wgl/stw_context.c
index fe9b2e06e00..57dd85c382d 100644
--- a/src/gallium/state_trackers/wgl/stw_context.c
+++ b/src/gallium/frontends/wgl/stw_context.c
@@ -37,7 +37,7 @@
 #include "pipe/p_state.h"
 #include "util/u_memory.h"
 #include "util/u_atomic.h"
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 #include "hud/hud_context.h"
 
 #include "gldrv.h"
diff --git a/src/gallium/state_trackers/wgl/stw_context.h b/src/gallium/frontends/wgl/stw_context.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_context.h
rename to src/gallium/frontends/wgl/stw_context.h
diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/frontends/wgl/stw_device.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_device.c
rename to src/gallium/frontends/wgl/stw_device.c
diff --git a/src/gallium/state_trackers/wgl/stw_device.h b/src/gallium/frontends/wgl/stw_device.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_device.h
rename to src/gallium/frontends/wgl/stw_device.h
diff --git a/src/gallium/state_trackers/wgl/stw_ext_context.c b/src/gallium/frontends/wgl/stw_ext_context.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_ext_context.c
rename to src/gallium/frontends/wgl/stw_ext_context.c
diff --git a/src/gallium/state_trackers/wgl/stw_ext_context.h b/src/gallium/frontends/wgl/stw_ext_context.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_ext_context.h
rename to src/gallium/frontends/wgl/stw_ext_context.h
diff --git a/src/gallium/state_trackers/wgl/stw_ext_extensionsstring.c b/src/gallium/frontends/wgl/stw_ext_extensionsstring.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_ext_extensionsstring.c
rename to src/gallium/frontends/wgl/stw_ext_extensionsstring.c
diff --git a/src/gallium/state_trackers/wgl/stw_ext_pbuffer.c b/src/gallium/frontends/wgl/stw_ext_pbuffer.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_ext_pbuffer.c
rename to src/gallium/frontends/wgl/stw_ext_pbuffer.c
diff --git a/src/gallium/state_trackers/wgl/stw_ext_pixelformat.c b/src/gallium/frontends/wgl/stw_ext_pixelformat.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_ext_pixelformat.c
rename to src/gallium/frontends/wgl/stw_ext_pixelformat.c
diff --git a/src/gallium/state_trackers/wgl/stw_ext_rendertexture.c b/src/gallium/frontends/wgl/stw_ext_rendertexture.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_ext_rendertexture.c
rename to src/gallium/frontends/wgl/stw_ext_rendertexture.c
diff --git a/src/gallium/state_trackers/wgl/stw_ext_swapinterval.c b/src/gallium/frontends/wgl/stw_ext_swapinterval.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_ext_swapinterval.c
rename to src/gallium/frontends/wgl/stw_ext_swapinterval.c
diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.c b/src/gallium/frontends/wgl/stw_framebuffer.c
similarity index 99%
rename from src/gallium/state_trackers/wgl/stw_framebuffer.c
rename to src/gallium/frontends/wgl/stw_framebuffer.c
index 4078d95287b..1456f2e7caf 100644
--- a/src/gallium/state_trackers/wgl/stw_framebuffer.c
+++ b/src/gallium/frontends/wgl/stw_framebuffer.c
@@ -31,7 +31,7 @@
 #include "util/u_memory.h"
 #include "hud/hud_context.h"
 #include "util/os_time.h"
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 
 #include <GL/gl.h>
 #include "gldrv.h"
diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.h b/src/gallium/frontends/wgl/stw_framebuffer.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_framebuffer.h
rename to src/gallium/frontends/wgl/stw_framebuffer.h
diff --git a/src/gallium/state_trackers/wgl/stw_getprocaddress.c b/src/gallium/frontends/wgl/stw_getprocaddress.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_getprocaddress.c
rename to src/gallium/frontends/wgl/stw_getprocaddress.c
diff --git a/src/gallium/state_trackers/wgl/stw_nopfuncs.c b/src/gallium/frontends/wgl/stw_nopfuncs.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_nopfuncs.c
rename to src/gallium/frontends/wgl/stw_nopfuncs.c
diff --git a/src/gallium/state_trackers/wgl/stw_nopfuncs.h b/src/gallium/frontends/wgl/stw_nopfuncs.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_nopfuncs.h
rename to src/gallium/frontends/wgl/stw_nopfuncs.h
diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.c b/src/gallium/frontends/wgl/stw_pixelformat.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_pixelformat.c
rename to src/gallium/frontends/wgl/stw_pixelformat.c
diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.h b/src/gallium/frontends/wgl/stw_pixelformat.h
similarity index 98%
rename from src/gallium/state_trackers/wgl/stw_pixelformat.h
rename to src/gallium/frontends/wgl/stw_pixelformat.h
index 06753b09e16..e3ab1ee7514 100644
--- a/src/gallium/state_trackers/wgl/stw_pixelformat.h
+++ b/src/gallium/frontends/wgl/stw_pixelformat.h
@@ -36,7 +36,7 @@
 
 #include "pipe/p_compiler.h"
 #include "pipe/p_format.h"
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 
 struct stw_pixelformat_info
 {
diff --git a/src/gallium/state_trackers/wgl/stw_st.c b/src/gallium/frontends/wgl/stw_st.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_st.c
rename to src/gallium/frontends/wgl/stw_st.c
diff --git a/src/gallium/state_trackers/wgl/stw_st.h b/src/gallium/frontends/wgl/stw_st.h
similarity index 98%
rename from src/gallium/state_trackers/wgl/stw_st.h
rename to src/gallium/frontends/wgl/stw_st.h
index 20d491fa609..91b8fffc2ce 100644
--- a/src/gallium/state_trackers/wgl/stw_st.h
+++ b/src/gallium/frontends/wgl/stw_st.h
@@ -30,7 +30,7 @@
 
 #include <windows.h>
 
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 
 struct stw_framebuffer;
 
diff --git a/src/gallium/state_trackers/wgl/stw_tls.c b/src/gallium/frontends/wgl/stw_tls.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_tls.c
rename to src/gallium/frontends/wgl/stw_tls.c
diff --git a/src/gallium/state_trackers/wgl/stw_tls.h b/src/gallium/frontends/wgl/stw_tls.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_tls.h
rename to src/gallium/frontends/wgl/stw_tls.h
diff --git a/src/gallium/state_trackers/wgl/stw_wgl.c b/src/gallium/frontends/wgl/stw_wgl.c
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_wgl.c
rename to src/gallium/frontends/wgl/stw_wgl.c
diff --git a/src/gallium/state_trackers/wgl/stw_wgl.h b/src/gallium/frontends/wgl/stw_wgl.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_wgl.h
rename to src/gallium/frontends/wgl/stw_wgl.h
diff --git a/src/gallium/state_trackers/wgl/stw_winsys.h b/src/gallium/frontends/wgl/stw_winsys.h
similarity index 100%
rename from src/gallium/state_trackers/wgl/stw_winsys.h
rename to src/gallium/frontends/wgl/stw_winsys.h
diff --git a/src/gallium/state_trackers/xa/.editorconfig b/src/gallium/frontends/xa/.editorconfig
similarity index 100%
rename from src/gallium/state_trackers/xa/.editorconfig
rename to src/gallium/frontends/xa/.editorconfig
diff --git a/src/gallium/state_trackers/xa/Makefile.sources b/src/gallium/frontends/xa/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/xa/Makefile.sources
rename to src/gallium/frontends/xa/Makefile.sources
diff --git a/src/gallium/state_trackers/xa/README b/src/gallium/frontends/xa/README
similarity index 100%
rename from src/gallium/state_trackers/xa/README
rename to src/gallium/frontends/xa/README
diff --git a/src/gallium/state_trackers/xa/meson.build b/src/gallium/frontends/xa/meson.build
similarity index 100%
rename from src/gallium/state_trackers/xa/meson.build
rename to src/gallium/frontends/xa/meson.build
diff --git a/src/gallium/state_trackers/xa/xa-indent.sh b/src/gallium/frontends/xa/xa-indent.sh
similarity index 100%
rename from src/gallium/state_trackers/xa/xa-indent.sh
rename to src/gallium/frontends/xa/xa-indent.sh
diff --git a/src/gallium/state_trackers/xa/xa_composite.c b/src/gallium/frontends/xa/xa_composite.c
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_composite.c
rename to src/gallium/frontends/xa/xa_composite.c
diff --git a/src/gallium/state_trackers/xa/xa_composite.h b/src/gallium/frontends/xa/xa_composite.h
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_composite.h
rename to src/gallium/frontends/xa/xa_composite.h
diff --git a/src/gallium/state_trackers/xa/xa_context.c b/src/gallium/frontends/xa/xa_context.c
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_context.c
rename to src/gallium/frontends/xa/xa_context.c
diff --git a/src/gallium/state_trackers/xa/xa_context.h b/src/gallium/frontends/xa/xa_context.h
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_context.h
rename to src/gallium/frontends/xa/xa_context.h
diff --git a/src/gallium/state_trackers/xa/xa_priv.h b/src/gallium/frontends/xa/xa_priv.h
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_priv.h
rename to src/gallium/frontends/xa/xa_priv.h
diff --git a/src/gallium/state_trackers/xa/xa_renderer.c b/src/gallium/frontends/xa/xa_renderer.c
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_renderer.c
rename to src/gallium/frontends/xa/xa_renderer.c
diff --git a/src/gallium/state_trackers/xa/xa_tgsi.c b/src/gallium/frontends/xa/xa_tgsi.c
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_tgsi.c
rename to src/gallium/frontends/xa/xa_tgsi.c
diff --git a/src/gallium/state_trackers/xa/xa_tracker.c b/src/gallium/frontends/xa/xa_tracker.c
similarity index 99%
rename from src/gallium/state_trackers/xa/xa_tracker.c
rename to src/gallium/frontends/xa/xa_tracker.c
index 0909044fb91..31162606375 100644
--- a/src/gallium/state_trackers/xa/xa_tracker.c
+++ b/src/gallium/frontends/xa/xa_tracker.c
@@ -32,7 +32,7 @@
 #include "pipe/p_state.h"
 #include "pipe/p_format.h"
 #include "pipe-loader/pipe_loader.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "util/u_inlines.h"
 
 /*
diff --git a/src/gallium/state_trackers/xa/xa_tracker.h.in b/src/gallium/frontends/xa/xa_tracker.h.in
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_tracker.h.in
rename to src/gallium/frontends/xa/xa_tracker.h.in
diff --git a/src/gallium/state_trackers/xa/xa_yuv.c b/src/gallium/frontends/xa/xa_yuv.c
similarity index 100%
rename from src/gallium/state_trackers/xa/xa_yuv.c
rename to src/gallium/frontends/xa/xa_yuv.c
diff --git a/src/gallium/state_trackers/xvmc/Makefile.sources b/src/gallium/frontends/xvmc/Makefile.sources
similarity index 100%
rename from src/gallium/state_trackers/xvmc/Makefile.sources
rename to src/gallium/frontends/xvmc/Makefile.sources
diff --git a/src/gallium/state_trackers/xvmc/attributes.c b/src/gallium/frontends/xvmc/attributes.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/attributes.c
rename to src/gallium/frontends/xvmc/attributes.c
diff --git a/src/gallium/state_trackers/xvmc/block.c b/src/gallium/frontends/xvmc/block.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/block.c
rename to src/gallium/frontends/xvmc/block.c
diff --git a/src/gallium/state_trackers/xvmc/context.c b/src/gallium/frontends/xvmc/context.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/context.c
rename to src/gallium/frontends/xvmc/context.c
diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/frontends/xvmc/meson.build
similarity index 100%
rename from src/gallium/state_trackers/xvmc/meson.build
rename to src/gallium/frontends/xvmc/meson.build
diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/frontends/xvmc/subpicture.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/subpicture.c
rename to src/gallium/frontends/xvmc/subpicture.c
diff --git a/src/gallium/state_trackers/xvmc/surface.c b/src/gallium/frontends/xvmc/surface.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/surface.c
rename to src/gallium/frontends/xvmc/surface.c
diff --git a/src/gallium/state_trackers/xvmc/tests/test_blocks.c b/src/gallium/frontends/xvmc/tests/test_blocks.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/tests/test_blocks.c
rename to src/gallium/frontends/xvmc/tests/test_blocks.c
diff --git a/src/gallium/state_trackers/xvmc/tests/test_context.c b/src/gallium/frontends/xvmc/tests/test_context.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/tests/test_context.c
rename to src/gallium/frontends/xvmc/tests/test_context.c
diff --git a/src/gallium/state_trackers/xvmc/tests/test_rendering.c b/src/gallium/frontends/xvmc/tests/test_rendering.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/tests/test_rendering.c
rename to src/gallium/frontends/xvmc/tests/test_rendering.c
diff --git a/src/gallium/state_trackers/xvmc/tests/test_subpicture.c b/src/gallium/frontends/xvmc/tests/test_subpicture.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/tests/test_subpicture.c
rename to src/gallium/frontends/xvmc/tests/test_subpicture.c
diff --git a/src/gallium/state_trackers/xvmc/tests/test_surface.c b/src/gallium/frontends/xvmc/tests/test_surface.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/tests/test_surface.c
rename to src/gallium/frontends/xvmc/tests/test_surface.c
diff --git a/src/gallium/state_trackers/xvmc/tests/testlib.c b/src/gallium/frontends/xvmc/tests/testlib.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/tests/testlib.c
rename to src/gallium/frontends/xvmc/tests/testlib.c
diff --git a/src/gallium/state_trackers/xvmc/tests/testlib.h b/src/gallium/frontends/xvmc/tests/testlib.h
similarity index 100%
rename from src/gallium/state_trackers/xvmc/tests/testlib.h
rename to src/gallium/frontends/xvmc/tests/testlib.h
diff --git a/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c b/src/gallium/frontends/xvmc/tests/xvmc_bench.c
similarity index 100%
rename from src/gallium/state_trackers/xvmc/tests/xvmc_bench.c
rename to src/gallium/frontends/xvmc/tests/xvmc_bench.c
diff --git a/src/gallium/state_trackers/xvmc/xvmc_private.h b/src/gallium/frontends/xvmc/xvmc_private.h
similarity index 100%
rename from src/gallium/state_trackers/xvmc/xvmc_private.h
rename to src/gallium/frontends/xvmc/xvmc_private.h
diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/frontend/api.h
similarity index 99%
rename from src/gallium/include/state_tracker/st_api.h
rename to src/gallium/include/frontend/api.h
index 3777449e61d..5bcb8d9fea6 100644
--- a/src/gallium/include/state_tracker/st_api.h
+++ b/src/gallium/include/frontend/api.h
@@ -24,8 +24,8 @@
  **********************************************************/
 
 
-#ifndef _ST_API_H_
-#define _ST_API_H_
+#ifndef _API_H_
+#define _API_H_
 
 #include "pipe/p_format.h"
 
@@ -572,4 +572,4 @@ st_visual_have_buffers(const struct st_visual *visual, unsigned mask)
    return ((visual->buffer_mask & mask) == mask);
 }
 
-#endif /* _ST_API_H_ */
+#endif /* _API_H_ */
diff --git a/src/gallium/include/state_tracker/drisw_api.h b/src/gallium/include/frontend/drisw_api.h
similarity index 100%
rename from src/gallium/include/state_tracker/drisw_api.h
rename to src/gallium/include/frontend/drisw_api.h
diff --git a/src/gallium/include/state_tracker/drm_driver.h b/src/gallium/include/frontend/drm_driver.h
similarity index 100%
rename from src/gallium/include/state_tracker/drm_driver.h
rename to src/gallium/include/frontend/drm_driver.h
diff --git a/src/gallium/include/state_tracker/graw.h b/src/gallium/include/frontend/graw.h
similarity index 100%
rename from src/gallium/include/state_tracker/graw.h
rename to src/gallium/include/frontend/graw.h
diff --git a/src/gallium/include/state_tracker/opencl_interop.h b/src/gallium/include/frontend/opencl_interop.h
similarity index 100%
rename from src/gallium/include/state_tracker/opencl_interop.h
rename to src/gallium/include/frontend/opencl_interop.h
diff --git a/src/gallium/include/state_tracker/sw_driver.h b/src/gallium/include/frontend/sw_driver.h
similarity index 100%
rename from src/gallium/include/state_tracker/sw_driver.h
rename to src/gallium/include/frontend/sw_driver.h
diff --git a/src/gallium/include/state_tracker/sw_winsys.h b/src/gallium/include/frontend/sw_winsys.h
similarity index 99%
rename from src/gallium/include/state_tracker/sw_winsys.h
rename to src/gallium/include/frontend/sw_winsys.h
index 43a73830f6b..86eca9defca 100644
--- a/src/gallium/include/state_tracker/sw_winsys.h
+++ b/src/gallium/include/frontend/sw_winsys.h
@@ -36,7 +36,7 @@
 
 
 #include "pipe/p_format.h"
-#include "state_tracker/winsys_handle.h"
+#include "frontend/winsys_handle.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gallium/include/state_tracker/vdpau_dmabuf.h b/src/gallium/include/frontend/vdpau_dmabuf.h
similarity index 100%
rename from src/gallium/include/state_tracker/vdpau_dmabuf.h
rename to src/gallium/include/frontend/vdpau_dmabuf.h
diff --git a/src/gallium/include/state_tracker/vdpau_funcs.h b/src/gallium/include/frontend/vdpau_funcs.h
similarity index 100%
rename from src/gallium/include/state_tracker/vdpau_funcs.h
rename to src/gallium/include/frontend/vdpau_funcs.h
diff --git a/src/gallium/include/state_tracker/vdpau_interop.h b/src/gallium/include/frontend/vdpau_interop.h
similarity index 100%
rename from src/gallium/include/state_tracker/vdpau_interop.h
rename to src/gallium/include/frontend/vdpau_interop.h
diff --git a/src/gallium/include/state_tracker/winsys_handle.h b/src/gallium/include/frontend/winsys_handle.h
similarity index 100%
rename from src/gallium/include/state_tracker/winsys_handle.h
rename to src/gallium/include/frontend/winsys_handle.h
diff --git a/src/gallium/include/state_tracker/xlibsw_api.h b/src/gallium/include/frontend/xlibsw_api.h
similarity index 90%
rename from src/gallium/include/state_tracker/xlibsw_api.h
rename to src/gallium/include/frontend/xlibsw_api.h
index 930127981eb..49ffa5df13f 100644
--- a/src/gallium/include/state_tracker/xlibsw_api.h
+++ b/src/gallium/include/frontend/xlibsw_api.h
@@ -1,7 +1,7 @@
 #ifndef XLIB_SW_WINSYS_H
 #define XLIB_SW_WINSYS_H
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 #include <X11/Xlib.h>
 
 
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 1f81fcf1fd5..ba26a50bced 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -168,52 +168,52 @@ if with_gallium_opencl
   # consumer
   subdir('targets/pipe-loader')
 
-  subdir('state_trackers/clover')
+  subdir('frontends/clover')
   subdir('targets/opencl')
 endif
 if with_dri
-  subdir('state_trackers/dri')
+  subdir('frontends/dri')
   subdir('targets/dri')
 endif
 if with_osmesa == 'gallium'
-  subdir('state_trackers/osmesa')
+  subdir('frontends/osmesa')
   subdir('targets/osmesa')
 endif
 if with_glx == 'gallium-xlib'
   subdir('winsys/sw/xlib')
-  subdir('state_trackers/glx/xlib')
+  subdir('frontends/glx/xlib')
   subdir('targets/libgl-xlib')
 endif
 if with_gallium_vdpau
-  subdir('state_trackers/vdpau')
+  subdir('frontends/vdpau')
   subdir('targets/vdpau')
 endif
 if with_gallium_xvmc
-  subdir('state_trackers/xvmc')
+  subdir('frontends/xvmc')
   subdir('targets/xvmc')
 endif
 if with_gallium_omx != 'disabled'
-  subdir('state_trackers/omx')
+  subdir('frontends/omx')
   subdir('targets/omx')
 endif
 if with_gallium_va
-  subdir('state_trackers/va')
+  subdir('frontends/va')
   subdir('targets/va')
 endif
 if with_gallium_xa
-  subdir('state_trackers/xa')
+  subdir('frontends/xa')
   subdir('targets/xa')
 endif
 if with_platform_haiku
-  subdir('state_trackers/hgl')
+  subdir('frontends/hgl')
   subdir('targets/haiku-softpipe')
 endif
 if with_gallium_st_nine
-  subdir('state_trackers/nine')
+  subdir('frontends/nine')
   subdir('targets/d3dadapter9')
 endif
 if with_platform_windows
-  subdir('state_trackers/wgl')
+  subdir('frontends/wgl')
   subdir('targets/libgl-gdi')
 endif
 if with_tests
diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c
index 819aa59468c..a230475d7de 100644
--- a/src/gallium/targets/d3dadapter9/drm.c
+++ b/src/gallium/targets/d3dadapter9/drm.c
@@ -32,7 +32,7 @@
 
 #include "target-helpers/drm_helper.h"
 #include "target-helpers/sw_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "d3dadapter/d3dadapter9.h"
 #include "d3dadapter/drm.h"
diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
index 55b514f5add..23a19c77508 100644
--- a/src/gallium/targets/d3dadapter9/meson.build
+++ b/src/gallium/targets/d3dadapter9/meson.build
@@ -53,7 +53,7 @@ libgallium_nine = shared_library(
     inc_include, inc_src, inc_loader, inc_mapi, inc_mesa, inc_util,
     inc_dri_common, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
     inc_gallium_drivers, inc_d3d9,
-    include_directories('../../state_trackers/nine'),
+    include_directories('../../frontends/nine'),
   ],
   c_args : [c_vis_args, gallium_nine_c_args],
   cpp_args : [cpp_vis_args],
diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript
new file mode 100644
index 00000000000..835038dd639
--- /dev/null
+++ b/src/gallium/targets/dri/SConscript
@@ -0,0 +1,59 @@
+Import('*')
+
+env = drienv.Clone()
+
+if env['suncc']:
+    print('warning: not building dri-vmwgfx')
+    Return()
+
+env.Append(CPPPATH = [
+    '#/src/loader',
+    '#/src/mapi',
+    '#/src/mesa',
+    '#/src/mesa/drivers/dri/common',
+    '#/src/gallium/frontends/dri',
+])
+
+if env['llvm']:
+    env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
+    env.Prepend(LIBS = [llvmpipe])
+
+env.PkgUseModules('DRM')
+
+env.Append(CPPDEFINES = [
+    'GALLIUM_VMWGFX',
+    'GALLIUM_SOFTPIPE',
+])
+
+env.Prepend(LIBS = [
+    st_dri,
+    svgadrm,
+    svga,
+    ws_dri,
+    softpipe,
+    pipe_loader,
+    libloader,
+    mesautil,
+    compiler,
+    mesa,
+    glsl,
+    nir,
+    spirv,
+    gallium,
+    megadrivers_stub,
+    dri_common,
+])
+
+module = env.LoadableModule(
+    target = 'gallium_dri.so',
+    source = 'target.c',
+    SHLIBPREFIX = '',
+)
+
+# vmwgfx_dri.so
+env.Command('vmwgfx_dri.so', 'gallium_dri.so', "ln -f ${SOURCE} ${TARGET}")
+# swrast_dri.so
+env.Command('swrast_dri.so', 'gallium_dri.so', "ln -f ${SOURCE} ${TARGET}")
+
+env.Alias('dri-vmwgfx', module)
+env.Alias('dri-swrast', module)
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 8da21b3394a..2c80bf12090 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -42,7 +42,7 @@ libgallium_dri = shared_library(
   files('target.c'),
   include_directories : [
     inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_dri_common, inc_gallium_drivers,
-    inc_gallium_winsys, include_directories('../../state_trackers/dri'),
+    inc_gallium_winsys, include_directories('../../frontends/dri'),
   ],
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
diff --git a/src/gallium/targets/graw-gdi/graw_gdi.c b/src/gallium/targets/graw-gdi/graw_gdi.c
index 99d8641d6b1..aa75c73b980 100644
--- a/src/gallium/targets/graw-gdi/graw_gdi.c
+++ b/src/gallium/targets/graw-gdi/graw_gdi.c
@@ -28,7 +28,7 @@
 
 #include "gdi/gdi_sw_winsys.h"
 #include "pipe/p_screen.h"
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "target-helpers/inline_sw_helper.h"
 #include <windows.h>
diff --git a/src/gallium/targets/graw-null/graw_null.c b/src/gallium/targets/graw-null/graw_null.c
index f1fe3872c94..6b42fdb463a 100644
--- a/src/gallium/targets/graw-null/graw_null.c
+++ b/src/gallium/targets/graw-null/graw_null.c
@@ -1,4 +1,4 @@
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 
 
 
diff --git a/src/gallium/targets/graw-null/graw_util.c b/src/gallium/targets/graw-null/graw_util.c
index 6d4d960d297..a7692c1646f 100644
--- a/src/gallium/targets/graw-null/graw_util.c
+++ b/src/gallium/targets/graw-null/graw_util.c
@@ -7,7 +7,7 @@
 #include "util/u_debug.h"
 #include "util/u_debug_image.h"
 #include "util/u_memory.h"
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 
 
 /* Helper functions.  These are the same for all graw implementations.
diff --git a/src/gallium/targets/graw-xlib/graw_xlib.c b/src/gallium/targets/graw-xlib/graw_xlib.c
index db2637bd3c9..48c3d2915cc 100644
--- a/src/gallium/targets/graw-xlib/graw_xlib.c
+++ b/src/gallium/targets/graw-xlib/graw_xlib.c
@@ -5,8 +5,8 @@
 #include "util/u_memory.h"
 #include "target-helpers/inline_sw_helper.h"
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/xlibsw_api.h"
-#include "state_tracker/graw.h"
+#include "frontend/xlibsw_api.h"
+#include "frontend/graw.h"
 #include "sw/xlib/xlib_sw_winsys.h"
 
 #include <X11/Xlib.h>
diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
index 13378d1a375..ead238194bf 100644
--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
@@ -22,7 +22,7 @@
 //#include "state_tracker/st_cb_flush.h"
 #include "state_tracker/st_context.h"
 #include "state_tracker/st_gl_api.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 #include "sw/hgl/hgl_sw_winsys.h"
 #include "util/u_atomic.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
new file mode 100644
index 00000000000..312155abe14
--- /dev/null
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -0,0 +1,47 @@
+Import('*')
+
+env.Prepend(LIBS = [
+    ws_haiku,
+    st_haiku,
+    mesautil,
+    compiler,
+    mesa,
+    glsl,
+    nir,
+    spirv,
+    gallium
+])
+
+if True:
+    env.Append(CPPDEFINES = [
+        'GALLIUM_SOFTPIPE',
+    ])
+    env.Prepend(LIBS = [softpipe])
+
+env.Prepend(LIBS = [libgl])
+
+env.Append(CPPPATH = [
+    '#/src/mapi',
+    '#/src/mesa',
+    '#/src/mesa/main',
+    '#/include/HaikuGL',
+    '#/src/gallium/winsys',
+    '#/src/gallium/frontends/hgl',
+    '/boot/system/develop/headers/private',
+])
+
+if env['llvm']:
+    env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
+    env.Prepend(LIBS = [llvmpipe])
+
+softpipe_sources = [
+    'GalliumContext.cpp',
+    'SoftwareRenderer.cpp'
+]
+
+# libswpipe gets turned into "Softpipe" by the haiku package system
+module = env.LoadableModule(
+    target ='swpipe',
+    source = softpipe_sources,
+)
+
diff --git a/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build
index e35fab5dacf..addea41538a 100644
--- a/src/gallium/targets/haiku-softpipe/meson.build
+++ b/src/gallium/targets/haiku-softpipe/meson.build
@@ -23,7 +23,7 @@ libswpipe = shared_library(
   files('SoftwareRenderer.cpp', 'GalliumContext.cpp'),
   include_directories : [
     inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys,
-    include_directories('../../state_trackers/hgl'),
+    include_directories('../../frontends/hgl'),
     include_directories('/boot/system/develop/headers/private')
   ],
   c_args : [c_vis_args],
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index efc0c5b2ea1..5255125ca09 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -7,7 +7,7 @@ env = env.Clone()
 
 env.Append(CPPPATH = [
     '#src',
-    '#src/gallium/state_trackers/wgl',
+    '#src/gallium/frontends/wgl',
     '#src/gallium/winsys/sw',
 ])
 
@@ -38,9 +38,9 @@ if env['llvm']:
 if env['gcc'] and env['machine'] != 'x86_64':
     # DEF parser in certain versions of MinGW is busted, as does not behave as
     # MSVC.  mingw-w64 works fine.
-    sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
+    sources += ['#src/gallium/frontends/wgl/opengl32.mingw.def']
 else:
-    sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
+    sources += ['#src/gallium/frontends/wgl/opengl32.def']
 
 env['no_import_lib'] = 1
 
diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
index 6332267fff4..d7539442df4 100644
--- a/src/gallium/targets/libgl-gdi/meson.build
+++ b/src/gallium/targets/libgl-gdi/meson.build
@@ -21,9 +21,9 @@
 # DEF parser in certain versions of MinGW is busted, as does not behave as
 # MSVC. mingw-w64 works fine.
 if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64'
-  ogldef = files('../../state_trackers/wgl/opengl32.mingw.def')[0]
+  ogldef = files('../../frontends/wgl/opengl32.mingw.def')[0]
 else
-  ogldef = files('../../state_trackers/wgl/opengl32.def')[0]
+  ogldef = files('../../frontends/wgl/opengl32.def')[0]
 endif
 
 libopengl32 = shared_library(
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index edd14a8da41..c1b787d95af 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -9,7 +9,7 @@ env.Append(CPPPATH = [
     '#/src/mapi',
     '#/src/mesa',
     '#/src/mesa/main',
-    '#src/gallium/state_trackers/glx/xlib',
+    '#src/gallium/frontends/glx/xlib',
     Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
     Dir('../../../mapi/glapi/gen'), # src/mapi build path for python-generated GL API files/headers
 ])
diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
index 8aec6219a87..4cd673ed34e 100644
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -42,7 +42,7 @@ libgl = shared_library(
   files('xlib.c'),
   include_directories : [
     inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers,
-    include_directories('../../state_trackers/glx/xlib'),
+    include_directories('../../frontends/glx/xlib'),
   ],
   c_args : [c_vis_args, gallium_xlib_c_args],
   link_args : [ld_args_bsymbolic, ld_args_gc_sections, gallium_xlib_ld_args],
diff --git a/src/gallium/targets/pipe-loader/pipe_i915.c b/src/gallium/targets/pipe-loader/pipe_i915.c
index b4f5a72f296..927bad0de2c 100644
--- a/src/gallium/targets/pipe-loader/pipe_i915.c
+++ b/src/gallium/targets/pipe-loader/pipe_i915.c
@@ -1,6 +1,6 @@
 
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "i915/drm/i915_drm_public.h"
 #include "i915/i915_public.h"
 
diff --git a/src/gallium/targets/pipe-loader/pipe_kmsro.c b/src/gallium/targets/pipe-loader/pipe_kmsro.c
index 1c1a8d24561..79c66bd3695 100644
--- a/src/gallium/targets/pipe-loader/pipe_kmsro.c
+++ b/src/gallium/targets/pipe-loader/pipe_kmsro.c
@@ -1,6 +1,6 @@
 
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "kmsro/drm/kmsro_drm_public.h"
 
 static struct pipe_screen *
diff --git a/src/gallium/targets/pipe-loader/pipe_msm.c b/src/gallium/targets/pipe-loader/pipe_msm.c
index 43b8f0b4ea4..4868a8bcd8d 100644
--- a/src/gallium/targets/pipe-loader/pipe_msm.c
+++ b/src/gallium/targets/pipe-loader/pipe_msm.c
@@ -1,6 +1,6 @@
 
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "freedreno/drm/freedreno_drm_public.h"
 
 static struct pipe_screen *
diff --git a/src/gallium/targets/pipe-loader/pipe_nouveau.c b/src/gallium/targets/pipe-loader/pipe_nouveau.c
index 06fe95624d1..6b5ee18408c 100644
--- a/src/gallium/targets/pipe-loader/pipe_nouveau.c
+++ b/src/gallium/targets/pipe-loader/pipe_nouveau.c
@@ -1,6 +1,6 @@
 
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "nouveau/drm/nouveau_drm_public.h"
 
 static struct pipe_screen *
diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c
index 17b310ee189..268a5eee287 100644
--- a/src/gallium/targets/pipe-loader/pipe_r300.c
+++ b/src/gallium/targets/pipe-loader/pipe_r300.c
@@ -1,5 +1,5 @@
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "radeon/radeon_winsys.h"
 #include "r300/r300_public.h"
diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c
index 855aa9e4bd3..871dff3f7e1 100644
--- a/src/gallium/targets/pipe-loader/pipe_r600.c
+++ b/src/gallium/targets/pipe-loader/pipe_r600.c
@@ -1,4 +1,4 @@
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "radeon/radeon_winsys.h"
diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
index 9d925c727f1..f5c5770af08 100644
--- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c
+++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
@@ -1,4 +1,4 @@
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "radeonsi/si_public.h"
 #include "util/xmlpool.h"
diff --git a/src/gallium/targets/pipe-loader/pipe_swrast.c b/src/gallium/targets/pipe-loader/pipe_swrast.c
index 0a980b3b1a9..ebfc11c8936 100644
--- a/src/gallium/targets/pipe-loader/pipe_swrast.c
+++ b/src/gallium/targets/pipe-loader/pipe_swrast.c
@@ -1,7 +1,7 @@
 
 #include "target-helpers/inline_sw_helper.h"
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/sw_driver.h"
+#include "frontend/sw_driver.h"
 #include "sw/dri/dri_sw_winsys.h"
 #include "sw/kms-dri/kms_dri_sw_winsys.h"
 #include "sw/null/null_sw_winsys.h"
diff --git a/src/gallium/targets/pipe-loader/pipe_vmwgfx.c b/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
index a60a5e89814..73c6bda9879 100644
--- a/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
+++ b/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
@@ -1,6 +1,6 @@
 
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "svga/drm/svga_drm_public.h"
 #include "svga/svga_public.h"
 
diff --git a/src/gallium/tests/graw/clear.c b/src/gallium/tests/graw/clear.c
index 522799c1e1a..3c16f5211a6 100644
--- a/src/gallium/tests/graw/clear.c
+++ b/src/gallium/tests/graw/clear.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdio.h>
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c
index 346bbedd61a..8c40ecd705d 100644
--- a/src/gallium/tests/graw/fs-test.c
+++ b/src/gallium/tests/graw/fs-test.c
@@ -2,7 +2,7 @@
  * any utility code, just the graw interface and gallium.
  */
 
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_shader_tokens.h"
diff --git a/src/gallium/tests/graw/graw_util.h b/src/gallium/tests/graw/graw_util.h
index 7cd22416a9f..bb5d53d24bf 100644
--- a/src/gallium/tests/graw/graw_util.h
+++ b/src/gallium/tests/graw/graw_util.h
@@ -1,5 +1,5 @@
 
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c
index 5d3739c7281..34f1decdd66 100644
--- a/src/gallium/tests/graw/gs-test.c
+++ b/src/gallium/tests/graw/gs-test.c
@@ -2,7 +2,7 @@
  * any utility code, just the graw interface and gallium.
  */
 
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_shader_tokens.h"
diff --git a/src/gallium/tests/graw/quad-sample.c b/src/gallium/tests/graw/quad-sample.c
index 043abdf5044..160c8db5301 100644
--- a/src/gallium/tests/graw/quad-sample.c
+++ b/src/gallium/tests/graw/quad-sample.c
@@ -2,7 +2,7 @@
  * any utility code, just the graw interface and gallium.
  */
 
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_shader_tokens.h"
diff --git a/src/gallium/tests/graw/shader-leak.c b/src/gallium/tests/graw/shader-leak.c
index 90d674745fd..cc5cd8a4bcd 100644
--- a/src/gallium/tests/graw/shader-leak.c
+++ b/src/gallium/tests/graw/shader-leak.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdio.h>
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
diff --git a/src/gallium/tests/graw/tri-gs.c b/src/gallium/tests/graw/tri-gs.c
index 6820bc530ea..97075f988ce 100644
--- a/src/gallium/tests/graw/tri-gs.c
+++ b/src/gallium/tests/graw/tri-gs.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdio.h>
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
diff --git a/src/gallium/tests/graw/tri-instanced.c b/src/gallium/tests/graw/tri-instanced.c
index 72dce01980c..8294147e040 100644
--- a/src/gallium/tests/graw/tri-instanced.c
+++ b/src/gallium/tests/graw/tri-instanced.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c
index 1b96914ad2a..a48e83f6923 100644
--- a/src/gallium/tests/graw/vs-test.c
+++ b/src/gallium/tests/graw/vs-test.c
@@ -2,7 +2,7 @@
  * any utility code, just the graw interface and gallium.
  */
 
-#include "state_tracker/graw.h"
+#include "frontend/graw.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
 #include "pipe/p_shader_tokens.h"
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
index 3568d8229cd..1a30c9a3cf3 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
@@ -30,7 +30,7 @@
 #include "util/hash_table.h"
 #include "util/os_time.h"
 #include "util/u_hash_table.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "drm-uapi/amdgpu_drm.h"
 #include <xf86drm.h>
 #include <stdio.h>
diff --git a/src/gallium/winsys/i915/drm/i915_drm_buffer.c b/src/gallium/winsys/i915/drm/i915_drm_buffer.c
index 9b525f9809c..3d24b64e679 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_buffer.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_buffer.c
@@ -1,4 +1,4 @@
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "i915_drm_winsys.h"
 #include "util/u_memory.h"
 
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
index d07ee496e48..add8ff83e2b 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
@@ -3,7 +3,7 @@
 
 #include "drm-uapi/i915_drm.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "i915_drm_winsys.h"
 #include "i915_drm_public.h"
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index f802d858eac..948e0b20ce3 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -33,7 +33,7 @@
 #include "os/os_mman.h"
 #include "util/os_time.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include <sys/ioctl.h>
 #include <xf86drm.h>
diff --git a/src/gallium/winsys/svga/drm/vmw_screen_dri.c b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
index 62d1b18b9e3..0a6e586e013 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen_dri.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen_dri.c
@@ -36,7 +36,7 @@
 #include "svga_drm_public.h"
 #include "svga3d_surfacedefs.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 
 #include "vmwgfx_drm.h"
 #include <xf86drm.h>
diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
index bb3a1adedc1..ed267e9ad68 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
@@ -37,7 +37,7 @@
 #include "util/u_memory.h"
 #include "util/u_math.h"
 #include "svgadump/svga_dump.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "vmw_screen.h"
 #include "vmw_context.h"
 #include "vmw_fence.h"
diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
index 6173147a1ff..c889e968534 100644
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
@@ -39,7 +39,7 @@
 #include "util/u_math.h"
 #include "util/u_memory.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 #include "dri_sw_winsys.h"
 
 
diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.h b/src/gallium/winsys/sw/dri/dri_sw_winsys.h
index 47e3777d4cd..e9fbac0c187 100644
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.h
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.h
@@ -29,7 +29,7 @@
 #ifndef DRI_SW_WINSYS
 #define DRI_SW_WINSYS
 
-#include "state_tracker/drisw_api.h"
+#include "frontend/drisw_api.h"
 
 struct sw_winsys;
 
diff --git a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
index ed22e82ee6d..87ffbcc0689 100644
--- a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
+++ b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
@@ -42,7 +42,7 @@
 #include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 #include "gdi_sw_winsys.h"
 
 
diff --git a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
index 4bbcb47848b..c882b1d8d35 100644
--- a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
+++ b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.h
@@ -4,7 +4,7 @@
 #include <windows.h>
 
 #include "pipe/p_compiler.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 void gdi_sw_display( struct sw_winsys *winsys,
                      struct sw_displaytarget *dt,
diff --git a/src/gallium/winsys/sw/hgl/SConscript b/src/gallium/winsys/sw/hgl/SConscript
index 7755b00ea8c..776dd831a4b 100644
--- a/src/gallium/winsys/sw/hgl/SConscript
+++ b/src/gallium/winsys/sw/hgl/SConscript
@@ -12,7 +12,7 @@ if env['platform'] in ('haiku'):
         '#/src/gallium/include',
         '#/src/gallium/auxiliary',
         '#/src/gallium/drivers',
-        '#/src/gallium/state_trackers/hgl',
+        '#/src/gallium/frontend/hgl',
     ])
 
     ws_haiku = env.ConvenienceLibrary(
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
index 35e7137b549..bcbaf9cabe5 100644
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
@@ -34,8 +34,8 @@
 #include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
-#include "state_tracker/st_api.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/api.h"
+#include "frontend/sw_winsys.h"
 
 #include "bitmap_wrapper.h"
 #include "hgl_sw_winsys.h"
diff --git a/src/gallium/winsys/sw/hgl/meson.build b/src/gallium/winsys/sw/hgl/meson.build
index 8901096bd12..10096651c99 100644
--- a/src/gallium/winsys/sw/hgl/meson.build
+++ b/src/gallium/winsys/sw/hgl/meson.build
@@ -23,7 +23,7 @@ libswhgl = static_library(
   files('hgl_sw_winsys.c'),
   c_args : c_vis_args,
   include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux,
-    include_directories('../../../state_trackers/hgl')
+    include_directories('../../../frontends/hgl')
   ],
   build_by_default : false,
 )
diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index da11be2333a..b501ba0403a 100644
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -50,8 +50,8 @@
 #include "util/u_memory.h"
 #include "util/list.h"
 
-#include "state_tracker/sw_winsys.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/sw_winsys.h"
+#include "frontend/drm_driver.h"
 #include "kms_dri_sw_winsys.h"
 
 #ifdef DEBUG
diff --git a/src/gallium/winsys/sw/null/null_sw_winsys.c b/src/gallium/winsys/sw/null/null_sw_winsys.c
index e897f246d26..a39f74c879c 100644
--- a/src/gallium/winsys/sw/null/null_sw_winsys.c
+++ b/src/gallium/winsys/sw/null/null_sw_winsys.c
@@ -39,7 +39,7 @@
 
 #include "pipe/p_format.h"
 #include "util/u_memory.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 #include "null_sw_winsys.h"
 
 
diff --git a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
index 37c499b9485..b042d4a56c4 100644
--- a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
+++ b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
@@ -29,7 +29,7 @@
 #include "pipe/p_format.h"
 #include "pipe/p_state.h"
 
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
index 8e97f0a24af..0eea71b7523 100644
--- a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
+++ b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
@@ -39,7 +39,7 @@
 #include "util/u_math.h"
 #include "util/u_memory.h"
 
-#include "state_tracker/xlibsw_api.h"
+#include "frontend/xlibsw_api.h"
 #include "xlib_sw_winsys.h"
 
 #include <X11/Xlib.h>
diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
index 7b20636ad20..b19bdf4b6f8 100644
--- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
+++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
@@ -35,7 +35,7 @@
 #include "util/u_hash_table.h"
 #include "util/u_inlines.h"
 #include "util/u_pointer.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "virgl/virgl_screen.h"
 #include "virgl/virgl_public.h"
 
diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
index dbe3afe9f80..2f79909d540 100644
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
@@ -26,7 +26,7 @@
 #include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/os_time.h"
-#include "state_tracker/sw_winsys.h"
+#include "frontend/sw_winsys.h"
 #include "os/os_mman.h"
 
 #include "virgl_vtest_winsys.h"
diff --git a/src/mesa/state_tracker/st_cb_memoryobjects.c b/src/mesa/state_tracker/st_cb_memoryobjects.c
index d81c7692c1f..b193eb37cb2 100644
--- a/src/mesa/state_tracker/st_cb_memoryobjects.c
+++ b/src/mesa/state_tracker/st_cb_memoryobjects.c
@@ -31,7 +31,7 @@
 #include "st_cb_memoryobjects.h"
 #include "st_util.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "pipe/p_context.h"
 #include "pipe/p_screen.h"
 
diff --git a/src/mesa/state_tracker/st_cb_semaphoreobjects.c b/src/mesa/state_tracker/st_cb_semaphoreobjects.c
index 7a32d9b138f..51288a87342 100644
--- a/src/mesa/state_tracker/st_cb_semaphoreobjects.c
+++ b/src/mesa/state_tracker/st_cb_semaphoreobjects.c
@@ -34,7 +34,7 @@
 #include "st_cb_bufferobjects.h"
 #include "st_cb_semaphoreobjects.h"
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "pipe/p_context.h"
 #include "pipe/p_screen.h"
 
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index a4a1ce5d4ad..31539d9db7d 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -30,7 +30,7 @@
 
 #include "main/arrayobj.h"
 #include "main/mtypes.h"
-#include "state_tracker/st_api.h"
+#include "frontend/api.h"
 #include "main/fbobject.h"
 #include "state_tracker/st_atom.h"
 #include "util/u_helpers.h"
diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c
index 56075457073..e519ce9a1d9 100644
--- a/src/mesa/state_tracker/st_vdpau.c
+++ b/src/mesa/state_tracker/st_vdpau.c
@@ -50,10 +50,10 @@
 #include "st_format.h"
 #include "st_cb_flush.h"
 
-#include "state_tracker/vdpau_interop.h"
-#include "state_tracker/vdpau_dmabuf.h"
-#include "state_tracker/vdpau_funcs.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/vdpau_interop.h"
+#include "frontend/vdpau_dmabuf.h"
+#include "frontend/vdpau_funcs.h"
+#include "frontend/drm_driver.h"
 
 static struct pipe_resource *
 st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface,