diff --git a/lib/xwidgets/Include.am b/lib/xwidgets/Include.am
deleted file mode 100644
index b5a2e35..0000000
--- a/lib/xwidgets/Include.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SOURCES_XT = \
-	../xt/accelerator.c \
-	../xt/action.c \
-	../xt/callback.c \
-	../xt/class.c \
-	../xt/classname.c \
-	../xt/context.c \
-	../xt/converter.c \
-	../xt/function.c \
-	../xt/identifier.c \
-	../xt/popup.c \
-	../xt/resource.c \
-	../xt/translation.c \
-	../xt/widget.c \
-	../xt/xterror.c \
-	../xt/xtinit.c \
-	../xt/xtobjects.c \
-	$(NULL)
diff --git a/lib/xwidgets/Makefile.am b/lib/xwidgets/Makefile.am
index de54433..d0f9c51 100644
--- a/lib/xwidgets/Makefile.am
+++ b/lib/xwidgets/Makefile.am
@@ -3,22 +3,40 @@ SUBDIRS = xaw motif
 NULL = 
 
 include ../xlib/Include.am
-include ../xt/Include.am
 
 EXTRA_DIST = MISSING mkwidget.scm
 
-pkglib_LTLIBRARIES = xt.la xt-motif.la
+pkglib_LTLIBRARIES = xaw.la motif.la
 
-xt_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
-xt_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@
-xt_la_LDFLAGS = -module -avoid-version
-xt_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
+xaw_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
+xaw_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@
+xaw_la_LDFLAGS = -module -avoid-version
+xaw_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
 
-xt_motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
-xt_motif_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
-xt_motif_la_LDFLAGS = -module -avoid-version
-xt_motif_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
+motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
+motif_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
+motif_la_LDFLAGS = -module -avoid-version
+motif_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
 
 extensions_HEADERS = xt.h
 extensionsdir = $(pkgincludedir)/extensions
 
+SOURCES_XT = \
+	accelerator.c \
+	action.c \
+	callback.c \
+	class.c \
+	classname.c \
+	context.c \
+	converter.c \
+	function.c \
+	identifier.c \
+	popup.c \
+	resource.c \
+	translation.c \
+	widget.c \
+	xterror.c \
+	xtinit.c \
+	xtobjects.c \
+	$(NULL)
+
diff --git a/lib/xwidgets/mkwidget.scm b/lib/xwidgets/mkwidget.scm
index 10ff0e3..34bac4f 100644
--- a/lib/xwidgets/mkwidget.scm
+++ b/lib/xwidgets/mkwidget.scm
@@ -22,15 +22,15 @@
 	  (lambda (i) (check-string 'define-widget-type i 'include)) include)
         (check-string 'define-widget-type include 'include))
     (set! type-name name)
-    (format f "#include \"../xt/xt.h\"~%")
+    (format f "#include \"../xt.h\"~%")
     (case widget-set
-      (xm
+      (motif
 	(format f "#include <Xm/Xm.h>~%")))
     (if (and (not (eqv? include "")) (not (null? include)))
 	(begin
 	  (define dir)
 	  (case widget-set
-	    (xm
+	    (motif
 	     (set! dir "Xm"))
 	    (xaw
 	     (set! dir "X11/Xaw")))
diff --git a/lib/xwidgets/motif/Makefile.am b/lib/xwidgets/motif/Makefile.am
index dee22ce..07655bf 100644
--- a/lib/xwidgets/motif/Makefile.am
+++ b/lib/xwidgets/motif/Makefile.am
@@ -1,18 +1,16 @@
 NULL = 
 
-EXTRA_DIST = $(DATA) $(D_FILES)
+EXTRA_DIST = $(D_FILES)
 
-pkglib_xm_DATA = ALIASES
-pkglib_xm_LTLIBRARIES = xm.la
-pkglib_xmdir = $(pkglibdir)/xm
+pkglib_LTLIBRARIES = motif-widgets.la
 
-nodist_xm_la_SOURCES = $(C_FILES)
-xm_la_CFLAGS = -I$(srcdir)/../xlib @XM_LIBS@
-xm_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning
-xm_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
+nodist_motif_widgets_la_SOURCES = $(C_FILES)
+motif_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XM_CFLAGS@
+motif_widgets_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning
+motif_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
 
 .d.c:
-	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/../xt -l mkwidget.scm $< $@ xm
+	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ motif
 
 clean: clean-local
 clean-local:
diff --git a/lib/xwidgets/xaw/Makefile.am b/lib/xwidgets/xaw/Makefile.am
index 5e4bf7f..37cc414 100644
--- a/lib/xwidgets/xaw/Makefile.am
+++ b/lib/xwidgets/xaw/Makefile.am
@@ -1,18 +1,16 @@
 NULL = 
 
-EXTRA_DIST = $(DATA) $(D_FILES)
+EXTRA_DIST = $(D_FILES)
 
-pkglib_xaw_DATA = ALIASES
-pkglib_xaw_LTLIBRARIES = xaw.la
-pkglib_xawdir = $(pkglibdir)/xaw
+pkglib_LTLIBRARIES = xaw-widgets.la
 
-nodist_xaw_la_SOURCES = $(C_FILES)
-xaw_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@
-xaw_la_LDFLAGS = -module -avoid-version
-xaw_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
+nodist_xaw_widgets_la_SOURCES = $(C_FILES)
+xaw_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XAW_CFLAGS@
+xaw_widgets_la_LDFLAGS = -module -avoid-version
+xaw_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
 
 .d.c:
-	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/../xt -l mkwidget.scm $< $@ xaw
+	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ xaw
 
 clean: clean-local
 clean-local: