diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index ada65aa9f3..836ed81705 100644
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -13,8 +13,7 @@
 #define _WX_UNIX_FONTUTIL_H_
 
 #ifdef __X__
-    struct XFontStruct;
-    typedef XFontStruct *wxNativeFont;
+    typedef WXFontStructPtr wxNativeFont;
 #elif defined(__WXGTK__)
     typedef GdkFont *wxNativeFont;
 #else
diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 10ab6faf5b..048592aeb0 100644
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -360,7 +360,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     }
 
     // not found, create a new one
-    XFontStruct *font = wxLoadQueryNearestFont(pointSize,
+    XFontStruct *font = (XFontStruct *)
+                        wxLoadQueryNearestFont(pointSize,
                                                M_FONTDATA->m_family,
                                                M_FONTDATA->m_style,
                                                M_FONTDATA->m_weight,