diff --git a/src/mapi/mapi_glapi.c b/src/mapi/shared-glapi/glapi.c
similarity index 100%
rename from src/mapi/mapi_glapi.c
rename to src/mapi/shared-glapi/glapi.c
diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
index d23cb7d8a5e..94cb727e4a3 100644
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -18,13 +18,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-files_mapi_glapi = files(
+files_shared_glapi = files(
   '../entry.c',
-  '../mapi_glapi.c',
-  '../stub.c',
-  '../stub.h',
-  '../table.c',
-  '../table.h',
+  'glapi.c',
+  'stub.c',
+  'stub.h',
+  'table.c',
+  'table.h',
 )
 
 shared_glapi_mapi_tmp_h = custom_target(
@@ -43,7 +43,7 @@ endif
 
 libglapi = shared_library(
   'glapi',
-  [files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h],
+  [files_shared_glapi, files_mapi_util, shared_glapi_mapi_tmp_h],
   c_args : [
     _glapi_c_args,
     c_msvc_compat_args,
diff --git a/src/mapi/stub.c b/src/mapi/shared-glapi/stub.c
similarity index 100%
rename from src/mapi/stub.c
rename to src/mapi/shared-glapi/stub.c
diff --git a/src/mapi/stub.h b/src/mapi/shared-glapi/stub.h
similarity index 100%
rename from src/mapi/stub.h
rename to src/mapi/shared-glapi/stub.h
diff --git a/src/mapi/table.c b/src/mapi/shared-glapi/table.c
similarity index 100%
rename from src/mapi/table.c
rename to src/mapi/shared-glapi/table.c
diff --git a/src/mapi/table.h b/src/mapi/shared-glapi/table.h
similarity index 100%
rename from src/mapi/table.h
rename to src/mapi/shared-glapi/table.h