--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -11,10 +11,10 @@
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= config src include test
+SUBDIRS		= config src include
 
 ifeq ($(shell uname | grep MINGW),)
-SUBDIRS		:= $(SUBDIRS) demo
+SUBDIRS		:= $(SUBDIRS)
 endif
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
--- a/cs/Makefile
+++ b/cs/Makefile
@@ -11,7 +11,7 @@
 
 include $(top_srcdir)/config/Make.rules.cs
 
-SUBDIRS		= src test demo
+SUBDIRS		= src
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_assembliesdir)
 
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -34,7 +34,7 @@
 
 #
 # Define LP64 as yes or no if you want force a 32 or 64 bit. The
-# default is platform-dependent. This property has no effect on 
+# default is platform-dependent. This property has no effect on
 # OS X. On OS X, use CXXARCHFLAGS bellow to establish the build
 # architectures.
 #
@@ -65,7 +65,7 @@
 # If you combine Ice with more GPL-incompatible software, or have
 # licensed Ice under a commercial (non-GPL) license, you should ponder
 # the licensing implications of using readline.
-# 
+#
 USE_READLINE		?= no
 
 #
@@ -96,13 +96,13 @@
 #OPENSSL_HOME		?= /opt/openssl
 
 #
-# If MCPP is not installed in a standard location where the compiler 
+# If MCPP is not installed in a standard location where the compiler
 # can find it, set MCPP_HOME to the Mcpp installation directory.
 #
 #MCPP_HOME		?= /opt/mcpp
 
 #
-# If libiconv is not installed in a standard location where the compiler 
+# If libiconv is not installed in a standard location where the compiler
 # can find it, set ICONV_HOME to the libiconv installation directory.
 #
 #ICONV_HOME		?= /opt/libiconv
@@ -115,7 +115,7 @@
 #READLINE_HOME		?= /opt/readline
 
 #
-# If you want to build the deprecated SQL database plugins for IceStorm 
+# If you want to build the deprecated SQL database plugins for IceStorm
 # and IceGrid, set QT_HOME to the Qt installation directory, and go
 # to the database plugins directories to build them.
 #
@@ -253,7 +253,7 @@
 ifeq ($(PLATFORM_HAS_READLINE),yes)
     ifeq ($(USE_READLINE),yes)
 	READLINE_FLAGS  = -DHAVE_READLINE $(if $(READLINE_HOME),-I$(READLINE_HOME)/include)
-	READLINE_LIBS   = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline -lncurses        
+	READLINE_LIBS   = $(if $(READLINE_HOME),-L$(READLINE_HOME)/$(libsubdir)) -lreadline
     endif
 endif
 
@@ -261,7 +261,7 @@
 
 SLICE2CPPFLAGS		= $(ICECPPFLAGS)
 
-ifeq ($(ice_dir), /usr) 
+ifeq ($(ice_dir), /usr)
     LDFLAGS		= $(LDPLATFORMFLAGS) $(CXXFLAGS)
 else
     CPPFLAGS	+= -I$(includedir)
@@ -285,7 +285,7 @@
 endif
 
 ifeq ($(mkshlib),)
-    $(error You need to define mkshlib in Make.rules.$(UNAME)) 
+    $(error You need to define mkshlib in Make.rules.$(UNAME))
 endif
 
 ifdef ice_src_dist
@@ -337,7 +337,7 @@
 
 %.h %.cpp: %.ice $(SLICE2CPP) $(SLICEPARSERLIB)
 	rm -f $(*F).h $(*F).cpp
-	$(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice	
+	$(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice
 
 #%.h %.cpp: %.y
 #	rm -f $(*F).h $(*F).cpp
