7 files changed, 7 insertions, 7 deletions
diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am
index cf2602aed0a..1698d1474e2 100644
--- a/src/mapi/glapi/Makefile.am
+++ b/src/mapi/glapi/Makefile.am
@@ -21,7 +21,7 @@
 
 TOP = $(top_srcdir)
 include Makefile.sources
-include ../mapi/Makefile.sources
+include ../Makefile.sources
 
 AM_CPPFLAGS = \
         $(DEFINES) \
diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript
index 00cce3e7fda..79cbb6a40d1 100644
--- a/src/mapi/glapi/SConscript
+++ b/src/mapi/glapi/SConscript
@@ -43,7 +43,7 @@ mapi_sources = [
     'u_execmem.c',
 ]
 for s in mapi_sources:
-    o = env.SharedObject(s[:-2], '../mapi/' + s)
+    o = env.SharedObject(s[:-2], '../' + s)
     glapi_sources.append(o)
 
 #
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 36e47e21eac..97200598e65 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -20,7 +20,7 @@ XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -p
 
 MESA_DIR = $(top_srcdir)/src/mesa
 MESA_GLAPI_DIR = $(top_srcdir)/src/mapi/glapi
-MESA_MAPI_DIR = $(top_srcdir)/src/mapi/mapi
+MESA_MAPI_DIR = $(top_srcdir)/src/mapi
 MESA_GLX_DIR = $(top_srcdir)/src/glx
 
 MESA_GLAPI_OUTPUTS = \
diff --git a/src/mapi/glapi/gen/glapi_gen.mk b/src/mapi/glapi/gen/glapi_gen.mk
index f65286fbd9a..242ae5fd908 100644
--- a/src/mapi/glapi/gen/glapi_gen.mk
+++ b/src/mapi/glapi/gen/glapi_gen.mk
@@ -4,7 +4,7 @@ glapi_gen_common_deps := \
 	$(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
 	$(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
 
-glapi_gen_mapi_script := $(top_srcdir)/src/mapi/mapi/mapi_abi.py
+glapi_gen_mapi_script := $(top_srcdir)/src/mapi/mapi_abi.py
 glapi_gen_mapi_deps := \
 	$(glapi_gen_mapi_script) \
 	$(glapi_gen_common_deps)
diff --git a/src/mapi/glapi/glapi.c b/src/mapi/glapi/glapi.c
index f7655c558c4..18a7d31a758 100644
--- a/src/mapi/glapi/glapi.c
+++ b/src/mapi/glapi/glapi.c
@@ -27,7 +27,7 @@
  */
 
 #include "glapi/glapi.h"
-#include "mapi/u_current.h"
+#include "u_current.h"
 
 /*
  * Global variables, _glapi_get_context, and _glapi_get_dispatch are defined in
diff --git a/src/mapi/glapi/glapi_entrypoint.c b/src/mapi/glapi/glapi_entrypoint.c
index 7a0eb353775..791bd428b02 100644
--- a/src/mapi/glapi/glapi_entrypoint.c
+++ b/src/mapi/glapi/glapi_entrypoint.c
@@ -30,7 +30,7 @@
 
 
 #include "glapi/glapi_priv.h"
-#include "mapi/u_execmem.h"
+#include "u_execmem.h"
 
 
 #ifdef USE_X86_ASM
diff --git a/src/mapi/glapi/glthread.h b/src/mapi/glapi/glthread.h
index 1c3f4e2bf76..2399abb2bae 100644
--- a/src/mapi/glapi/glthread.h
+++ b/src/mapi/glapi/glthread.h
@@ -1,7 +1,7 @@
 #ifndef GLTHREAD_H
 #define GLTHREAD_H
 
-#include "mapi/u_thread.h"
+#include "u_thread.h"
 
 #ifdef __cplusplus
 extern "C" {