diff --git a/CHANGES.current b/CHANGES.current
index 89e817415..bbf7a54af 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -7,6 +7,9 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
 Version 4.0.0 (in progress)
 ===========================
 
+2019-01-07: wsfulton
+            #358 Add VOID to windows.i
+
 2019-01-05: wsfulton
             #948 #1019 #1273 Fix for C++11 raw strings where the delimiters were mistakenly left
             in the string contents in situations where the string was copied into generated code.
diff --git a/Lib/windows.i b/Lib/windows.i
index 2c093dacc..3e4626196 100644
--- a/Lib/windows.i
+++ b/Lib/windows.i
@@ -112,6 +112,9 @@ typedef unsigned __int64 DWORD64, *PDWORD64;
 // Types from winnt.h
 typedef void *PVOID;
 typedef void *PVOID64;
+#ifndef VOID
+#define VOID void
+#endif
 typedef char CHAR;
 typedef short SHORT;
 typedef long LONG;