diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h
index 400a7d2..71b911a 100644
--- a/MagickCore/xwindow-private.h
+++ b/MagickCore/xwindow-private.h
@@ -34,7 +34,6 @@
#include "MagickCore/exception.h"
#include "MagickCore/geometry.h"
#include "MagickCore/quantize.h"
-#include "MagickCore/xwindow.h"
#if defined(__cplusplus) || defined(c_plusplus)
# define klass c_class
@@ -162,16 +161,6 @@
geometry[MaxTextExtent];
} XDrawInfo;
-struct _XImportInfo
-{
- MagickBooleanType
- frame,
- borders,
- screen,
- descend,
- silent;
-};
-
typedef enum
{
DefaultState = 0x0000,
@@ -248,7 +237,7 @@
pen_index;
} XPixelInfo;
-struct _XResourceInfo
+typedef struct _XResourceInfo
{
XrmDatabase
resource_database;
@@ -352,7 +341,7 @@
char
home_directory[MaxTextExtent];
-};
+} XResourceInfo;
typedef struct _XWindowInfo
{
@@ -583,6 +572,26 @@
*XInitializeWindows(Display *,XResourceInfo *),
*XSetWindows(XWindows *);
+extern MagickExport char
+ *XGetResourceClass(XrmDatabase,const char *,const char *,char *),
+ *XGetResourceInstance(XrmDatabase,const char *,const char *,const char *),
+ *XGetScreenDensity(Display *);
+
+extern MagickExport int
+ XError(Display *,XErrorEvent *);
+
+extern MagickExport MagickBooleanType
+ XRemoteCommand(Display *,const char *,const char *);
+
+extern MagickExport void
+ DestroyXResources(void),
+ XDestroyResourceInfo(XResourceInfo *),
+ XGetResourceInfo(const ImageInfo *,XrmDatabase,const char *,XResourceInfo *),
+ XRetainWindowColors(Display *,const Window);
+
+extern MagickExport XrmDatabase
+ XGetResourceDatabase(Display *,const char *);
+
static inline MagickRealType XPixelIntensity(const XColor *pixel)
{
MagickRealType