diff -Naur pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/EdkMdb.h pywin32-b301/com/win32comext/mapi/src/mapi_headers/EdkMdb.h
--- pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/EdkMdb.h	2021-05-30 16:31:38 +0800
+++ pywin32-b301/com/win32comext/mapi/src/mapi_headers/EdkMdb.h	2021-10-06 03:07:19 +0800
@@ -78,7 +78,7 @@
 #define PR_PROFILE_RECONNECT_INTERVAL	PROP_TAG( PT_LONG, pidProfileMin+0x1a)	// dup tag of PR_USER_NAME
 #define PR_PROFILE_SERVER_VERSION		PROP_TAG( PT_LONG, pidProfileMin+0x1b)
 
-/* SE 233155 - MarkH: EMSABP DCR /*
+/* SE 233155 - MarkH: EMSABP DCR */
 /* Properties in the abp section - I got these values from AlecDun (Outlook team) */
 #define PR_PROFILE_ABP_ALLOW_RECONNECT		PROP_TAG( PT_LONG, pidProfileMin+0x39)
 #define PR_PROFILE_ABP_MTHREAD_TIMEOUT_SECS	PROP_TAG( PT_LONG, pidProfileMin+0x3A)
diff -Naur pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MAPI.h pywin32-b301/com/win32comext/mapi/src/mapi_headers/MAPI.h
--- pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MAPI.h	2021-05-30 16:31:38 +0800
+++ pywin32-b301/com/win32comext/mapi/src/mapi_headers/MAPI.h	2021-10-06 01:42:20 +0800
@@ -20,6 +20,13 @@
 #pragma once
 #endif
 
+#ifndef _MSC_VER
+#define __in
+#define __in_opt
+#define __out
+#define __deref_out_ecount_full(x)
+#endif
+
 /*
  *  Types.
  */
@@ -160,7 +167,7 @@
 
 /* #define MAPI_LOGON_UI        0x00000001     Display logon UI             */
 /* #define MAPI_NEW_SESSION     0x00000002     Don't use shared session     */
-/* #define MAPI_LONG_MSGID		0x00004000	/* allow 512 char returned ID	*/
+/* #define MAPI_LONG_MSGID      0x00004000     allow 512 char returned ID   */
 
 /* MAPIAddress() flags.     */
 
diff -Naur pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MAPICode.h pywin32-b301/com/win32comext/mapi/src/mapi_headers/MAPICode.h
--- pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MAPICode.h	2021-05-30 16:31:38 +0800
+++ pywin32-b301/com/win32comext/mapi/src/mapi_headers/MAPICode.h	2021-10-06 01:41:52 +0800
@@ -216,5 +216,4 @@
 #endif
 
 #endif	/* MAPICODE_H */
-
 
diff -Naur pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MAPIDefS.h pywin32-b301/com/win32comext/mapi/src/mapi_headers/MAPIDefS.h
--- pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MAPIDefS.h	2021-05-30 16:31:38 +0800
+++ pywin32-b301/com/win32comext/mapi/src/mapi_headers/MAPIDefS.h	2021-10-06 01:42:30 +0800
@@ -51,6 +51,13 @@
 #include <stddef.h>
 #endif
 
+#ifndef _MSC_VER
+#define __in
+#define __in_opt
+#define __out
+#define __deref_out_ecount_full(x)
+#endif
+
 /* Array dimension for structures with variable-sized arrays at the end. */
 
 #ifndef MAPI_DIM
@@ -2728,5 +2735,4 @@
 #endif
 
 #endif /* MAPIDEFS_H */
-
 
diff -Naur pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MAPIForm.h pywin32-b301/com/win32comext/mapi/src/mapi_headers/MAPIForm.h
--- pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MAPIForm.h	2021-05-30 16:31:38 +0800
+++ pywin32-b301/com/win32comext/mapi/src/mapi_headers/MAPIForm.h	2021-10-06 01:42:36 +0800
@@ -631,5 +631,4 @@
 
 #endif							/* MAPIFORM_H */
 
-
 
diff -Naur pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MSPST.h pywin32-b301/com/win32comext/mapi/src/mapi_headers/MSPST.h
--- pywin32-b301-orig/com/win32comext/mapi/src/mapi_headers/MSPST.h	2021-05-30 16:31:38 +0800
+++ pywin32-b301/com/win32comext/mapi/src/mapi_headers/MSPST.h	2021-10-06 01:42:42 +0800
@@ -97,5 +97,4 @@
                                 0xd9, 0x6e, 0x00, 0x00 }
 
 #endif  /* _MSPST_H_ */
-