diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h

index e5a02b9..3042857 100644

--- a/src/truetype/ttinterp.h

+++ b/src/truetype/ttinterp.h

@@ -173,6 +173,8 @@ FT_BEGIN_HEADER

FT_Size_Metrics metrics;

TT_Size_Metrics tt_metrics; /* size metrics */

+#undef GS /* avoid conflict with <sys/regset.h> on Solaris x86 systems */

+#define GS FT_GS

TT_GraphicsState GS; /* current graphics state */

FT_Int curRange; /* current code range number */

diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h

index ed61a7d..8c11cb1 100644

--- a/src/truetype/ttobjs.h

+++ b/src/truetype/ttobjs.h

@@ -299,6 +299,8 @@ FT_BEGIN_HEADER

TT_CodeRangeTable codeRangeTable;

+#undef GS /* avoid conflict with <sys/regset.h> on Solaris x86 systems */

+#define GS FT_GS

TT_GraphicsState GS;

FT_ULong cvt_size; /* the scaled control value table */