diff --git a/WINGs/wcolorwell.c b/WINGs/wcolorwell.c
index 0205272c..f180f76a 100644
--- a/WINGs/wcolorwell.c
+++ b/WINGs/wcolorwell.c
@@ -457,7 +457,7 @@ prepareForDragOperation(WMView *self, WMDraggingInfo *info)
 static Bool
 performDragOperation(WMView *self, WMDraggingInfo *info, WMData *data)
 {
-    char *colorName = WMDataBytes(data);
+    char *colorName = (char*)WMDataBytes(data);
     WMColor *color;
     
     color = WMCreateNamedColor(W_VIEW_SCREEN(self), colorName, True);
diff --git a/src/Makefile.am b/src/Makefile.am
index ac1c76ef..cbeaded0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,7 +106,7 @@ wmaker_SOURCES = 	\
 	text.h 
 
 
-CPPFLAGS = @CPPFLAGS@ @DFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
+CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
 
 
 INCLUDES = \
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 67cc51df..973e5307 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -422,12 +422,12 @@ typedef struct WPreferences {
 
     struct {
         unsigned int nodock:1;	       /* don't display the dock */
-        unsigned int noclip:1;        /* don't display the clip */
+        unsigned int noclip:1;         /* don't display the clip */
 	unsigned int nocpp:1;	       /* don't use cpp */
 	unsigned int noupdates:1;      /* don't require ~/GNUstep (-static) */
 	unsigned int noautolaunch:1;   /* don't autolaunch apps */
 	unsigned int norestore:1;      /* don't restore session */
-	unsigned int createstdcmap:1;  /* create std colormap */
+	unsigned int create_stdcmap:1; /* create std colormap */
     } flags;			       /* internal flags */
 } WPreferences;
 
diff --git a/src/screen.c b/src/screen.c
index 4dba2182..c2f1d265 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -724,8 +724,8 @@ wScreenInit(int screen_number)
 
     
     /* will only be accounted for in PseudoColor */
-    if (wPreferences.create_stdcmap) {
-	rattr.standard_colormap_mode = RCreateStdColorma;
+    if (wPreferences.flags.create_stdcmap) {
+	rattr.standard_colormap_mode = RCreateStdColormap;
     } else {
 	rattr.standard_colormap_mode = RUseStdColormap;
     }
diff --git a/util/Makefile.am b/util/Makefile.am
index 17a305be..91d30ae5 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -10,8 +10,7 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
 		wkdemenu.pl
 
-INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
-	@HEADER_SEARCH_PATH@
+INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
 
 # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
 liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am
index e411c364..39887435 100644
--- a/wmlib/Makefile.am
+++ b/wmlib/Makefile.am
@@ -5,7 +5,7 @@ lib_LIBRARIES = libWMaker.a
 
 include_HEADERS = WMaker.h
 
-INCLUDES = @DFLAGS@ @XCFLAGS@
+INCLUDES = @XCFLAGS@
 
 libWMaker_a_SOURCES = 	\
 	menu.c 		\
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index 90deb29f..9e646585 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -57,7 +57,7 @@ x86_specific.o: x86_specific.c
 
 
 
-INCLUDES = @DFLAGS@ @HEADER_SEARCH_PATH@
+INCLUDES = @HEADER_SEARCH_PATH@
 
 LIBLIST = $(top_builddir)/wrlib/libwraster.la @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm