binutils/gas compilation problems on i386.

Good day.

Checked out today's -CURRENT and noticed that the gas
utility fails to be built.  The problem is in config/tc-i386.h:451
(and all files are relative to /usr/src/contrib/binutils/gas):
-----
extern const struct relax_type md_relax_table[];
-----
'struct relax_type' is opaque when only as.h is used (line 608):
-----
struct relax_type;
-----
And, for example, file app.c uses only "as.h", but not the tc.h.

Commenting the line 451 in config/tc-i386.h and adding the line
-----
extern const relax_typeS TC_GENERIC_RELAX_TABLE[];
-----
to the write.c:2024 seems to solve the problem, but it looks
like a hack.

Any comments on this?
-- 
Eygene