diff --git a/WINGs/Makefile.in b/WINGs/Makefile.in
index 823e9cf1..814f1b62 100644
--- a/WINGs/Makefile.in
+++ b/WINGs/Makefile.in
@@ -59,10 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
+DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -77,6 +79,7 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
diff --git a/WINGs/Resources/Makefile.in b/WINGs/Resources/Makefile.in
index a8bf066a..1e5caf18 100644
--- a/WINGs/Resources/Makefile.in
+++ b/WINGs/Resources/Makefile.in
@@ -59,10 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
+DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -77,6 +79,7 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -108,9 +111,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Resources/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WINGs/Resources/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -142,6 +145,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WINGs/Resources
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WINGs/Resources/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WINGs/WINGsP.h b/WINGs/WINGsP.h
index f031cabb..66e80b5d 100644
--- a/WINGs/WINGsP.h
+++ b/WINGs/WINGsP.h
@@ -6,8 +6,8 @@
 #include <X11/Xutil.h>
 
 
-#include "WINGs.h"
 #include "WUtil.h"
+#include "WINGs.h"
 
 #if WINGS_H_VERSION < 990222
 #error There_is_an_old_WINGs.h_file_somewhere_in_your_system._Please_remove_it.
diff --git a/WINGs/wtextfield.c b/WINGs/wtextfield.c
index 8a901b11..4397cb43 100644
--- a/WINGs/wtextfield.c
+++ b/WINGs/wtextfield.c
@@ -13,26 +13,6 @@
 #define CURSOR_BLINK_OFF_DELAY	300
 
 
-typedef struct WMTextFieldDelegate {
-    void *data;
-
-    void (*didBeginEditing)(struct WMTextFieldDelegate *self,
-			    WMNotification *notif);
-
-    void (*didChange)(struct WMTextFieldDelegate *self, 
-		      WMNotification *notif);
-
-    void (*didEndEditing)(struct WMTextFieldDelegate *self,
-			  WMNotification *notif);
-
-    Bool (*shouldBeginEditing)(struct WMTextFieldDelegate *self,
-			       WMTextField *tPtr);
-
-    Bool (*shouldEndEditing)(struct WMTextFieldDelegate *self,
-			     WMTextField *tPtr);
-} WMTextFieldDelegate;
-
-
 
 char *WMTextDidChangeNotification = "WMTextDidChangeNotification";
 char *WMTextDidBeginEditingNotification = "WMTextDidBeginEditingNotification";