...that lead to -Werror=unused-macros with gcj on Linux.

Change-Id: I7a77789fe212d1c87a4ac0a93a79cc7a8ba7a7ad