1 files changed, 1 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index dbc706cfe..3722800ff 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -42,7 +42,7 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "servermd.h"
 #include "mi.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 
 #include "Agent.h"
 #include "Display.h"
@@ -135,8 +135,6 @@ void OsVendorEndRedirectErrorFFunction();
 static void nxagentGrabServerCallback(CallbackListPtr *callbacks, pointer data,
                                    pointer args);
 
-#ifdef NXAGENT_UPGRADE
-
 void ddxInitGlobals(void)
 {
   /*
@@ -149,8 +147,6 @@ void ddxInitGlobals(void)
   OsVendorEndRedirectErrorFProc   = OsVendorEndRedirectErrorFFunction;
 }
 
-#endif
-
 /*
  * Set if the remote display supports
  * backing store.
@@ -476,14 +472,10 @@ void ddxGiveUp()
   AbortDDX();
 }
 
-#ifdef NXAGENT_UPGRADE
-
 void ddxBeforeReset(void)
 {
 }
 
-#endif
-
 void OsVendorInit()
 {
   return;