12 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/include/state_tracker/st_api.h b/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
index 4b5d36c1797..4b5d36c1797 100644
--- a/src/gallium/include/state_tracker/drisw_api.h
+++ b/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
index f8d77a79721..f8d77a79721 100644
--- a/src/gallium/include/state_tracker/drm_driver.h
+++ b/src/gallium/include/frontend/drm_driver.h
diff --git a/src/gallium/include/state_tracker/graw.h b/src/gallium/include/frontend/graw.h
index af81cc8871b..af81cc8871b 100644
--- a/src/gallium/include/state_tracker/graw.h
+++ b/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
index 498364472b6..498364472b6 100644
--- a/src/gallium/include/state_tracker/opencl_interop.h
+++ b/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
index 1d59bd5fe56..1d59bd5fe56 100644
--- a/src/gallium/include/state_tracker/sw_driver.h
+++ b/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
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
index f838c925f30..f838c925f30 100644
--- a/src/gallium/include/state_tracker/vdpau_dmabuf.h
+++ b/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
index 66e3c23ede4..66e3c23ede4 100644
--- a/src/gallium/include/state_tracker/vdpau_funcs.h
+++ b/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
index 04d455a370a..04d455a370a 100644
--- a/src/gallium/include/state_tracker/vdpau_interop.h
+++ b/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
index 78f5f4b36f2..78f5f4b36f2 100644
--- a/src/gallium/include/state_tracker/winsys_handle.h
+++ b/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
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>