3 files changed, 14 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/render/Imakefile b/nx-X11/programs/Xserver/render/Imakefile
index 5db244d6d..f39e74830 100644
--- a/nx-X11/programs/Xserver/render/Imakefile
+++ b/nx-X11/programs/Xserver/render/Imakefile
@@ -15,6 +15,8 @@ NXAGENT_SKIP_OBJS =             \
                     mitrap.o    \
                     picture.o   \
                     $(NULL)
+#else
+          DEFINES = -DNXAGENT_SERVER
 #endif
 
        SRCS =   animcur.c \
diff --git a/nx-X11/programs/Xserver/render/glyphstr.h b/nx-X11/programs/Xserver/render/glyphstr.h
index f27a73fbb..d0c14919c 100644
--- a/nx-X11/programs/Xserver/render/glyphstr.h
+++ b/nx-X11/programs/Xserver/render/glyphstr.h
@@ -44,10 +44,14 @@ typedef struct _Glyph {
     /* bits follow */
 } GlyphRec, *GlyphPtr;
 
+#ifdef NXAGENT_SERVER
+#include "../hw/nxagent/NXglyphstr_GlyphRef.h"
+#else
 typedef struct _GlyphRef {
     CARD32	signature;
     GlyphPtr	glyph;
 } GlyphRefRec, *GlyphRefPtr;
+#endif /* NXAGENT_SERVER */
 
 #define DeletedGlyph	((GlyphPtr) 1)
 
@@ -63,6 +67,9 @@ typedef struct _GlyphHash {
     CARD32	    tableEntries;
 } GlyphHashRec, *GlyphHashPtr;
 
+#ifdef NXAGENT_SERVER
+#include "../hw/nxagent/NXglyphstr_GlyphSet.h"
+#else
 typedef struct _GlyphSet {
     CARD32	    refcnt;
     PictFormatPtr   format;
@@ -71,6 +78,7 @@ typedef struct _GlyphSet {
     int             maxPrivate;
     void            **devPrivates;
 } GlyphSetRec, *GlyphSetPtr;
+#endif /* NXAGENT_SERVER */
 
 #define GlyphSetGetPrivate(pGlyphSet,n)					\
 	((n) > (pGlyphSet)->maxPrivate ?				\
diff --git a/nx-X11/programs/Xserver/render/picturestr.h b/nx-X11/programs/Xserver/render/picturestr.h
index 4969f6cab..27c36dc9c 100644
--- a/nx-X11/programs/Xserver/render/picturestr.h
+++ b/nx-X11/programs/Xserver/render/picturestr.h
@@ -65,10 +65,14 @@ typedef struct pixman_transform PictTransform, *PictTransformPtr;
 #define SourcePictTypeRadial 2
 #define SourcePictTypeConical 3
 
+#ifdef NXAGENT_SERVER
+#include "../hw/nxagent/NXpicturestr_PictSolidFill.h"
+#else
 typedef struct _PictSolidFill {
     unsigned int type;
     CARD32 color;
 } PictSolidFill, *PictSolidFillPtr;
+#endif /* NXAGENT_SERVER */
 
 typedef struct _PictGradientStop {
     xFixed x;