diff --git a/library/windows/types.factor b/library/windows/types.factor
index bb5fcacc94..43e70bb4fb 100644
--- a/library/windows/types.factor
+++ b/library/windows/types.factor
@@ -137,15 +137,19 @@ TYPEDEF: LONG_PTR            LPARAM
 TYPEDEF: BOOL*               LPBOOL
 TYPEDEF: BYTE*               LPBYTE
 TYPEDEF: DWORD*              LPCOLORREF
-! TYPEDEF: CHAR*               LPCSTR
-TYPEDEF: VOID*               LPCSTR
 TYPEDEF: WCHAR*              LPCWSTR
 TYPEDEF: WCHAR*              LPWSTR
 
-TYPEDEF: LPCWSTR     LPCTSTR
-TYPEDEF: LPWSTR      LPTSTR
-TYPEDEF: LPCWSTR     PCTSTR
-TYPEDEF: LPWSTR      PTSTR
+! TYPEDEF: LPCWSTR     LPCTSTR
+! TYPEDEF: LPWSTR      LPTSTR
+! TYPEDEF: LPCWSTR     PCTSTR
+! TYPEDEF: LPWSTR      PTSTR
+
+TYPEDEF: WCHAR*              LPWSTR
+TYPEDEF: CHAR*               LPSTR
+! TYPEDEF: CHAR*               LPCSTR
+TYPEDEF: VOID*               LPCSTR
+
 TYPEDEF: LPCSTR      LPCTSTR
 TYPEDEF: LPSTR       LPTSTR
 TYPEDEF: LPCSTR      PCTSTR
@@ -153,9 +157,7 @@ TYPEDEF: LPSTR       PTSTR
 
 TYPEDEF: DWORD*              LPDWORD
 TYPEDEF: HANDLE*             LPHANDLE
-TYPEDEF: CHAR*               LPSTR
 TYPEDEF: WORD*               LPWORD
-TYPEDEF: WCHAR*              LPWSTR
 TYPEDEF: LONG_PTR            LRESULT
 TYPEDEF: BOOL*               PBOOL
 TYPEDEF: BOOLEAN*            PBOOLEAN