3 files changed, 9 insertions, 5 deletions
diff --git a/pango/pango-layout-run-private.h b/pango/pango-layout-run-private.h
index 4d315da7..ce3b2bc8 100644
--- a/pango/pango-layout-run-private.h
+++ b/pango/pango-layout-run-private.h
@@ -6,9 +6,13 @@
 #include "pango-glyph-item.h"
 #include "pango-item-private.h"
 
+struct _PangoLayoutRun
+{
+  PangoGlyphItem glyph_item;
+};
 
 static inline PangoGlyphItem *
 pango_layout_run_get_glyph_item (PangoLayoutRun *run)
 {
-  return (PangoGlyphItem *)run;
+  return &run->glyph_item;
 }
diff --git a/pango/pango-layout-run.c b/pango/pango-layout-run.c
index 63965842..90edb3f0 100644
--- a/pango/pango-layout-run.c
+++ b/pango/pango-layout-run.c
@@ -9,13 +9,13 @@
 PangoItem *
 pango_layout_run_get_item (PangoLayoutRun *run)
 {
-  return run->item;
+  return run->glyph_item.item;
 }
 
 PangoGlyphString *
 pango_layout_run_get_glyphs (PangoLayoutRun *run)
 {
-  return run->glyphs;
+  return run->glyph_item.glyphs;
 }
 
 /**
@@ -40,7 +40,7 @@ pango_layout_run_get_extents (PangoLayoutRun   *run,
                               PangoRectangle   *ink_rect,
                               PangoRectangle   *logical_rect)
 {
-  PangoGlyphItem *glyph_item = run;
+  PangoGlyphItem *glyph_item = &run->glyph_item;
   ItemProperties properties;
   gboolean has_underline;
   gboolean has_overline;
diff --git a/pango/pango-types.h b/pango/pango-types.h
index 69913b31..9643245e 100644
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -54,7 +54,7 @@ typedef struct _PangoLanguage PangoLanguage;
 typedef guint32 PangoGlyph;
 
 typedef struct _PangoLines PangoLines;
-typedef struct _PangoGlyphItem PangoLayoutRun;
+typedef struct _PangoLayoutRun PangoLayoutRun;
 typedef struct _PangoLayoutIter PangoLayoutIter;
 
 /**