diff --git a/Makefile.am b/Makefile.am
index e0489bdb..f407ef72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ VMSFILES = vms/libssh2_make_example.dcl vms/libssh2_make_help.dcl \
 
 WIN32FILES = win32/GNUmakefile \
   win32/libssh2_config.h win32/config.mk win32/rules.mk \
-  win32/Makefile.Watcom win32/libssh2.dsw win32/tests.dsp $(DSP) \
+  win32/libssh2.dsw win32/tests.dsp $(DSP) \
   win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc
 
 OS400FILES = os400/README400 os400/initscript.sh os400/make.sh \
diff --git a/win32/Makefile.Watcom b/win32/Makefile.Watcom
deleted file mode 100644
index 9b613eaa..00000000
--- a/win32/Makefile.Watcom
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-#  Watcom / OpenWatcom Win32 makefile for libssh2.
-#
-#  Comments to: Guenter Knauf
-#               https://web.archive.org/web/20100126042636/www.gknw.net/phpbb/
-#
-
-!ifndef %watcom
-!error WATCOM environment variable not set!
-!else
-SYS_INCL = -I$(%watcom)\h\nt -I$(%watcom)\h
-SYS_LIBS = $(%watcom)\lib386\nt;$(%watcom)\lib386
-!endif
-
-!ifdef %libname
-LIBNAME = $(%libname)
-!else
-LIBNAME = libssh2
-!endif
-TARGETS = $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib
-
-CC = wcc386
-LD = wlink
-AR = wlib
-RC = wrc
-
-!ifdef __LOADDLL__
-!  loaddll wcc386  wccd386
-!  loaddll wpp386  wppd386
-!  loaddll wlib    wlibd
-!  if $(__VERSION__) > 1270
-!    loaddll wlink   wlinkd
-!  else
-!    loaddll wlink   wlink
-!  endif
-!endif
-
-!if $(__VERSION__) < 1250
-RM = del /q /f 2>NUL
-!else
-RM = rm -f
-!endif
-MD = mkdir
-RD = rmdir /q /s 2>NUL
-CP = copy
-
-CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=nul -w2 -fpi -oilrtfm &
-         -wcd=201 -bt=nt -d+ -dWIN32 &
-         -I. -I..\include $(SYS_INCL)
-
-!ifdef %debug
-DEBUG  = -dDEBUG=1 -dDEBUGBUILD
-CFLAGS += -d3 $(DEBUG)
-!else
-CFLAGS += -d0
-!endif
-
-#
-# Change to suite.
-#
-!ifdef %zlib_root
-ZLIB_ROOT = $(%zlib_root)
-!else
-ZLIB_ROOT = ..\..\zlib
-!endif
-
-!ifdef %openssl_root
-OPENSSL_ROOT = $(%openssl_root)
-!else
-OPENSSL_ROOT = ..\..\openssl
-!endif
-
-!ifdef %use_zlib
-CFLAGS += -DLIBSSH2_HAVE_ZLIB -I$(ZLIB_ROOT)
-!endif
-
-!ifdef %use_wincng
-CFLAGS += -DLIBSSH2_WINCNG
-!else
-CFLAGS += -wcd=138 -dLIBSSH2_OPENSSL -I$(OPENSSL_ROOT)\inc32
-!endif
-
-!ifdef %use_watt32
-CFLAGS += -dUSE_WATT32 -I$(%watt_root)\inc
-!endif
-
-OBJ_BASE = WC_Win32.obj
-LINK_ARG = $(OBJ_BASE)\dyn\wlink.arg
-LIB_ARG  = $(OBJ_BASE)\stat\wlib.arg
-
-# In order to process Makefile.inc wmake must be called with -u switch!
-!ifndef %MAKEFLAGS
-!error You MUST call wmake with the -u switch!
-!else
-!ifdef %use_wincng
-!include ..\Makefile.WinCNG.inc
-!else
-!include ..\Makefile.OpenSSL.inc
-!endif
-!include ..\Makefile.inc
-!endif
-
-OBJS = $(CSOURCES:.c=.obj)
-OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\)
-
-#
-# Use $(OBJS) as a template to generate $(OBJS_STAT) and $(OBJS_DYN).
-#
-OBJ_DIR    = $(OBJ_BASE)\stat
-OBJS_STAT  = $+ $(OBJS) $-
-
-OBJ_DIR    = $(OBJ_BASE)\dyn
-OBJS_DYN   = $+ $(OBJS) $-
-
-RESOURCE   = $(OBJ_BASE)\dyn\libssh2.res
-
-.c: ..\src
-
-
-all: $(OBJ_BASE) $(TARGETS) .SYMBOLIC
-	@echo Welcome to libssh2
-
-clean: .SYMBOLIC
-	-$(RM) $(OBJS_STAT)
-	-$(RM) $(OBJS_DYN)
-	-$(RM) $(RESOURCE) $(LINK_ARG) $(LIB_ARG)
-
-vclean realclean: clean .SYMBOLIC
-	-$(RM) $(TARGETS) $(LIBNAME).map $(LIBNAME).sym
-	-$(RD) $(OBJ_BASE)\stat
-	-$(RD) $(OBJ_BASE)\dyn
-	-$(RD) $(OBJ_BASE)
-
-$(OBJ_BASE):
-	-$(MD) $^@
-	-$(MD) $^@\stat
-	-$(MD) $^@\dyn
-
-$(LIBNAME).dll: $(OBJS_DYN) $(RESOURCE) $(LINK_ARG)
-	$(LD) name $^@ @$]@
-
-$(LIBNAME).lib: $(OBJS_STAT) $(LIB_ARG)
-	$(AR) -q -b -c $^@ @$]@
-
-.ERASE
-$(RESOURCE): libssh2.rc
-	$(RC) $(DEBUG) -q -r -zm -I..\include $(SYS_INCL) $[@ -fo=$^@
-
-.ERASE
-.c{$(OBJ_BASE)\dyn}.obj:
-	$(CC) $(CFLAGS) -bd -br $[@ -fo=$^@
-
-.ERASE
-.c{$(OBJ_BASE)\stat}.obj:
-	$(CC) $(CFLAGS) $[@ -fo=$^@
-
-$(LINK_ARG): $(__MAKEFILES__)
-	%create $^@
-	@%append $^@ system nt dll
-	@%append $^@ file { $(OBJS_DYN) }
-!ifdef %debug
-	@%append $^@ debug all
-	@%append $^@ option symfile
-!endif
-	@%append $^@ option quiet, map, caseexact, eliminate, implib=$(LIBNAME)_imp.lib,
-	@%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS)
-!ifdef %use_watt32
-	@%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib
-!else
-	@%append $^@ library ws2_32.lib
-!endif
-!ifdef %use_zlib
-	@%append $^@ library '$(ZLIB_ROOT)\zlib.lib'
-!endif
-!ifndef %use_wincng
-	@%append $^@ library '$(OPENSSL_ROOT)\lib\crypt.lib'
-	@%append $^@ library '$(OPENSSL_ROOT)\lib\ssl.lib'
-!endif
-@%append $^@ library bcrypt.lib
-@%append $^@ library crypt32.lib
-
-$(LIB_ARG): $(__MAKEFILES__)
-	%create $^@
-	@for %f in ($(OBJS_STAT)) do @%append $^@ +- %f