diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index c0c1a892..0fb12dc7 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -107,7 +107,7 @@ libWUtil_a_SOURCES = 	\
 	wutil.c
 
 
-CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
 
 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
diff --git a/WINGs/connection.c b/WINGs/connection.c
index 198100cb..31ba0760 100644
--- a/WINGs/connection.c
+++ b/WINGs/connection.c
@@ -174,6 +174,8 @@ sendTimeout(void *cdata)
         clearOutputQueue(cPtr);
         cPtr->state = WCTimedOut;
         cPtr->timeoutState = WCTWhileSending;
+        // should we close it no matter what (after calling the didTimeout
+        // delegate)? -Dan
         if (cPtr->delegate && cPtr->delegate->didTimeout) {
             (*cPtr->delegate->didTimeout)(cPtr->delegate, cPtr);
         } else {
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 4e1d8c7e..e2e65d77 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -42,7 +42,7 @@ WPrefs_SOURCES = \
 	imagebrowser.h \
 	xmodifier.c
 
-CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
 
 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 4a752f60..a89a5c02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,7 @@ wmaker_SOURCES = 	\
 	text.h 
 
 
-CPPFLAGS = @CPPFLAGS@ $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = @CPPFLAGS@ $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\"
 
 
 INCLUDES = \