diff --git a/ChangeLog b/ChangeLog
index 855e364664..91efdf2b1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-11  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Check for uxtheme.h  (#157967, J. Ali Harlow)
+
+	* modules/engines/ms-windows/xp_theme.c: Use HAVE_UXTHEME_H
+	to protect the #include <uxtheme.h> 
+
 	* docs/tools/Makefile.am: Don't try to build doc-shooter on 
 	Windows.  (#157979, J. Ali Harlow) 
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 855e364664..91efdf2b1a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-11-11  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Check for uxtheme.h  (#157967, J. Ali Harlow)
+
+	* modules/engines/ms-windows/xp_theme.c: Use HAVE_UXTHEME_H
+	to protect the #include <uxtheme.h> 
+
 	* docs/tools/Makefile.am: Don't try to build doc-shooter on 
 	Windows.  (#157979, J. Ali Harlow) 
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 855e364664..91efdf2b1a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-11-11  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Check for uxtheme.h  (#157967, J. Ali Harlow)
+
+	* modules/engines/ms-windows/xp_theme.c: Use HAVE_UXTHEME_H
+	to protect the #include <uxtheme.h> 
+
 	* docs/tools/Makefile.am: Don't try to build doc-shooter on 
 	Windows.  (#157979, J. Ali Harlow) 
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 855e364664..91efdf2b1a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-11-11  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Check for uxtheme.h  (#157967, J. Ali Harlow)
+
+	* modules/engines/ms-windows/xp_theme.c: Use HAVE_UXTHEME_H
+	to protect the #include <uxtheme.h> 
+
 	* docs/tools/Makefile.am: Don't try to build doc-shooter on 
 	Windows.  (#157979, J. Ali Harlow) 
 
diff --git a/configure.in b/configure.in
index 3fa4a4ad7f..712f1b0b0d 100644
--- a/configure.in
+++ b/configure.in
@@ -639,6 +639,14 @@ fi
 AC_MSG_RESULT($gdk_working_wctype)
 AC_SUBST(GDK_WLIBS)
 
+# Check for uxtheme.h (for MS-Windows Engine)
+AC_MSG_CHECKING(for uxtheme.h)
+AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no)
+if test $gtk_uxtheme_h = yes; then
+   AC_DEFINE(HAVE_UXTHEME_H,1,[Have uxtheme.h include file])
+fi
+AC_MSG_RESULT($gtk_uxtheme_h)
+
 
 ##################################################
 # Checks for gdk-pixbuf
diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index 7d7af293b6..9ba01a8129 100755
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -22,6 +22,7 @@
 
 #include "xp_theme.h"
 
+#include <config.h>
 #include <windows.h>
 #include <math.h>
 #include <string.h>
@@ -29,12 +30,11 @@
 
 #include "gdk/win32/gdkwin32.h"
 
-
-#ifdef DONT_HAVE_UXTHEME_H
-#include "xp_theme_defs.h"
-#else
+#ifdef HAVE_UXTHEME_H
 #include <uxtheme.h>
 #include <tmschema.h>
+#else
+#include "xp_theme_defs.h"
 #endif
 
 #ifndef TMT_CAPTIONFONT