6 files changed, 16 insertions, 6 deletions
diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile
index a30f037e5..16e68106d 100644
--- a/nuttx/graphics/Makefile
+++ b/nuttx/graphics/Makefile
@@ -46,11 +46,14 @@ include nxbe/Make.defs
 DEPPATH		+= --dep-path nxbe
 CFLAGS		+= ${shell $(TOPDIR)/tools/incdir.sh "$(CC)" $(TOPDIR)/graphics/nxbe}
 
-HAVENX		:= ${shell if [ -d nxmu ]; then echo "y"; else echo "n";fi}
-ifeq ($(HAVENX),y)
+ifeq ($(CONFIG_NX_MULTIUSER),y)
 include nxmu/Make.defs
 DEPPATH		+= --dep-path nxmu
 CFLAGS		+= ${shell $(TOPDIR)/tools/incdir.sh "$(CC)" $(TOPDIR)/graphics/nxmu}
+else
+include nxsu/Make.defs
+DEPPATH		+= --dep-path nxsu
+CFLAGS		+= ${shell $(TOPDIR)/tools/incdir.sh "$(CC)" $(TOPDIR)/graphics/nxsu}
 endif
 
 ASRCS		= $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS)
@@ -64,7 +67,11 @@ OBJS		= $(AOBJS) $(COBJS)
 
 BIN		= libgraphics$(LIBEXT)
 
+ifeq ($(CONFIG_NX_MULTIUSER),y)
 VPATH		= nxglib:nxbe:nxmu
+else
+VPATH		= nxglib:nxbe:nxsu
+endif
 
 all:	mklibgraphics
 .PHONY : depend clean distclean mklibgraphics gensources gen1bppsources \
diff --git a/nuttx/graphics/nxbe/nxbe_move.c b/nuttx/graphics/nxbe/nxbe_move.c
index 440a53016..820614ae5 100644
--- a/nuttx/graphics/nxbe/nxbe_move.c
+++ b/nuttx/graphics/nxbe/nxbe_move.c
@@ -43,7 +43,7 @@
 #include <nuttx/nxglib.h>
 
 #include "nxbe.h"
-//#include "nxfe.h"
+#include "nxfe.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/nuttx/graphics/nxbe/nxbe_raise.c b/nuttx/graphics/nxbe/nxbe_raise.c
index 70353ab22..109fdaf1d 100644
--- a/nuttx/graphics/nxbe/nxbe_raise.c
+++ b/nuttx/graphics/nxbe/nxbe_raise.c
@@ -43,7 +43,7 @@
 #include <nuttx/nxglib.h>
 
 #include "nxbe.h"
-//#include "nxfe.h"
+#include "nxfe.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/nuttx/graphics/nxbe/nxbe_redraw.c b/nuttx/graphics/nxbe/nxbe_redraw.c
index 576b969ee..25a8e0ee4 100644
--- a/nuttx/graphics/nxbe/nxbe_redraw.c
+++ b/nuttx/graphics/nxbe/nxbe_redraw.c
@@ -44,8 +44,9 @@
 #include <debug.h>
 
 #include <nuttx/nxglib.h>
+
 #include "nxbe.h"
-//#include "nxfe.h"
+#include "nxfe.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/nuttx/graphics/nxbe/nxbe_setposition.c b/nuttx/graphics/nxbe/nxbe_setposition.c
index d4d36b2bb..46be211ed 100644
--- a/nuttx/graphics/nxbe/nxbe_setposition.c
+++ b/nuttx/graphics/nxbe/nxbe_setposition.c
@@ -43,7 +43,7 @@
 #include <nuttx/nxglib.h>
 
 #include "nxbe.h"
-//#include "nxfe.h"
+#include "nxfe.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/nuttx/graphics/nxbe/nxbe_setsize.c b/nuttx/graphics/nxbe/nxbe_setsize.c
index c979b870c..a736669f3 100644
--- a/nuttx/graphics/nxbe/nxbe_setsize.c
+++ b/nuttx/graphics/nxbe/nxbe_setsize.c
@@ -41,7 +41,9 @@
 #include <sys/types.h>
 
 #include <nuttx/nxglib.h>
+
 #include "nxbe.h"
+#include "nxfe.h"
 
 /****************************************************************************
  * Pre-Processor Definitions