diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index c3febd829..67949a6fe 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -39,9 +39,7 @@
 #include <windows.h>
 
 #include "winprefs.h"
-#ifdef XWIN_MULTIWINDOW
 #include "winmultiwindowclass.h"
-#endif
 
 /* Where will the custom menu commands start counting from? */
 #define STARTMENUID WM_USER
@@ -494,7 +492,6 @@ winOverrideDefaultIcon()
 }
 
 
-#ifdef XWIN_MULTIWINDOW
 /*
  * Check for a match of the window class to one specified in the
  * ICONS{} section in the prefs file, and load the icon from a file
@@ -560,7 +557,6 @@ winOverrideIcon (unsigned long longWin)
 
   return 0;
 }
-#endif
 
 
 /*
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index 82f93e33e..843cd2e0d 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -1,3 +1,5 @@
+#if !defined(WINPREFS_H)
+#define WINPREFS_H
 /*
  * Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
  *
@@ -147,3 +149,4 @@ winOverrideIcon (unsigned long longpWin);
 
 unsigned long
 winOverrideDefaultIcon(void);
+#endif