diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 98c409609..b0e10a570 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-21  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/winuser.h (SPI_GETACTIVEWINDOWTRACKING,
+	SPI_GETACTIVEWNDTRKZORDER, SPI_SETACTIVEWINDOWTRACKING,
+	SPI_SETACTIVEWNDTRKZORDER): Remove duplicate defines.
+
 2004-04-20  Christopher Faylor  <cgf@alum.bu.edu>
 
 	* include/wingdi.h: Protect non-unicode case of below.
@@ -306,7 +312,7 @@
 
 2004-02-11  Danny Smith  <dannysmith@users.sourceforge.net>
 
-	* lib/dnsapi.a: New file.
+	* lib/dnsapi.def: New file.
 	* lib/test.c: Include windns.h.
  
 2004-02-11  Pierre A. Humblet  <Pierre.Humblet@ieee.org>
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 2c020d06c..3b174a083 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1111,9 +1111,7 @@ extern "C" {
 #define HSHELL_WINDOWCREATED 1
 #define HSHELL_WINDOWDESTROYED 2
 #define SPI_GETACCESSTIMEOUT 60
-#define SPI_GETACTIVEWINDOWTRACKING 4096
 #define SPI_GETACTIVEWNDTRKTIMEOUT 8194
-#define SPI_GETACTIVEWNDTRKZORDER 4108
 #define SPI_GETANIMATION 72
 #define SPI_GETBEEP 1
 #define SPI_GETBORDER 5
@@ -1156,9 +1154,7 @@ extern "C" {
 #define SPI_LANGDRIVER 12
 #define SPI_SCREENSAVERRUNNING 97
 #define SPI_SETACCESSTIMEOUT 61
-#define SPI_SETACTIVEWINDOWTRACKING 4097
 #define SPI_SETACTIVEWNDTRKTIMEOUT 8195
-#define SPI_SETACTIVEWNDTRKZORDER 4109
 #define SPI_SETANIMATION 73
 #define SPI_SETBEEP 2
 #define SPI_SETBORDER 6