windows substitution error in gcc Makefile

sys/windows/Makefile.gcc

@@ -352,7 +352,7 @@ else
 CURSESOBJ=
 endif
 
-SOBJ   = $(O)windmain.o $(O)windsyso $(O)win10.o \
+SOBJ   = $(O)windmain.o $(O)windsys.o $(O)win10.o \
 	$(O)safeproc.o $(O)nhlan.o $(SOUND)
 
 OBJS   = $(VOBJ01) $(VOBJ02) $(VOBJ03) $(VOBJ04) $(VOBJ05) \
@@ -796,7 +796,7 @@ endif
 #
 	$(subst /,\,echo install done > $@)
 
-#  copy $(MSWSYS)/windsyshlp    $(GAMEDIR)
+#  copy $(MSWSYS)/windsys.hlp    $(GAMEDIR)
 
 recover: $(U)recover.exe
 	$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe  $(GAMEDIR))
@@ -1324,8 +1324,8 @@ endif
 
 $(O)consoletty.o:   $(HACK_H) $(TILE_H) $(MSWSYS)/win32api.h $(MSWSYS)/consoletty.c
 	$(cc) $(CFLAGS) -I$(WSHR) -o$@  $(MSWSYS)/consoletty.c
-$(O)windsyso: $(HACK_H) $(MSWSYS)/win32api.h $(MSWSYS)/windsysc
-	$(cc) $(CFLAGS) -o$@  $(MSWSYS)/windsysc
+$(O)windsys.o: $(HACK_H) $(MSWSYS)/win32api.h $(MSWSYS)/windsys.c
+	$(cc) $(CFLAGS) -o$@  $(MSWSYS)/windsys.c
 $(O)ntsound.o: $(HACK_H) $(MSWSYS)/ntsound.c
 	$(cc) $(CFLAGS)  -o$@ $(MSWSYS)/ntsound.c
 

sys/windows/vs/uudecode/uudecode.vcxproj

@@ -23,14 +23,9 @@
   <Import Project="$(vsDir)console.props" />
   <Import Project="$(vsDir)common.props" />
   <Import Project="$(vsDir)files.props" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysShareDir);</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>