diff --git a/include/advpub.h b/include/advpub.h
index c31df3326b0..b213b1f8ffe 100644
--- a/include/advpub.h
+++ b/include/advpub.h
@@ -26,7 +26,7 @@ extern "C" {
 #endif
 
 #ifndef S_ASYNCHRONOUS
-#define S_ASYNCHRONOUS  _HRESULT_TYPEDEF_(0x401E8L)
+#define S_ASYNCHRONOUS  _HRESULT_TYPEDEF_(0x401E8)
 #endif
 
 typedef struct _CabInfoA
diff --git a/include/prsht.h b/include/prsht.h
index d538c8eda3e..21fc266447c 100644
--- a/include/prsht.h
+++ b/include/prsht.h
@@ -454,25 +454,25 @@ typedef struct _PSHNOTIFY
 	SNDMSG(hDlg, PSM_ADDPAGE, 0, (LPARAM)hpage)
 
 #define PropSheet_Changed(hDlg, hwnd) \
-	SNDMSG(hDlg, PSM_CHANGED, (WPARAM)hwnd, 0L)
+        SNDMSG(hDlg, PSM_CHANGED, (WPARAM)hwnd, 0)
 
 #define PropSheet_RestartWindows(hDlg) \
-	SNDMSG(hDlg, PSM_RESTARTWINDOWS, 0, 0L)
+        SNDMSG(hDlg, PSM_RESTARTWINDOWS, 0, 0)
 
 #define PropSheet_RebootSystem(hDlg) \
-	SNDMSG(hDlg, PSM_REBOOTSYSTEM, 0, 0L)
+        SNDMSG(hDlg, PSM_REBOOTSYSTEM, 0, 0)
 
 #define PropSheet_CancelToClose(hDlg) \
-	PostMessage(hDlg, PSM_CANCELTOCLOSE, 0, 0L)
+        PostMessage(hDlg, PSM_CANCELTOCLOSE, 0, 0)
 
 #define PropSheet_QuerySiblings(hDlg, wParam, lParam) \
 	SNDMSG(hDlg, PSM_QUERYSIBLINGS, wParam, lParam)
 
 #define PropSheet_UnChanged(hDlg, hwnd) \
-	SNDMSG(hDlg, PSM_UNCHANGED, (WPARAM)hwnd, 0L)
+        SNDMSG(hDlg, PSM_UNCHANGED, (WPARAM)hwnd, 0)
 
 #define PropSheet_Apply(hDlg) \
-	SNDMSG(hDlg, PSM_APPLY, 0, 0L)
+        SNDMSG(hDlg, PSM_APPLY, 0, 0)
 
 #define PropSheet_SetTitle(hDlg, wStyle, lpszText)\
 	SNDMSG(hDlg, PSM_SETTITLE, wStyle, (LPARAM)(LPCTSTR)lpszText)
@@ -496,7 +496,7 @@ typedef struct _PSHNOTIFY
 	(BOOL)SNDMSG(hDlg, PSM_ISDIALOGMESSAGE, 0, (LPARAM)pMsg)
 
 #define PropSheet_GetCurrentPageHwnd(hDlg) \
-	(HWND)SNDMSG(hDlg, PSM_GETCURRENTPAGEHWND, 0, 0L)
+        (HWND)SNDMSG(hDlg, PSM_GETCURRENTPAGEHWND, 0, 0)
 
 #define PropSheet_InsertPage(hDlg, index, hpage) \
         SNDMSG(hDlg, PSM_INSERTPAGE, (WPARAM)(index), (LPARAM)(hpage))
diff --git a/include/sti.h b/include/sti.h
index 204492d9a2f..cda2c1c7fe1 100644
--- a/include/sti.h
+++ b/include/sti.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-DEFINE_GUID(CLSID_Sti, 0xB323F8E0L, 0x2E68, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6C);
+DEFINE_GUID(CLSID_Sti, 0xB323F8E0, 0x2E68, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6C);
 
 DEFINE_GUID(IID_IStillImageW, 0x641BD880, 0x2DC8, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6C);
 
diff --git a/include/strsafe.h b/include/strsafe.h
index 2beb53fffb6..842075f0fce 100644
--- a/include/strsafe.h
+++ b/include/strsafe.h
@@ -25,8 +25,8 @@
 /* Windows version includes this header. */
 /* #include <specstring.h> */
 
-#define STRSAFE_E_INSUFFICIENT_BUFFER   ((HRESULT)0x8007007AL)
-#define STRSAFE_E_INVALID_PARAM         ((HRESULT)0x80070075L)
-#define STRSAFE_E_END_OF_FILE           ((HRESULT)0x80070026L)
+#define STRSAFE_E_INSUFFICIENT_BUFFER   ((HRESULT)0x8007007A)
+#define STRSAFE_E_INVALID_PARAM         ((HRESULT)0x80070075)
+#define STRSAFE_E_END_OF_FILE           ((HRESULT)0x80070026)
 
 #endif
diff --git a/include/winhttp.h b/include/winhttp.h
index 077c2772c7f..b54bd92b0e8 100644
--- a/include/winhttp.h
+++ b/include/winhttp.h
@@ -408,7 +408,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME;
                                                         | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE          \
                                                         | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR)
 #define WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS         0xffffffff
-#define WINHTTP_INVALID_STATUS_CALLBACK                 ((WINHTTP_STATUS_CALLBACK)(-1L))
+#define WINHTTP_INVALID_STATUS_CALLBACK                 ((WINHTTP_STATUS_CALLBACK)(-1))
 
 #define API_RECEIVE_RESPONSE          (1)
 #define API_QUERY_DATA_AVAILABLE      (2)
diff --git a/include/wininet.h b/include/wininet.h
index ce09821218a..6db41ca4dce 100644
--- a/include/wininet.h
+++ b/include/wininet.h
@@ -687,7 +687,7 @@ INTERNETAPI INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW(HINTERNET
 #define INTERNET_STATE_IDLE                     0x00000100
 #define INTERNET_STATE_BUSY                     0x00000200
 
-#define INTERNET_INVALID_STATUS_CALLBACK        ((INTERNET_STATUS_CALLBACK)(-1L))
+#define INTERNET_INVALID_STATUS_CALLBACK        ((INTERNET_STATUS_CALLBACK)(-1))
 
 #define FTP_TRANSFER_TYPE_UNKNOWN   0x00000000
 #define FTP_TRANSFER_TYPE_ASCII     0x00000001
diff --git a/include/winioctl.h b/include/winioctl.h
index 3a56d173f92..36d6e245e6e 100644
--- a/include/winioctl.h
+++ b/include/winioctl.h
@@ -457,9 +457,9 @@ typedef struct _FILE_PIPE_PEEK_BUFFER {
 /* Device GUIDs */
 #ifdef DEFINE_GUID
 
-DEFINE_GUID(GUID_DEVINTERFACE_COMPORT, 0x86E0D1E0L, 0x8089,
+DEFINE_GUID(GUID_DEVINTERFACE_COMPORT, 0x86E0D1E0, 0x8089,
  0x11D0, 0x9C, 0xE4, 0x08, 0x00, 0x3E, 0x30, 0x1F, 0x73);
-DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978L, 0xE325,
+DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978, 0xE325,
  0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18);
 
 /* obsolete GUID names */
diff --git a/include/winsock2.h b/include/winsock2.h
index 5e1f489b188..b8845876ed9 100644
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -359,7 +359,7 @@ typedef struct _OVERLAPPED* LPWSAOVERLAPPED;
 
 #define WSA_INVALID_EVENT          ((WSAEVENT)NULL)
 #define WSA_MAXIMUM_WAIT_EVENTS    (MAXIMUM_WAIT_OBJECTS)
-#define WSA_WAIT_FAILED            ((DWORD)-1L)
+#define WSA_WAIT_FAILED            ((DWORD)-1)
 #define WSA_WAIT_EVENT_0           (WAIT_OBJECT_0)
 #define WSA_WAIT_IO_COMPLETION     (WAIT_IO_COMPLETION)
 #define WSA_WAIT_TIMEOUT           (WAIT_TIMEOUT)