--- xorgbase-git-170703.old/lib/libXaw/src/XawI18n.c
+++ xorgbase-git-170703/lib/libXaw/src/XawI18n.c
@@ -90,6 +90,10 @@
 }
 #endif
 
+#ifndef MB_LEN_MAX
+#define MB_LEN_MAX 16
+#endif
+
 int
 _Xaw_iswalnum(wchar_t ch)
 {
--- xorgbase-git-170703.old/lib/libpciaccess/src/common_device_name.c
+++ xorgbase-git-170703/lib/libpciaccess/src/common_device_name.c
@@ -53,6 +53,8 @@
 
 #define DO_MATCH(a,b)  (((a) == PCI_MATCH_ANY) || ((a) == (b)))
 
+#define PCIIDS_PATH "__META_PRODTREE__/pciutils/share"
+
 #ifdef HAVE_ZLIB
 
 #include <zlib.h>
--- xorgbase-git-170703.old/lib/libX11/src/xlibi18n/lcFile.c
+++ xorgbase-git-170703/lib/libX11/src/xlibi18n/lcFile.c
@@ -52,6 +52,8 @@
 #define LC_PATHDELIM ';'
 #endif
 
+#define XLOCALELIBDIR "__META_PRODTREE__/xorg/lib/X11/locale"
+
 #define XLC_BUFSIZE 256
 
 #include "pathmax.h"
--- xorgbase-git-170703.old/app/xclock/configure.ac 
+++ xorgbase-git-170703/app/xclock/configure.ac
@@ -41,8 +41,6 @@
 
 AC_CHECK_FUNCS([strlcpy getpid nl_langinfo])
 
-AM_ICONV
-
 dnl Required dependencies
 PKG_CHECK_MODULES(XCLOCK, [xaw7 xmu x11 xproto >= 7.0.17])
 XCLOCK_LIBS="$XCLOCK_LIBS $LIBICONV"
--- xorgbase-git-170703.old/driver/xf86-video-r128/src/atipcirename.h
+++ xorgbase-git-170703/driver/xf86-video-r128/src/atipcirename.h
@@ -29,6 +29,8 @@
 #ifndef ATIPCIRENAME_H
 #define ATIPCIRENAME_H
 
+#include <inttypes.h>
+
 enum region_type {
     REGION_MEM,
     REGION_IO 
--- xorgbase-git-151207.old/app/twm/src/lex.l
+++ xorgbase-git-151207/app/twm/src/lex.l
@@ -1,3 +1,4 @@
+%option noyywrap
 %{
 /*****************************************************************************/
 /*
--- xorgbase-210127/driver/xf86-video-intel/Makefile.am~	2021-01-27 06:02:34.000000000 -0800
+++ xorgbase-210127/driver/xf86-video-intel/Makefile.am	2021-01-27 19:26:01.233710300 -0800
@@ -26,10 +26,6 @@
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-if HAVE_X11
-SUBDIRS += test benchmarks
-endif
-
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
--- xorgbase-230219.old/lib/libglvnd/include/KHR/khrplatform.h
+++ xorgbase-230219/lib/libglvnd/include/KHR/khrplatform.h
@@ -90,6 +90,8 @@
  *                                  int arg2) KHRONOS_APIATTRIBUTES;
  */
 
+#include <stddef.h>
+
 #if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
 #   define KHRONOS_STATIC 1
 #endif
--- xorgbase-230219.old/mesa/mesa/include/KHR/khrplatform.h
+++ xorgbase-230219/mesa/mesa/include/KHR/khrplatform.h
@@ -137,6 +137,8 @@
 #define KHRONOS_APIATTRIBUTES
 #endif
 
+#include <stddef.h>
+
 /*-------------------------------------------------------------------------
  * basic type definitions
  *-----------------------------------------------------------------------*/