diff --git a/graphics/Makefile b/graphics/Makefile
index dfff4b917..a21cc78ca 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -36,3 +36,4 @@
 MENUDESC = "Graphics Support"
 
 include $(APPDIR)/Directory.mk
+
diff --git a/graphics/nxglyphs/Makefile b/graphics/nxglyphs/Makefile
index d55030605..ef4e44294 100644
--- a/graphics/nxglyphs/Makefile
+++ b/graphics/nxglyphs/Makefile
@@ -75,7 +75,9 @@ else
 CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx
 endif
 
+endif # CONFIG_NXWIDGETS
+
 VPATH = src
 
 include $(APPDIR)/Application.mk
-endif # CONFIG_NXWIDGETS
+
diff --git a/include/graphics/nxwidgets/cnxtkwindow.hxx b/include/graphics/nxwidgets/cnxtkwindow.hxx
index d1ea308a9..cf1648b11 100644
--- a/include/graphics/nxwidgets/cnxtkwindow.hxx
+++ b/include/graphics/nxwidgets/cnxtkwindow.hxx
@@ -249,6 +249,7 @@ namespace NXWidgets
 
     bool modal(bool enable);
 
+#ifdef CONFIG_NXTERM_NXKBDIN
     /**
      * Each window implementation also inherits from CCallback.  CCallback,
      * by default, forwards NX keyboard input to the various widgets residing
@@ -263,7 +264,6 @@ namespace NXWidgets
      *    directed to the widgets within the window.
      */
 
-#ifdef CONFIG_NXTERM_NXKBDIN
     inline void redirectNxTerm(NXTERM handle)
     {
       setNxTerm(handle);