--- ./nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h.X.original	2015-02-13 14:03:44.744441510 +0100
+++ ./nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h	2015-02-10 19:13:13.780686785 +0100
@@ -1,3 +1,20 @@
+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/*                                                                        */
+/* NXAGENT, NX protocol compression and NX extensions to this software    */
+/* are copyright of NoMachine. Redistribution and use of the present      */
+/* software is allowed according to terms specified in the file LICENSE   */
+/* which comes in the source distribution.                                */
+/*                                                                        */
+/* Check http://www.nomachine.com/licensing.html for applicability.       */
+/*                                                                        */
+/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
+
 /*
  * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.3 2000/11/20 07:13:13 keithp Exp $
  *
@@ -23,11 +40,18 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+/*
+ * This must keep the same symbol as the original glyphstr.h
+ * or symbols  will be redefined. The code here adds a field
+ * to _GlyphSet. This should be done by defining a new type
+ * and casting when appropriate.
+ */
+
 #ifndef _GLYPHSTR_H_
 #define _GLYPHSTR_H_
 
 #include <X11/extensions/renderproto.h>
-#include "picture.h"
+#include "../../render/picture.h"
 #include "screenint.h"
 
 #define GlyphFormat1	0
@@ -47,6 +71,7 @@
 typedef struct _GlyphRef {
     CARD32	signature;
     GlyphPtr	glyph;
+    CARD16      corruptedGlyph;
 } GlyphRefRec, *GlyphRefPtr;
 
 #define DeletedGlyph	((GlyphPtr) 1)
@@ -70,6 +95,7 @@
     GlyphHashRec    hash;
     int             maxPrivate;
     pointer         *devPrivates;
+    CARD32          remoteID;
 } GlyphSetRec, *GlyphSetPtr;
 
 #define GlyphSetGetPrivate(pGlyphSet,n)					\