noinst_LTLIBRARIES = libio.la
-# Root level of the include sources.
-glibcpp_includedir = $(top_srcdir)/include
-
-# Passed down for cross compilers, canadian crosses.
-TOPLEVEL_INCLUDES = -I$(includedir)
-@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = -I$(top_builddir)/libio -I$(top_srcdir)/libio
-@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES =
-
-INCLUDES = -nostdinc++ -I$(top_builddir) -I$(glibcpp_includedir) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
+INCLUDES = -nostdinc++ -I$(top_builddir) -I$(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
libio_headers = libio.h libioP.h iolibio.h