libglvnd fails to build on 32bit x86

I've attempted to fix this issue adding a missing include for the undefined MAPI_TABLE_NUM_STATIC but I failed to see that the header was included by other means. So the previous patch didn't actually fix anything, and the software still fail to build for me on x86. (built fine on armv7hl and x86_64).

In file included from ../../../src/GLdispatch/vnd-glapi/mapi/entry.c:39:0:
../../../src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h: In function 'entry_init_public':
../../../src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h:109:27: error: 'MAPI_TABLE_NUM_STATIC' undeclared (first use in this function)
     for (slot = 0; slot < MAPI_TABLE_NUM_STATIC; i++)
                           ^
../../../src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h:109:27: note: each undeclared identifier is reported only once for each function it appears in
../../../src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h:109:50: error: 'i' undeclared (first use in this function)
     for (slot = 0; slot < MAPI_TABLE_NUM_STATIC; i++)
                                                  ^
../../../src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h:110:36: error: 'entry' undeclared (first use in this function)
        entry_generate_default_code(entry, slot);
                                    ^
../../../src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h: In function 'entry_generate':
../../../src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h:137:11: error: 'entry' undeclared (first use in this function)
    return entry;
           ^
../../../src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h:138:1: error: control reaches end of non-void function [-Werror=return-type]
 }
 ^
cc1: all warnings being treated as errors