diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json
index ed17a5c82..24bc5b7ae 100644
--- a/generation/WinSDK/autoTypes.json
+++ b/generation/WinSDK/autoTypes.json
@@ -1911,5 +1911,12 @@
     "ValueType": "DECLARE_HANDLE",
     "InvalidHandleValues": [ -1, 0 ],
     "NativeTypeDef": true
+  },
+  {
+    "Namespace": "Windows.Win32.System.Memory",
+    "Name": "MEMORY_MAPPED_VIEW_ADDRESS",
+    "ValueType": "void*",
+    "InvalidHandleValues": [ 0 ],
+    "NativeTypeDef": false
   }
 ]
diff --git a/generation/WinSDK/emitter.settings.rsp b/generation/WinSDK/emitter.settings.rsp
index 783ab4c51..c94dc1d70 100644
--- a/generation/WinSDK/emitter.settings.rsp
+++ b/generation/WinSDK/emitter.settings.rsp
@@ -1566,4 +1566,14 @@ D3D12_STREAM_OUTPUT_DESC::pBufferStrides=[NativeArrayInfo(CountFieldName = "NumS
 D3D12_STREAM_OUTPUT_DESC::pSODeclaration=[NativeArrayInfo(CountFieldName = "NumEntries")]
 D3D12_VIEW_INSTANCING_DESC::pViewInstanceLocations=[NativeArrayInfo(CountFieldName = "ViewInstanceCount")]
 CreatePipe::hReadPipe=[IgnoreIfReturn("0")]
-CreatePipe::hWritePipe=[IgnoreIfReturn("0")]
\ No newline at end of file
+CreatePipe::hWritePipe=[IgnoreIfReturn("0")]
+MapViewOfFile::return=MEMORY_MAPPED_VIEW_ADDRESS
+MapViewOfFile3::return=MEMORY_MAPPED_VIEW_ADDRESS
+MapViewOfFile3FromApp::return=MEMORY_MAPPED_VIEW_ADDRESS
+MapViewOfFileEx::return=MEMORY_MAPPED_VIEW_ADDRESS
+MapViewOfFileExNuma::return=MEMORY_MAPPED_VIEW_ADDRESS
+MapViewOfFileFromApp::return=MEMORY_MAPPED_VIEW_ADDRESS
+MapViewOfFileNuma2::return=MEMORY_MAPPED_VIEW_ADDRESS
+UnmapViewOfFile::lpBaseAddress=MEMORY_MAPPED_VIEW_ADDRESS
+UnmapViewOfFile2::BaseAddress=MEMORY_MAPPED_VIEW_ADDRESS
+UnmapViewOfFileEx::BaseAddress=MEMORY_MAPPED_VIEW_ADDRESS
\ No newline at end of file
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
index 3e5ce1cb6..f94ed46ea 100644
--- a/scripts/ChangesSinceLastRelease.txt
+++ b/scripts/ChangesSinceLastRelease.txt
@@ -602,3 +602,15 @@ Windows.Win32.System.SystemServices.Apis.CONTEXT_KERNEL_DEBUGGER removed
 Windows.Win32.System.SystemServices.Apis.CONTEXT_RET_TO_GUEST removed
 Windows.Win32.System.SystemServices.Apis.CONTEXT_SERVICE_ACTIVE removed
 Windows.Win32.System.SystemServices.Apis.CONTEXT_UNWOUND_TO_CALL removed
+# Fixed #561.
+Windows.Win32.System.Memory.Apis.MapViewOfFile : return...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.MapViewOfFile3 : return...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.MapViewOfFile3FromApp : return...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.MapViewOfFileEx : return...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.MapViewOfFileExNuma : return...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.MapViewOfFileFromApp : return...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.MapViewOfFileNuma2 : return...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.UnmapViewOfFile : lpBaseAddress...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.UnmapViewOfFile2 : BaseAddress...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.Apis.UnmapViewOfFileEx : BaseAddress...Void* => MEMORY_MAPPED_VIEW_ADDRESS
+Windows.Win32.System.Memory.MEMORY_MAPPED_VIEW_ADDRESS added