#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>