diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4d6f4f61b..337d66296 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-03  Luke Dunstan  <infidel@users.sf.net>
+
+	* include/commdlg.h (CommDlg_OpenSave_*): Add parentheses around
+	macro arguments. Thanks to Tom Bishop <tombishop@users.sf.net>.
+	* include/winuser.h (MONITOR_DEFAULTTONULL, MONITOR_DEFAULTTOPRIMARY,
+	MONITOR_DEFAULTTONEAREST, MONITORINFOF_PRIMARY): Add defines.
+	(TPM_RECURSE): Add guard for Win98/Win2K.
+	Thanks to Magnus Olsen <greatlord@users.sf.net>.
+
 2003-07-01  Earnie Boyd  <earnie@users.sf.net>
 
 	* include/basetyps.h (small, hyper): Change to __small and __hyper to
diff --git a/winsup/w32api/include/commdlg.h b/winsup/w32api/include/commdlg.h
index 38039bb1b..465a18001 100644
--- a/winsup/w32api/include/commdlg.h
+++ b/winsup/w32api/include/commdlg.h
@@ -196,19 +196,19 @@ extern "C" {
 #endif
 #endif /* ifndef SNDMSG */
 
-#define CommDlg_OpenSave_GetSpec(d,s,m) (int)SNDMSG(d,CDM_GETSPEC,m,(LPARAM)s)
+#define CommDlg_OpenSave_GetSpec(d,s,m) ((int)SNDMSG((d),CDM_GETSPEC,(m),(LPARAM)(s)))
 #define CommDlg_OpenSave_GetSpecA CommDlg_OpenSave_GetSpec
 #define CommDlg_OpenSave_GetSpecW CommDlg_OpenSave_GetSpec
-#define CommDlg_OpenSave_GetFilePath(d,s,m) (int)SNDMSG(d,CDM_GETFILEPATH,m,(LPARAM)s)
+#define CommDlg_OpenSave_GetFilePath(d,s,m) ((int)SNDMSG((d),CDM_GETFILEPATH,(m),(LPARAM)(s)))
 #define CommDlg_OpenSave_GetFilePathA CommDlg_OpenSave_GetFilePath
 #define CommDlg_OpenSave_GetFilePathW CommDlg_OpenSave_GetFilePath
-#define CommDlg_OpenSave_GetFolderPath(d,s,m) (int)SNDMSG(d,CDM_GETFOLDERPATH,m,(LPARAM)(LPSTR)s)
+#define CommDlg_OpenSave_GetFolderPath(d,s,m) ((int)SNDMSG((d),CDM_GETFOLDERPATH,(m),(LPARAM)(LPSTR)(s)))
 #define CommDlg_OpenSave_GetFolderPathA CommDlg_OpenSave_GetFolderPath
 #define CommDlg_OpenSave_GetFolderPathW CommDlg_OpenSave_GetFolderPath
-#define CommDlg_OpenSave_GetFolderIDList(d,i,m) (int)SNDMSG(d,CDM_GETFOLDERIDLIST,m,(LPARAM)i)
-#define CommDlg_OpenSave_SetControlText(d,i,t) (void)SNDMSG(d,CDM_SETCONTROLTEXT,i,(LPARAM)t)
-#define CommDlg_OpenSave_HideControl(d,i) (void)SNDMSG(d,CDM_HIDECONTROL,i,0)
-#define CommDlg_OpenSave_SetDefExt(d,e) (void)SNDMSG(d,CDM_SETDEFEXT,0,(LPARAM)e)
+#define CommDlg_OpenSave_GetFolderIDList(d,i,m) ((int)SNDMSG((d),CDM_GETFOLDERIDLIST,(m),(LPARAM)(i)))
+#define CommDlg_OpenSave_SetControlText(d,i,t) ((void)SNDMSG((d),CDM_SETCONTROLTEXT,(i),(LPARAM)(t)))
+#define CommDlg_OpenSave_HideControl(d,i) ((void)SNDMSG((d),CDM_HIDECONTROL,(i),0))
+#define CommDlg_OpenSave_SetDefExt(d,e) ((void)SNDMSG((d),CDM_SETDEFEXT,0,(LPARAM)(e)))
 
 typedef UINT (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
 typedef __CDHOOKPROC LPCCHOOKPROC;
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index a42587848..8a9b27dfa 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1749,7 +1749,9 @@ extern "C" {
 #define TPM_BOTTOMALIGN 32
 #define TPM_NONOTIFY 128
 #define TPM_RETURNCMD 256
+#if (_WIN32_WINNT >= _NT5 || _WIN32_WINDOWS >= _W98)
 #define TPM_RECURSE 1
+#endif
 #define HELP_COMMAND 0x102
 #define HELP_CONTENTS 3
 #define HELP_CONTEXT 1
@@ -2001,6 +2003,12 @@ extern "C" {
 #define GA_PARENT 1
 #define GA_ROOT 2
 #define GA_ROOTOWNER 3
+#if (_WIN32_WINNT >= _NT5 || _WIN32_WINDOWS >= _W98)
+#define MONITOR_DEFAULTTONULL 0 
+#define MONITOR_DEFAULTTOPRIMARY 1 
+#define MONITOR_DEFAULTTONEAREST 2 
+#define MONITORINFOF_PRIMARY 1 
+#endif
 
 #ifndef RC_INVOKED
 typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);