nuke old, unused, pre-apache-1.3.24 leftovers

33 files changed, 0 insertions, 5703 deletions

diff --git a/usr.sbin/httpd/conf/access.conf-dist-win b/usr.sbin/httpd/conf/access.conf-dist-win
deleted file mode 100644
index a38b11baced..00000000000
--- a/usr.sbin/httpd/conf/access.conf-dist-win
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is the default file for the AccessConfig directive in httpd.conf.
-# It is processed after httpd.conf and srm.conf.
-#
-# To avoid confusion, it is recommended that you put all of your
-# Apache server directives into the httpd.conf file and leave this
-# one essentially empty.
-#
diff --git a/usr.sbin/httpd/conf/srm.conf-dist-win b/usr.sbin/httpd/conf/srm.conf-dist-win
deleted file mode 100644
index 394b6fa64dd..00000000000
--- a/usr.sbin/httpd/conf/srm.conf-dist-win
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is the default file for the ResourceConfig directive in httpd.conf.
-# It is processed after httpd.conf but before access.conf.
-#
-# To avoid confusion, it is recommended that you put all of your
-# Apache server directives into the httpd.conf file and leave this
-# one essentially empty.
-#
diff --git a/usr.sbin/httpd/src/README.EBCDIC b/usr.sbin/httpd/src/README.EBCDIC
deleted file mode 100644
index 78a5acfaac8..00000000000
--- a/usr.sbin/httpd/src/README.EBCDIC
+++ /dev/null
@@ -1,99 +0,0 @@
-			    README.EBCDIC
-
-This version of Apache comes with a first-cut (working, but not
-fully tested) port to a mainframe machine which uses the EBCDIC
-character set as its native codeset (It is the SIEMENS family 
-of mainframes running the BS2000 operating system. This
-mainframe OS nowadays features a SVR4-like POSIX subsystem).
-
-The port was started initially to
-- prove the feasibility
-- find a "worthy and capable" successor for the CERN daemon (which
-  was ported a couple of years ago), and to
-- prove that Apache's preforking process model can on this platform
-  easily outperform the accept-fork-serve model used by CERN by a
-  factor of 5 or more.
-
-This document serves as a rationale to describe some of the design
-decisions of the port to this machine.
-
-* The relevant changes in the source are #ifdef'ed into two
-  categories:
-  #ifdef CHARSET_EBCDIC     Code which is needed for any EBCDIC
-			    based machine
-  #ifdef _OSD_POSIX         Code which is needed for the BS2000
-			    SIEMENS mainframe platform only.
-
-* The possibility to translate between ASCII and EBCDIC at the
-  socket level (on BS2000 POSIX, there is a socket option which
-  supports this) was intentionally not chosen, because the byte
-  stream at the HTTP protocol level consists of a mixture of
-  protocol related strings and non-protocol related raw file data.
-  HTTP protocol strings are always encoded in ASCII (the GET
-  request, any Header: lines, the chunking information etc.) whereas
-  the file transfer parts (i.e., GIF images, CGI output etc.) should
-  usually be just "passed thru" by the server. This separation
-  between "protocol string" and "raw data" is reflected in the
-  server code by functions like bgets() or rvputs() for strings, and
-  functions like bwrite() for binary data. A global translation of
-  everything would therefore be inadequate.
-  (In the case of text files of course, provisions must be made so
-  that the documents are always served in ASCII format)
-
-* This port therefore features a built-in protocol level conversion
-  for the server-internal strings (which the compiler translated to
-  EBCDIC strings) and server-generated documents. This presumes that
-  hard coded ASCII escapes \012 and \015 will not exist in the server
-  code; rather coders will use the CRLF, CR, and LF macros.
-
-* By examining the call hierarchy for the BUFF management routines,
-  I added an "ebcdic/ascii conversion layer" which would be crossed
-  on every puts/write/get/gets, and a conversion flag which allowed
-  switching of the conversions on-the-fly. So it is now possible to
-  read the header lines of a CGI-script output in EBCDIC format, and
-  then find out that the remainder of the script's output is in
-  ASCII (like in the output of a WWW Counter program). Likewise, the
-  server always generates its header lines in EBCDIC (and with ASCII
-  conversion enabled) and determines, based on the type of document
-  being served, whether the document body (except for the chunking
-  information, of course) is in ASCII already or is converted from
-  EBCDIC.
-
-* For Text documents (MIME types text/plain, text/html etc.), an
-  implicit translation to ASCII can be used, or (if the users prefer
-  to store some documents in raw ASCII form for faster serving) can
-  be served without conversion.
-  Example:
-      to serve files with the suffix .ahtml as a raw ASCII text/html
-      document (and suffix .ascii as ASCII text/plain), use the
-      directives:
-    AddType  text/x-ascii-html  .ahtml
-    AddType  text/x-ascii-plain .ascii
-  Similarly, any text/XXXX MIME type can be served as "raw ASCII" by
-  configuring a MIME type "text/x-ascii-XXXX" for it using AddType.
-
-* Non-text documents are always served "binary" without conversion.
-  This seems to be the most sensible choice for, .e.g., GIF/ZIP/AU
-  file types. This of course requires the user to copy them to the
-  mainframe host using the "rcp -b" binary switch.
-
-* Server parsed files are always assumed to be in native (i.e.,
-  EBCDIC) format as used on the machine, and are converted after
-  processing.
-
-* For CGI output, the CGI script determines whether a conversion is
-  needed or not: by setting the appropriate Content-Type, text files
-  can be converted, or GIF output can be passed through unmodified.
-  An example for the latter case is the wwwcount program which we ported
-  as well.
-
-Notes:
-    To use the mod_auth_db functionality, you will need a working libdb.a.
-On the system where I did the port none was available, so I ported the
-standard db-1.85.14 with little problems. Note however that you will need
-a working perl5 as well if you want to use Apache's dbmmanage script to
-maintain db user databases.
-
-See also the ebcdic.html document which is part of the apache documentation.
-
-			    Martin Kraemer, 1-Oct-1998
diff --git a/usr.sbin/httpd/src/modules/proxy/ApacheModuleProxy.dsp b/usr.sbin/httpd/src/modules/proxy/ApacheModuleProxy.dsp
deleted file mode 100644
index cf0ab0cdbb1..00000000000
--- a/usr.sbin/httpd/src/modules/proxy/ApacheModuleProxy.dsp
+++ /dev/null
@@ -1,131 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleProxy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleProxy - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleProxy.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleProxy.mak" CFG="ApacheModuleProxy - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleProxy - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleProxy - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\ApacheMo"
-# PROP BASE Intermediate_Dir ".\ApacheMo"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"../../os/win32/BaseAddr.ref",mod_proxy
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\ApacheM0"
-# PROP BASE Intermediate_Dir ".\ApacheM0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"../../os/win32/BaseAddr.ref",mod_proxy
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleProxy - Win32 Release"
-# Name "ApacheModuleProxy - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\mod_proxy.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\proxy_cache.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\proxy_connect.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\proxy_ftp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\proxy_http.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\proxy_util.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\mod_proxy.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/modules/proxy/ApacheModuleProxy.mak b/usr.sbin/httpd/src/modules/proxy/ApacheModuleProxy.mak
deleted file mode 100644
index d41a8bf5c09..00000000000
--- a/usr.sbin/httpd/src/modules/proxy/ApacheModuleProxy.mak
+++ /dev/null
@@ -1,462 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleProxy.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleProxy - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleProxy - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleProxy - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleProxy - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleProxy.mak"\
- CFG="ApacheModuleProxy - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleProxy - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleProxy - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleProxy.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleProxy.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_proxy.obj"
-	-@erase "$(INTDIR)\proxy_cache.obj"
-	-@erase "$(INTDIR)\proxy_connect.obj"
-	-@erase "$(INTDIR)\proxy_ftp.obj"
-	-@erase "$(INTDIR)\proxy_http.obj"
-	-@erase "$(INTDIR)\proxy_util.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.dll"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.exp"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.lib"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleProxy.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
- /map:"$(INTDIR)\ApacheModuleProxy.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
- /implib:"$(OUTDIR)\ApacheModuleProxy.lib"\
- /base:@"../../os/win32/BaseAddr.ref",mod_proxy 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_proxy.obj" \
-	"$(INTDIR)\proxy_cache.obj" \
-	"$(INTDIR)\proxy_connect.obj" \
-	"$(INTDIR)\proxy_ftp.obj" \
-	"$(INTDIR)\proxy_http.obj" \
-	"$(INTDIR)\proxy_util.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleProxy.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleProxy.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_proxy.obj"
-	-@erase "$(INTDIR)\proxy_cache.obj"
-	-@erase "$(INTDIR)\proxy_connect.obj"
-	-@erase "$(INTDIR)\proxy_ftp.obj"
-	-@erase "$(INTDIR)\proxy_http.obj"
-	-@erase "$(INTDIR)\proxy_util.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.dll"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.exp"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.lib"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.map"
-	-@erase "$(OUTDIR)\ApacheModuleProxy.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D\
- "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleProxy.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
- /map:"$(INTDIR)\ApacheModuleProxy.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
- /implib:"$(OUTDIR)\ApacheModuleProxy.lib"\
- /base:@"../../os/win32/BaseAddr.ref",mod_proxy 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_proxy.obj" \
-	"$(INTDIR)\proxy_cache.obj" \
-	"$(INTDIR)\proxy_connect.obj" \
-	"$(INTDIR)\proxy_ftp.obj" \
-	"$(INTDIR)\proxy_http.obj" \
-	"$(INTDIR)\proxy_util.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleProxy - Win32 Debug"
-SOURCE=.\mod_proxy.c
-DEP_CPP_MOD_P=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\explain.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\http_request.h"\
-	"..\..\include\http_vhost.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	"..\..\os\win32\os.h"\
-	"..\..\os\win32\readdir.h"\
-	".\mod_proxy.h"\
-	
-NODEP_CPP_MOD_P=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
-
-
-SOURCE=.\proxy_cache.c
-DEP_CPP_PROXY=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_md5.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\explain.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_conf_globals.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_main.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\multithread.h"\
-	"..\..\include\util_date.h"\
-	"..\..\include\util_uri.h"\
-	"..\..\os\win32\os.h"\
-	"..\..\os\win32\readdir.h"\
-	".\mod_proxy.h"\
-	
-NODEP_CPP_PROXY=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
-
-
-SOURCE=.\proxy_connect.c
-DEP_CPP_PROXY_=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\explain.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_main.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	"..\..\os\win32\os.h"\
-	"..\..\os\win32\readdir.h"\
-	".\mod_proxy.h"\
-	
-NODEP_CPP_PROXY_=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
-
-
-SOURCE=.\proxy_ftp.c
-DEP_CPP_PROXY_F=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\explain.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_main.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	"..\..\os\win32\os.h"\
-	"..\..\os\win32\readdir.h"\
-	".\mod_proxy.h"\
-	
-NODEP_CPP_PROXY_F=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
-
-
-SOURCE=.\proxy_http.c
-DEP_CPP_PROXY_H=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\explain.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_main.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_date.h"\
-	"..\..\include\util_uri.h"\
-	"..\..\os\win32\os.h"\
-	"..\..\os\win32\readdir.h"\
-	".\mod_proxy.h"\
-	
-NODEP_CPP_PROXY_H=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
-
-
-SOURCE=.\proxy_util.c
-DEP_CPP_PROXY_U=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_md5.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\explain.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_main.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\multithread.h"\
-	"..\..\include\util_date.h"\
-	"..\..\include\util_uri.h"\
-	"..\..\os\win32\os.h"\
-	"..\..\os\win32\readdir.h"\
-	".\mod_proxy.h"\
-	
-NODEP_CPP_PROXY_U=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\modules\proxy"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\modules\proxy"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\modules\proxy"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\modules\proxy"
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthAnon.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleAuthAnon.dsp
deleted file mode 100644
index eb72bd726f4..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthAnon.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleAuthAnon" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleAuthAnon - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthAnon.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthAnon.mak" CFG="ApacheModuleAuthAnon - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleAuthAnon - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleAuthAnon - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleAuthAnonR"
-# PROP Intermediate_Dir "ApacheModuleAuthAnonR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleAuthAnonD"
-# PROP Intermediate_Dir "ApacheModuleAuthAnonD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleAuthAnon - Win32 Release"
-# Name "ApacheModuleAuthAnon - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_auth_anon.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthAnon.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleAuthAnon.mak
deleted file mode 100644
index e547f0cc3a1..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthAnon.mak
+++ /dev/null
@@ -1,287 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleAuthAnon.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleAuthAnon - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleAuthAnon - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleAuthAnon - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleAuthAnon - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthAnon.mak"\
- CFG="ApacheModuleAuthAnon - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleAuthAnon - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleAuthAnon - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
-
-OUTDIR=.\ApacheModuleAuthAnonR
-INTDIR=.\ApacheModuleAuthAnonR
-# Begin Custom Macros
-OutDir=.\ApacheModuleAuthAnonR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleAuthAnon.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleAuthAnon.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_auth_anon.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.dll"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.exp"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.lib"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleAuthAnonR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleAuthAnon.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb"\
- /map:"$(INTDIR)\ApacheModuleAuthAnon.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\
- /implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib"\
- /base:@"BaseAddr.ref",mod_auth_anon 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_auth_anon.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleAuthAnon.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
-
-OUTDIR=.\ApacheModuleAuthAnonD
-INTDIR=.\ApacheModuleAuthAnonD
-# Begin Custom Macros
-OutDir=.\ApacheModuleAuthAnonD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleAuthAnon.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleAuthAnon.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_auth_anon.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.dll"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.exp"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.lib"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.map"
-	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleAuthAnonD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleAuthAnon.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb"\
- /map:"$(INTDIR)\ApacheModuleAuthAnon.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\
- /implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib"\
- /base:@"BaseAddr.ref",mod_auth_anon 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_auth_anon.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleAuthAnon.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleAuthAnon - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_auth_anon.c
-DEP_CPP_MOD_A=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\http_request.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_A=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDBM.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDBM.dsp
deleted file mode 100644
index 9e7cd9ebc8e..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDBM.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleAuthDBM" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleAuthDBM - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthDBM.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthDBM.mak" CFG="ApacheModuleAuthDBM - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleAuthDBM - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleAuthDBM - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleAuthDBMR"
-# PROP Intermediate_Dir "ApacheModuleAuthDBMR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_auth_dbm
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_auth_dbm
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleAuthDBMD"
-# PROP Intermediate_Dir "ApacheModuleAuthDBMD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_auth_dbm
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_auth_dbm
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleAuthDBM - Win32 Release"
-# Name "ApacheModuleAuthDBM - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_auth_dbm.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDBM.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDBM.mak
deleted file mode 100644
index 2b9c4b5a094..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDBM.mak
+++ /dev/null
@@ -1,317 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleAuthDBM.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleAuthDBM - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleAuthDBM - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleAuthDBM - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleAuthDBM - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthDBM.mak"\
- CFG="ApacheModuleAuthDBM - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleAuthDBM - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleAuthDBM - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
-
-OUTDIR=.\ApacheModuleAuthDBMR
-INTDIR=.\ApacheModuleAuthDBMR
-# Begin Custom Macros
-OutDir=.\ApacheModuleAuthDBMR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleAuthDBM.dll"
-
-!ELSE 
-
-ALL : "sdbm - Win32 Release" "ApacheCore - Win32 Release"\
- "$(OUTDIR)\ApacheModuleAuthDBM.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" "sdbm - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_auth_dbm.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.dll"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.exp"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.lib"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I\
- "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleAuthDBMR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleAuthDBM.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleAuthDBM.pdb"\
- /map:"$(INTDIR)\ApacheModuleAuthDBM.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleAuthDBM.dll"\
- /implib:"$(OUTDIR)\ApacheModuleAuthDBM.lib" /base:@"BaseAddr.ref",mod_auth_dbm 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_auth_dbm.obj" \
-	"..\..\CoreR\ApacheCore.lib" \
-	"..\..\lib\sdbm\Release\sdbm.lib"
-
-"$(OUTDIR)\ApacheModuleAuthDBM.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
-
-OUTDIR=.\ApacheModuleAuthDBMD
-INTDIR=.\ApacheModuleAuthDBMD
-# Begin Custom Macros
-OutDir=.\ApacheModuleAuthDBMD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleAuthDBM.dll"
-
-!ELSE 
-
-ALL : "sdbm - Win32 Debug" "ApacheCore - Win32 Debug"\
- "$(OUTDIR)\ApacheModuleAuthDBM.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" "sdbm - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_auth_dbm.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.dll"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.exp"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.lib"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.map"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
- "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleAuthDBMD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleAuthDBM.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleAuthDBM.pdb"\
- /map:"$(INTDIR)\ApacheModuleAuthDBM.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleAuthDBM.dll"\
- /implib:"$(OUTDIR)\ApacheModuleAuthDBM.lib" /base:@"BaseAddr.ref",mod_auth_dbm 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_auth_dbm.obj" \
-	"..\..\CoreD\ApacheCore.lib" \
-	"..\..\lib\sdbm\Debug\sdbm.lib"
-
-"$(OUTDIR)\ApacheModuleAuthDBM.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleAuthDBM - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
-
-"sdbm - Win32 Release" : 
-   cd "\apache\apache-1.3\src\lib\sdbm"
-   $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Release" 
-   cd "..\..\os\win32"
-
-"sdbm - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src\lib\sdbm"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Release"\
- RECURSE=1 
-   cd "..\..\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
-
-"sdbm - Win32 Debug" : 
-   cd "\apache\apache-1.3\src\lib\sdbm"
-   $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Debug" 
-   cd "..\..\os\win32"
-
-"sdbm - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src\lib\sdbm"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Debug"\
- RECURSE=1 
-   cd "..\..\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_auth_dbm.c
-DEP_CPP_MOD_A=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	"..\..\lib\sdbm\sdbm.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_A=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDigest.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDigest.dsp
deleted file mode 100644
index 5f93720a70d..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDigest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleAuthDigest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleAuthDigest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthDigest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthDigest.mak" CFG="ApacheModuleAuthDigest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleAuthDigest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleAuthDigest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleAuthDigestR"
-# PROP Intermediate_Dir "ApacheModuleAuthDigestR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_auth_digest
-# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_auth_digest
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleAuthDigestD"
-# PROP Intermediate_Dir "ApacheModuleAuthDigestD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /base:@"BaseAddr.ref",mod_auth_digest
-# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /pdbtype:sept /base:@"BaseAddr.ref",mod_auth_digest
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleAuthDigest - Win32 Release"
-# Name "ApacheModuleAuthDigest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\experimental\mod_auth_digest.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDigest.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDigest.mak
deleted file mode 100644
index d6060e7e80b..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleAuthDigest.mak
+++ /dev/null
@@ -1,292 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleAuthDigest.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleAuthDigest - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ApacheModuleAuthDigest -\
- Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleAuthDigest - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleAuthDigest - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleAuthDigest.mak"\
- CFG="ApacheModuleAuthDigest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleAuthDigest - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleAuthDigest - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
-
-OUTDIR=.\ApacheModuleAuthDigestR
-INTDIR=.\ApacheModuleAuthDigestR
-# Begin Custom Macros
-OutDir=.\ApacheModuleAuthDigestR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleAuthDigest.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleAuthDigest.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_auth_digest.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.dll"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.exp"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.lib"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleAuthDigestR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleAuthDigest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthDigest.pdb"\
- /map:"$(INTDIR)\ApacheModuleAuthDigest.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleAuthDigest.dll"\
- /implib:"$(OUTDIR)\ApacheModuleAuthDigest.lib"\
- /base:@"BaseAddr.ref",mod_auth_digest 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_auth_digest.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleAuthDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
-
-OUTDIR=.\ApacheModuleAuthDigestD
-INTDIR=.\ApacheModuleAuthDigestD
-# Begin Custom Macros
-OutDir=.\ApacheModuleAuthDigestD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleAuthDigest.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleAuthDigest.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_auth_digest.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.dll"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.exp"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.lib"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.map"
-	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleAuthDigestD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleAuthDigest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthDigest.pdb"\
- /map:"$(INTDIR)\ApacheModuleAuthDigest.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleAuthDigest.dll"\
- /implib:"$(OUTDIR)\ApacheModuleAuthDigest.lib" /pdbtype:sept\
- /base:@"BaseAddr.ref",mod_auth_digest 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_auth_digest.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleAuthDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleAuthDigest - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\experimental\mod_auth_digest.c
-DEP_CPP_MOD_A=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_md5.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\ap_sha1.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_conf_globals.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\http_request.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_md5.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_A=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	"..\..\modules\experimental\mm.h"\
-	
-
-"$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleCERNMeta.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleCERNMeta.dsp
deleted file mode 100644
index 305104b575f..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleCERNMeta.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleCERNMeta" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleCERNMeta - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleCERNMeta.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleCERNMeta.mak" CFG="ApacheModuleCERNMeta - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleCERNMeta - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleCERNMeta - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleCERNMetaR"
-# PROP Intermediate_Dir "ApacheModuleCERNMetaR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
-
-!ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleCERNMetaD"
-# PROP Intermediate_Dir "ApacheModuleCERNMetaD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleCERNMeta - Win32 Release"
-# Name "ApacheModuleCERNMeta - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_cern_meta.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleCERNMeta.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleCERNMeta.mak
deleted file mode 100644
index ac301da141f..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleCERNMeta.mak
+++ /dev/null
@@ -1,286 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleCERNMeta.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleCERNMeta - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleCERNMeta - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleCERNMeta - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleCERNMeta - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleCERNMeta.mak"\
- CFG="ApacheModuleCERNMeta - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleCERNMeta - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleCERNMeta - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
-
-OUTDIR=.\ApacheModuleCERNMetaR
-INTDIR=.\ApacheModuleCERNMetaR
-# Begin Custom Macros
-OutDir=.\ApacheModuleCERNMetaR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleCERNMeta.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleCERNMeta.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_cern_meta.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.dll"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.exp"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.lib"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleCERNMetaR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleCERNMeta.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb"\
- /map:"$(INTDIR)\ApacheModuleCERNMeta.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\
- /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib"\
- /base:@"BaseAddr.ref",mod_cern_meta 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_cern_meta.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleCERNMeta.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
-
-OUTDIR=.\ApacheModuleCERNMetaD
-INTDIR=.\ApacheModuleCERNMetaD
-# Begin Custom Macros
-OutDir=.\ApacheModuleCERNMetaD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleCERNMeta.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleCERNMeta.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_cern_meta.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.dll"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.exp"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.lib"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.map"
-	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleCERNMetaD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleCERNMeta.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb"\
- /map:"$(INTDIR)\ApacheModuleCERNMeta.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\
- /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib"\
- /base:@"BaseAddr.ref",mod_cern_meta 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_cern_meta.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleCERNMeta.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleCERNMeta - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_cern_meta.c
-DEP_CPP_MOD_C=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_request.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_script.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_C=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleDigest.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleDigest.dsp
deleted file mode 100644
index 103830e657e..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleDigest.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleDigest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleDigest - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleDigest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleDigest.mak" CFG="ApacheModuleDigest - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleDigest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleDigest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleDigestR"
-# PROP Intermediate_Dir "ApacheModuleDigestR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_digest
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_digest
-
-!ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleDigestD"
-# PROP Intermediate_Dir "ApacheModuleDigestD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_digest
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_digest
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleDigest - Win32 Release"
-# Name "ApacheModuleDigest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_digest.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleDigest.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleDigest.mak
deleted file mode 100644
index 45f988595c4..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleDigest.mak
+++ /dev/null
@@ -1,284 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleDigest.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleDigest - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleDigest - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleDigest - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleDigest - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleDigest.mak"\
- CFG="ApacheModuleDigest - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleDigest - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleDigest - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
-
-OUTDIR=.\ApacheModuleDigestR
-INTDIR=.\ApacheModuleDigestR
-# Begin Custom Macros
-OutDir=.\ApacheModuleDigestR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleDigest.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleDigest.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_digest.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.dll"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.exp"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.lib"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleDigestR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleDigest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /map:"$(INTDIR)\ApacheModuleDigest.map"\
- /machine:I386 /out:"$(OUTDIR)\ApacheModuleDigest.dll"\
- /implib:"$(OUTDIR)\ApacheModuleDigest.lib" /base:@"BaseAddr.ref",mod_digest 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_digest.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
-
-OUTDIR=.\ApacheModuleDigestD
-INTDIR=.\ApacheModuleDigestD
-# Begin Custom Macros
-OutDir=.\ApacheModuleDigestD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleDigest.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleDigest.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_digest.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.dll"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.exp"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.lib"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.map"
-	-@erase "$(OUTDIR)\ApacheModuleDigest.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleDigestD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleDigest.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /map:"$(INTDIR)\ApacheModuleDigest.map"\
- /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleDigest.dll"\
- /implib:"$(OUTDIR)\ApacheModuleDigest.lib" /base:@"BaseAddr.ref",mod_digest 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_digest.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleDigest - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_digest.c
-DEP_CPP_MOD_D=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_md5.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_md5.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_D=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleExpires.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleExpires.dsp
deleted file mode 100644
index 0a484973691..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleExpires.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleExpires" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleExpires - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleExpires.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleExpires.mak" CFG="ApacheModuleExpires - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleExpires - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleExpires - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleExpiresR"
-# PROP Intermediate_Dir "ApacheModuleExpiresR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_expires
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_expires
-
-!ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleExpiresD"
-# PROP Intermediate_Dir "ApacheModuleExpiresD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_expires
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_expires
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleExpires - Win32 Release"
-# Name "ApacheModuleExpires - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_expires.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleExpires.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleExpires.mak
deleted file mode 100644
index 751f01c69b9..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleExpires.mak
+++ /dev/null
@@ -1,282 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleExpires.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleExpires - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleExpires - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleExpires - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleExpires - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleExpires.mak"\
- CFG="ApacheModuleExpires - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleExpires - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleExpires - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
-
-OUTDIR=.\ApacheModuleExpiresR
-INTDIR=.\ApacheModuleExpiresR
-# Begin Custom Macros
-OutDir=.\ApacheModuleExpiresR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleExpires.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleExpires.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_expires.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.dll"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.exp"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.lib"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleExpiresR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleExpires.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb"\
- /map:"$(INTDIR)\ApacheModuleExpires.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleExpires.dll"\
- /implib:"$(OUTDIR)\ApacheModuleExpires.lib" /base:@"BaseAddr.ref",mod_expires 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_expires.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleExpires.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
-
-OUTDIR=.\ApacheModuleExpiresD
-INTDIR=.\ApacheModuleExpiresD
-# Begin Custom Macros
-OutDir=.\ApacheModuleExpiresD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleExpires.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleExpires.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_expires.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.dll"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.exp"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.lib"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.map"
-	-@erase "$(OUTDIR)\ApacheModuleExpires.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleExpiresD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleExpires.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb"\
- /map:"$(INTDIR)\ApacheModuleExpires.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleExpires.dll"\
- /implib:"$(OUTDIR)\ApacheModuleExpires.lib" /base:@"BaseAddr.ref",mod_expires 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_expires.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleExpires.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleExpires - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_expires.c
-DEP_CPP_MOD_E=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_E=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleHeaders.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleHeaders.dsp
deleted file mode 100644
index b638d2021c8..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleHeaders.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleHeaders" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleHeaders - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleHeaders.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleHeaders.mak" CFG="ApacheModuleHeaders - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleHeaders - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleHeaders - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleHeadersR"
-# PROP Intermediate_Dir "ApacheModuleHeadersR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_headers
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_headers
-
-!ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleHeadersD"
-# PROP Intermediate_Dir "ApacheModuleHeadersD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_headers
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_headers
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleHeaders - Win32 Release"
-# Name "ApacheModuleHeaders - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_headers.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleHeaders.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleHeaders.mak
deleted file mode 100644
index 51df954bf8a..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleHeaders.mak
+++ /dev/null
@@ -1,281 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleHeaders.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleHeaders - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleHeaders - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleHeaders - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleHeaders - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleHeaders.mak"\
- CFG="ApacheModuleHeaders - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleHeaders - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleHeaders - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
-
-OUTDIR=.\ApacheModuleHeadersR
-INTDIR=.\ApacheModuleHeadersR
-# Begin Custom Macros
-OutDir=.\ApacheModuleHeadersR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleHeaders.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleHeaders.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_headers.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.dll"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.exp"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.lib"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleHeadersR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleHeaders.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb"\
- /map:"$(INTDIR)\ApacheModuleHeaders.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\
- /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" /base:@"BaseAddr.ref",mod_headers 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_headers.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleHeaders.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
-
-OUTDIR=.\ApacheModuleHeadersD
-INTDIR=.\ApacheModuleHeadersD
-# Begin Custom Macros
-OutDir=.\ApacheModuleHeadersD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleHeaders.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleHeaders.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_headers.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.dll"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.exp"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.lib"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.map"
-	-@erase "$(OUTDIR)\ApacheModuleHeaders.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleHeadersD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleHeaders.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb"\
- /map:"$(INTDIR)\ApacheModuleHeaders.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\
- /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" /base:@"BaseAddr.ref",mod_headers 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_headers.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleHeaders.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleHeaders - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_headers.c
-DEP_CPP_MOD_H=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_H=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleInfo.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleInfo.dsp
deleted file mode 100644
index 8d37fef03e0..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleInfo.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleInfo" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleInfo - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleInfo.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleInfo.mak" CFG="ApacheModuleInfo - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleInfo - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleInfo - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleInfoR"
-# PROP Intermediate_Dir "ApacheModuleInfoR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_info
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_info
-
-!ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleInfoD"
-# PROP Intermediate_Dir "ApacheModuleInfoD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_info
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_info
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleInfo - Win32 Release"
-# Name "ApacheModuleInfo - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_info.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleInfo.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleInfo.mak
deleted file mode 100644
index 2dc83479305..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleInfo.mak
+++ /dev/null
@@ -1,284 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleInfo.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleInfo - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleInfo - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleInfo - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleInfo - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleInfo.mak" CFG="ApacheModuleInfo - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleInfo - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleInfo - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
-
-OUTDIR=.\ApacheModuleInfoR
-INTDIR=.\ApacheModuleInfoR
-# Begin Custom Macros
-OutDir=.\ApacheModuleInfoR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleInfo.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleInfo.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_info.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.dll"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.exp"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.lib"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleInfoR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleInfo.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /map:"$(INTDIR)\ApacheModuleInfo.map"\
- /machine:I386 /out:"$(OUTDIR)\ApacheModuleInfo.dll"\
- /implib:"$(OUTDIR)\ApacheModuleInfo.lib" /base:@"BaseAddr.ref",mod_info 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_info.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleInfo.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
-
-OUTDIR=.\ApacheModuleInfoD
-INTDIR=.\ApacheModuleInfoD
-# Begin Custom Macros
-OutDir=.\ApacheModuleInfoD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleInfo.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleInfo.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_info.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.dll"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.exp"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.lib"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.map"
-	-@erase "$(OUTDIR)\ApacheModuleInfo.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleInfoD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleInfo.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /map:"$(INTDIR)\ApacheModuleInfo.map"\
- /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleInfo.dll"\
- /implib:"$(OUTDIR)\ApacheModuleInfo.lib" /base:@"BaseAddr.ref",mod_info 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_info.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleInfo.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleInfo - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleInfo - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_info.c
-DEP_CPP_MOD_I=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_conf_globals.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_main.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_script.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_I=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleRewrite.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleRewrite.dsp
deleted file mode 100644
index dae3c6434a9..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleRewrite.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleRewrite" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleRewrite - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleRewrite.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleRewrite.mak" CFG="ApacheModuleRewrite - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleRewrite - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleRewrite - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleRewriteR"
-# PROP Intermediate_Dir "ApacheModuleRewriteR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
-
-!ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleRewriteD"
-# PROP Intermediate_Dir "ApacheModuleRewriteD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleRewrite - Win32 Release"
-# Name "ApacheModuleRewrite - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_rewrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\passwd.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleRewrite.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleRewrite.mak
deleted file mode 100644
index 1484f6a88f7..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleRewrite.mak
+++ /dev/null
@@ -1,300 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleRewrite.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleRewrite - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleRewrite - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleRewrite - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleRewrite - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleRewrite.mak"\
- CFG="ApacheModuleRewrite - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleRewrite - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleRewrite - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
-
-OUTDIR=.\ApacheModuleRewriteR
-INTDIR=.\ApacheModuleRewriteR
-# Begin Custom Macros
-OutDir=.\ApacheModuleRewriteR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleRewrite.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleRewrite.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_rewrite.obj"
-	-@erase "$(INTDIR)\passwd.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.dll"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.exp"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.lib"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\
- "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleRewriteR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleRewrite.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb"\
- /map:"$(INTDIR)\ApacheModuleRewrite.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
- /implib:"$(OUTDIR)\ApacheModuleRewrite.lib" /base:@"BaseAddr.ref",mod_rewrite 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_rewrite.obj" \
-	"$(INTDIR)\passwd.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleRewrite.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
-
-OUTDIR=.\ApacheModuleRewriteD
-INTDIR=.\ApacheModuleRewriteD
-# Begin Custom Macros
-OutDir=.\ApacheModuleRewriteD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleRewrite.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleRewrite.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_rewrite.obj"
-	-@erase "$(INTDIR)\passwd.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.dll"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.exp"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.lib"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.map"
-	-@erase "$(OUTDIR)\ApacheModuleRewrite.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D\
- "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
- /c 
-CPP_OBJS=.\ApacheModuleRewriteD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleRewrite.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb"\
- /map:"$(INTDIR)\ApacheModuleRewrite.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
- /implib:"$(OUTDIR)\ApacheModuleRewrite.lib" /base:@"BaseAddr.ref",mod_rewrite 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_rewrite.obj" \
-	"$(INTDIR)\passwd.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleRewrite.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleRewrite - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_rewrite.c
-DEP_CPP_MOD_R=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_conf_globals.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_request.h"\
-	"..\..\include\http_vhost.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	"..\..\modules\standard\mod_rewrite.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_R=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\passwd.c
-DEP_CPP_PASSW=\
-	".\passwd.h"\
-	
-
-"$(INTDIR)\passwd.obj" : $(SOURCE) $(DEP_CPP_PASSW) "$(INTDIR)"
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleSpeling.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleSpeling.dsp
deleted file mode 100644
index 7ac3b269340..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleSpeling.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleSpeling" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleSpeling - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleSpeling.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleSpeling.mak" CFG="ApacheModuleSpeling - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleSpeling - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleSpeling - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleSpelingR"
-# PROP Intermediate_Dir "ApacheModuleSpelingR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_speling
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_speling
-
-!ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleSpelingD"
-# PROP Intermediate_Dir "ApacheModuleSpelingD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_speling
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_speling
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleSpeling - Win32 Release"
-# Name "ApacheModuleSpeling - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_speling.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleSpeling.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleSpeling.mak
deleted file mode 100644
index 9c391bc9265..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleSpeling.mak
+++ /dev/null
@@ -1,283 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleSpeling.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleSpeling - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleSpeling - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleSpeling - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleSpeling - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleSpeling.mak"\
- CFG="ApacheModuleSpeling - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleSpeling - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleSpeling - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
-
-OUTDIR=.\ApacheModuleSpelingR
-INTDIR=.\ApacheModuleSpelingR
-# Begin Custom Macros
-OutDir=.\ApacheModuleSpelingR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleSpeling.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleSpeling.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_speling.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.dll"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.exp"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.lib"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleSpelingR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleSpeling.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb"\
- /map:"$(INTDIR)\ApacheModuleSpeling.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleSpeling.dll"\
- /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" /base:@"BaseAddr.ref",mod_speling 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_speling.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleSpeling.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
-
-OUTDIR=.\ApacheModuleSpelingD
-INTDIR=.\ApacheModuleSpelingD
-# Begin Custom Macros
-OutDir=.\ApacheModuleSpelingD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleSpeling.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleSpeling.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_speling.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.dll"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.exp"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.lib"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.map"
-	-@erase "$(OUTDIR)\ApacheModuleSpeling.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleSpelingD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleSpeling.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb"\
- /map:"$(INTDIR)\ApacheModuleSpeling.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleSpeling.dll"\
- /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" /base:@"BaseAddr.ref",mod_speling 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_speling.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleSpeling.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleSpeling - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_speling.c
-DEP_CPP_MOD_S=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_S=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleStatus.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleStatus.dsp
deleted file mode 100644
index 77db64de09b..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleStatus.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleStatus" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleStatus - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleStatus.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleStatus.mak" CFG="ApacheModuleStatus - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleStatus - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleStatus - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleStatusR"
-# PROP Intermediate_Dir "ApacheModuleStatusR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_status
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_status
-
-!ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleStatusD"
-# PROP Intermediate_Dir "ApacheModuleStatusD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_status
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_status
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleStatus - Win32 Release"
-# Name "ApacheModuleStatus - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_status.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleStatus.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleStatus.mak
deleted file mode 100644
index 0236dd6240d..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleStatus.mak
+++ /dev/null
@@ -1,286 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleStatus.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleStatus - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleStatus - Win32\
- Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleStatus - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleStatus - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleStatus.mak"\
- CFG="ApacheModuleStatus - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleStatus - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleStatus - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
-
-OUTDIR=.\ApacheModuleStatusR
-INTDIR=.\ApacheModuleStatusR
-# Begin Custom Macros
-OutDir=.\ApacheModuleStatusR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleStatus.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleStatus.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_status.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.dll"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.exp"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.lib"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleStatusR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /map:"$(INTDIR)\ApacheModuleStatus.map"\
- /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
- /implib:"$(OUTDIR)\ApacheModuleStatus.lib" /base:@"BaseAddr.ref",mod_status 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_status.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
-
-OUTDIR=.\ApacheModuleStatusD
-INTDIR=.\ApacheModuleStatusD
-# Begin Custom Macros
-OutDir=.\ApacheModuleStatusD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleStatus.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleStatus.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_status.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.dll"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.exp"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.lib"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.map"
-	-@erase "$(OUTDIR)\ApacheModuleStatus.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleStatusD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /map:"$(INTDIR)\ApacheModuleStatus.map"\
- /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
- /implib:"$(OUTDIR)\ApacheModuleStatus.lib" /base:@"BaseAddr.ref",mod_status 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_status.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleStatus - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_status.c
-DEP_CPP_MOD_S=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_conf_globals.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\http_log.h"\
-	"..\..\include\http_main.h"\
-	"..\..\include\http_protocol.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\scoreboard.h"\
-	"..\..\include\util_script.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_S=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleUserTrack.dsp b/usr.sbin/httpd/src/os/win32/ApacheModuleUserTrack.dsp
deleted file mode 100644
index ac1e0fbee12..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleUserTrack.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ApacheModuleUserTrack" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ApacheModuleUserTrack - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleUserTrack.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleUserTrack.mak" CFG="ApacheModuleUserTrack - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleUserTrack - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleUserTrack - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleUserTrackR"
-# PROP Intermediate_Dir "ApacheModuleUserTrackR"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
-
-!ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleUserTrackD"
-# PROP Intermediate_Dir "ApacheModuleUserTrackD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ApacheModuleUserTrack - Win32 Release"
-# Name "ApacheModuleUserTrack - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\modules\standard\mod_usertrack.c
-# End Source File
-# End Target
-# End Project
diff --git a/usr.sbin/httpd/src/os/win32/ApacheModuleUserTrack.mak b/usr.sbin/httpd/src/os/win32/ApacheModuleUserTrack.mak
deleted file mode 100644
index 59a357f65d1..00000000000
--- a/usr.sbin/httpd/src/os/win32/ApacheModuleUserTrack.mak
+++ /dev/null
@@ -1,284 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleUserTrack.dsp
-!IF "$(CFG)" == ""
-CFG=ApacheModuleUserTrack - Win32 Release
-!MESSAGE No configuration specified. Defaulting to ApacheModuleUserTrack -\
- Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "ApacheModuleUserTrack - Win32 Release" && "$(CFG)" !=\
- "ApacheModuleUserTrack - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ApacheModuleUserTrack.mak"\
- CFG="ApacheModuleUserTrack - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ApacheModuleUserTrack - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ApacheModuleUserTrack - Win32 Debug" (based on\
- "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
-
-OUTDIR=.\ApacheModuleUserTrackR
-INTDIR=.\ApacheModuleUserTrackR
-# Begin Custom Macros
-OutDir=.\ApacheModuleUserTrackR
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleUserTrack.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Release" "$(OUTDIR)\ApacheModuleUserTrack.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_usertrack.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.dll"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.exp"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.lib"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.map"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
- "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleUserTrackR/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleUserTrack.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb"\
- /map:"$(INTDIR)\ApacheModuleUserTrack.map" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\
- /implib:"$(OUTDIR)\ApacheModuleUserTrack.lib"\
- /base:@"BaseAddr.ref",mod_usertrack 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_usertrack.obj" \
-	"..\..\CoreR\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleUserTrack.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
-
-OUTDIR=.\ApacheModuleUserTrackD
-INTDIR=.\ApacheModuleUserTrackD
-# Begin Custom Macros
-OutDir=.\ApacheModuleUserTrackD
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\ApacheModuleUserTrack.dll"
-
-!ELSE 
-
-ALL : "ApacheCore - Win32 Debug" "$(OUTDIR)\ApacheModuleUserTrack.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"ApacheCore - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\mod_usertrack.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.dll"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.exp"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.lib"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.map"
-	-@erase "$(OUTDIR)\ApacheModuleUserTrack.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
- "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\ApacheModuleUserTrackD/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleUserTrack.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb"\
- /map:"$(INTDIR)\ApacheModuleUserTrack.map" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\
- /implib:"$(OUTDIR)\ApacheModuleUserTrack.lib"\
- /base:@"BaseAddr.ref",mod_usertrack 
-LINK32_OBJS= \
-	"$(INTDIR)\mod_usertrack.obj" \
-	"..\..\CoreD\ApacheCore.lib"
-
-"$(OUTDIR)\ApacheModuleUserTrack.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" || "$(CFG)" ==\
- "ApacheModuleUserTrack - Win32 Debug"
-
-!IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
-
-"ApacheCore - Win32 Release" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
- 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 ReleaseCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Release" RECURSE=1 
-   cd ".\os\win32"
-
-!ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
-
-"ApacheCore - Win32 Debug" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
-   cd ".\os\win32"
-
-"ApacheCore - Win32 DebugCLEAN" : 
-   cd "\apache\apache-1.3\src"
-   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
- CFG="ApacheCore - Win32 Debug" RECURSE=1 
-   cd ".\os\win32"
-
-!ENDIF 
-
-SOURCE=..\..\modules\standard\mod_usertrack.c
-DEP_CPP_MOD_U=\
-	"..\..\include\ap.h"\
-	"..\..\include\ap_alloc.h"\
-	"..\..\include\ap_config.h"\
-	"..\..\include\ap_ctype.h"\
-	"..\..\include\ap_mmn.h"\
-	"..\..\include\buff.h"\
-	"..\..\include\hsregex.h"\
-	"..\..\include\http_config.h"\
-	"..\..\include\http_core.h"\
-	"..\..\include\httpd.h"\
-	"..\..\include\util_uri.h"\
-	".\os.h"\
-	".\readdir.h"\
-	
-NODEP_CPP_MOD_U=\
-	"..\..\include\ap_config_auto.h"\
-	"..\..\include\ebcdic.h"\
-	"..\..\include\sfio.h"\
-	
-
-"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/usr.sbin/httpd/src/os/win32/MakeModuleMak.mak b/usr.sbin/httpd/src/os/win32/MakeModuleMak.mak
deleted file mode 100644
index 455434f30f2..00000000000
--- a/usr.sbin/httpd/src/os/win32/MakeModuleMak.mak
+++ /dev/null
@@ -1,195 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-!IF "$(CFG)" == ""
-CFG=MakeModuleMak - Win32 Debug
-!MESSAGE No configuration specified.  Defaulting to MakeModuleMak - Win32\
- Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "MakeModuleMak - Win32 Release" && "$(CFG)" !=\
- "MakeModuleMak - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "MakeModuleMak.mak" CFG="MakeModuleMak - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "MakeModuleMak - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "MakeModuleMak - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-################################################################################
-# Begin Project
-RSC=rc.exe
-CPP=bcc32.exe
-
-!IF  "$(CFG)" == "MakeModuleMak - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : "$(OUTDIR)\MakeModuleMak.exe"
-
-CLEAN : 
-	-@erase "$(INTDIR)\MakeModuleMak.obj"
-	-@erase "$(OUTDIR)\MakeModuleMak.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=-s /ML -w-8057 -w-8008 -w-8066 /O2 -D"WIN32" -D"NDEBUG" -D"_CONSOLE"\
- /Fp"$(INTDIR)/MakeModuleMak.pch" /YX -o"$(INTDIR)/$&.obj" /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/MakeModuleMak.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)/MakeModuleMak.pdb" /machine:I386\
- /out:"$(OUTDIR)/MakeModuleMak.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\MakeModuleMak.obj"
-
-"$(OUTDIR)\MakeModuleMak.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "MakeModuleMak - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : "$(OUTDIR)\MakeModuleMak.exe"
-
-CLEAN : 
-	-@erase "$(INTDIR)\MakeModuleMak.obj"
-	-@erase "$(INTDIR)\vc40.idb"
-	-@erase "$(INTDIR)\vc40.pdb"
-	-@erase "$(OUTDIR)\MakeModuleMak.exe"
-	-@erase "$(OUTDIR)\MakeModuleMak.ilk"
-	-@erase "$(OUTDIR)\MakeModuleMak.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=-s /MLd -w-8057 -w-8008 -w-8066 /Gm -v /Od -D"WIN32" -D"_DEBUG" -D"_CONSOLE"\
- /Fp"$(INTDIR)/MakeModuleMak.pch" /YX -o"$(INTDIR)/$&.obj" /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/MakeModuleMak.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)/MakeModuleMak.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)/MakeModuleMak.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\MakeModuleMak.obj"
-
-"$(OUTDIR)\MakeModuleMak.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-################################################################################
-# Begin Target
-
-# Name "MakeModuleMak - Win32 Release"
-# Name "MakeModuleMak - Win32 Debug"
-
-!IF  "$(CFG)" == "MakeModuleMak - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "MakeModuleMak - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Source File
-
-SOURCE_1=.\MakeModuleMak.cpp
-
-"$(INTDIR)\MakeModuleMak.obj" : $(SOURCE_0) "$(INTDIR)"
-
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/usr.sbin/httpd/src/os/win32/mod_dll.c b/usr.sbin/httpd/src/os/win32/mod_dll.c
deleted file mode 100644
index 72bbba1ea9b..00000000000
--- a/usr.sbin/httpd/src/os/win32/mod_dll.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
- * on public domain software written at the National Center for
- * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
- * project, please see <http://www.apache.org/>.
- *
- */
-
-/*
- * mod_dll.c - DLL module loader for Windows
- * by Alexei Kosut, based on mod_dld.c by rst
- *
- * This module loads another module into the server that has been
- * compiled as a DLL. It doesn't work perfectly, but well enough.
- *
- * To use, compile the module into a DLL. Then add the following to the
- * server's config file (before any directives belonging to the loaded module):
- *
- * LoadModule module_name mod_name.dll
- *
- * module_name should be the name of the module (e.g. includes_module),
- * and mod_name.dll should be the name of the DLL, relative to the server
- * root.
- *
- * There is also a directive that will load a non-module DLL, if you'd
- * like to load additional libraries into the server:
- *
- * LoadFile filename.dll
- *
- * Compiling a module as a DLL (using Microsoft Visual C++):
- *
- * 1. Add the following to the module source file's module record
- *    definition: MODULE_VAR_EXPORT. i.e. if you have
- *    "module foo_module;", replace it with
- *    "module MODULE_VAR_EXPORT foo_module;". If your module is to be
- *    compiled with both Windows and Unix, you may wish to use an #ifdef
- *    WIN32
- *
- *    Note that your module should still work just fine compiled-in
- *    with this code bit there. It only activates when using the module
- *    as a DLL.
- *
- * 2. Create a DLL file with just the module source file (and any associated
- *    files). Be sure to link it against the ApacheCore.lib created when
- *    compiling ApacheCore.dll. You may also have to tweak the settings to
- *    find all of the Apache includes files correctly. After creating the
- *    DLL, follow the above instructions to load it into Apache.
- */
-
-#include "httpd.h"
-#include "http_config.h"
-
-/*
- * The hard part of implementing LoadModule is deciding what to do about
- * rereading the config files.  This proof-of-concept implementation takes the 
- * cheap way out:  we only actually load the modules the first time through.
- */
-
-static int been_there_done_that = 0; /* Loaded the modules yet? */
-static int have_symbol_table = 0;
-
-char *load_module (cmd_parms *cmd, void *dummy, char *modname, char *filename)
-{
-    HINSTANCE modhandle;
-    module *modp;
-    const char *szModuleFile=ap_server_root_relative(cmd->pool, filename);
-
-    if (been_there_done_that) return NULL;
-    
-    if (!(modhandle = LoadLibraryEx(szModuleFile, NULL,
-				    LOAD_WITH_ALTERED_SEARCH_PATH)))
-	return ap_pstrcat (cmd->pool, "Cannot load ", szModuleFile, " into server",
-			NULL);
- 
-    /* If I knew what the correct cast is here, I'd be happy. But 
-     * I don't. So I'll use (void *). It works.
-     */
-    if (!(modp = (module *)(GetProcAddress (modhandle, modname)))) {
-	return ap_pstrcat (cmd->pool, "Can't find module ", modname,
-			" in file ", filename, NULL);
-    }
-	
-    ap_add_module (modp);
-
-    /* Alethea Patch (rws,djw2) - need to run configuration functions
-       in new modules */
-
-    if (modp->create_server_config)
-      ((void**)cmd->server->module_config)[modp->module_index]=
-	(*modp->create_server_config)(cmd->pool, cmd->server);
-
-    if (modp->create_dir_config)
-      ((void**)cmd->server->lookup_defaults)[modp->module_index]=
-	(*modp->create_dir_config)(cmd->pool, NULL);
-
-
-    return NULL;
-}
-
-char *load_file (cmd_parms *cmd, void *dummy, char *filename)
-{
-   if (been_there_done_that) return NULL;
-    
-	if (!LoadLibrary(ap_server_root_relative(cmd->pool, filename)))
-		return ap_pstrcat (cmd->pool, "Cannot load ", filename, " into server", NULL);
- 
-	return NULL;
-}
-
-void check_loaded_modules (server_rec *dummy, pool *p)
-{
-    if (been_there_done_that) return;
-
-    been_there_done_that = 1;
-}
-
-command_rec dll_cmds[] = {
-{ "LoadModule", load_module, NULL, RSRC_CONF, TAKE2,
-  "a module name, and the name of a file to load it from"},
-{ "LoadFile", load_file, NULL, RSRC_CONF, ITERATE,
-  "files or libraries to link into the server at runtime"},
-{ NULL }
-};
-
-module dll_module = {
-   STANDARD_MODULE_STUFF,
-   check_loaded_modules,	/* initializer */
-   NULL,			/* create per-dir config */
-   NULL,			/* merge per-dir config */
-   NULL,			/* server config */
-   NULL,			/* merge server config */
-   dll_cmds,			/* command table */
-   NULL,			/* handlers */
-   NULL,			/* filename translation */
-   NULL,			/* check_user_id */
-   NULL,			/* check auth */
-   NULL,			/* check access */
-   NULL,			/* type_checker */
-   NULL,			/* logger */
-   NULL				/* header parser */
-};
diff --git a/usr.sbin/httpd/src/support/htdigest.mcp.gz b/usr.sbin/httpd/src/support/htdigest.mcp.gz
deleted file mode 100644
index a2c23f218af..00000000000
--- a/usr.sbin/httpd/src/support/htdigest.mcp.gz
+++ /dev/null
diff --git a/usr.sbin/httpd/src/support/htpasswd.mcp.gz b/usr.sbin/httpd/src/support/htpasswd.mcp.gz
deleted file mode 100644
index 88d4853bf2d..00000000000
--- a/usr.sbin/httpd/src/support/htpasswd.mcp.gz
+++ /dev/null