In metacity 2.21.8 I am getting a build failure because some headers cannot be found. The dirs are simply not listed in INCLUDES in src/Makefile.am

Attached patch adds "-I ui -I core"

Build error is:
/usr/bin/cc -DHAVE_CONFIG_H -I. -I.. -DORBIT2=1 -D_REENTRANT -D_PTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/X11/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/sfw/include -I/usr/sfw/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/startup-notification-1.0 -I ./include -DMETACITY_LIBEXECDIR=\"/usr/lib\" -DHOST_ALIAS=\"\" -DMETACITY_LOCALEDIR=\"/usr/share/locale\" -DMETACITY_PKGDATADIR=\"/usr/share/metacity\" -DMETACITY_DATADIR=\"/usr/share\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 -i -xO4 -xspace -xstrconst -xpentium -mr -xregs=no%frameptr -I/usr/sfw/include -I/usr/X11/include -I/usr/sfw/include/freetype2 -DANSICPP -c core/bell.c  -KPIC -DPIC -o .libs/libmetacity_private_la-bell.o
"./include/ui.h", line 33: cannot find include file: "frames.h"
"./include/ui.h", line 214: syntax error before or at: MetaTrustedLabel
"./include/ui.h", line 214: warning: undefined or missing type for: MetaTrustedLabel
"core/window.h", line 36: cannot find include file: "theme.h"
"core/frame.h", line 29: cannot find include file: "theme.h"
"core/frame.h", line 76: syntax error before or at: MetaFrameGeometry
"core/frame.h", line 76: warning: undefined or missing type for: MetaFrameGeometry
"core/bell.c", line 377: warning: statement not reached
cc: acomp failed for core/bell.c
make[4]: *** [libmetacity_private_la-bell.lo] Error 1