diff --git a/CHANGES b/CHANGES
index b5f698c83c..69e5885ba6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3595.	[port]		win32: Fix build problems introduced by change #3550.
+			[RT #33807]
+
 3594.	[maint]		Update config.guess and config.sub. [RT #33816]
 
 3593.	[func]		Update EDNS processing to better track remote server
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 77e637324f..455bac68b4 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -4000,8 +4000,8 @@ dns_adb_adjustsrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
 		new_srtt = (addr->entry->srtt / 10 * factor)
 			+ (rtt / 10 * (10 - factor));
 
-	addr->entry->srtt = new_srtt;
-	addr->srtt = new_srtt;
+	addr->entry->srtt = (unsigned int) new_srtt;
+	addr->srtt = (unsigned int) new_srtt;
 
 	if (addr->entry->expires == 0) {
 		isc_stdtime_get(&now);
diff --git a/lib/dns/lib.c b/lib/dns/lib.c
index 1c9adee2c4..6a1306d53b 100644
--- a/lib/dns/lib.c
+++ b/lib/dns/lib.c
@@ -75,7 +75,9 @@ dns_lib_initmsgcat(void) {
 
 static isc_once_t init_once = ISC_ONCE_INIT;
 static isc_mem_t *dns_g_mctx = NULL;
+#ifndef WIN32
 static dns_dbimplementation_t *dbimp = NULL;
+#endif
 static isc_boolean_t initialize_done = ISC_FALSE;
 static isc_mutex_t reflock;
 static unsigned int references = 0;
@@ -90,9 +92,11 @@ initialize(void) {
 	if (result != ISC_R_SUCCESS)
 		return;
 	dns_result_register();
+#ifndef WIN32
 	result = dns_ecdb_register(dns_g_mctx, &dbimp);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_mctx;
+#endif
 	result = isc_hash_create(dns_g_mctx, NULL, DNS_NAME_MAXWIRE);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_db;
@@ -113,9 +117,11 @@ initialize(void) {
   cleanup_hash:
 	isc_hash_destroy();
   cleanup_db:
+#ifndef WIN32
 	if (dbimp != NULL)
 		dns_ecdb_unregister(&dbimp);
   cleanup_mctx:
+#endif
 	if (dns_g_mctx != NULL)
 		isc_mem_detach(&dns_g_mctx);
 }
@@ -157,8 +163,10 @@ dns_lib_shutdown(void) {
 
 	dst_lib_destroy();
 	isc_hash_destroy();
+#ifndef WIN32
 	if (dbimp != NULL)
 		dns_ecdb_unregister(&dbimp);
+#endif
 	if (dns_g_mctx != NULL)
 		isc_mem_detach(&dns_g_mctx);
 }
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 6d2c0ed7fc..455407c98c 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -72,7 +72,14 @@
 #include <dns/zone.h>
 #include <dns/zonekey.h>
 
+#ifndef WIN32
 #include <sys/mman.h>
+#else
+#define PROT_READ	0x01
+#define PROT_WRITE	0x02
+#define MAP_PRIVATE	0x0002
+#define MAP_FAILED	((void *)-1)
+#endif
 
 #ifdef DNS_RBTDB_VERSION64
 #include "rbtdb64.h"
diff --git a/lib/dns/win32/version.c b/lib/dns/win32/version.c
index a570183421..5b4ed5c948 100644
--- a/lib/dns/win32/version.c
+++ b/lib/dns/win32/version.c
@@ -22,6 +22,8 @@
 #include <dns/version.h>
 
 LIBDNS_EXTERNAL_DATA const char dns_version[] = VERSION;
+LIBDNS_EXTERNAL_DATA const char dns_major[] = MAJOR;
+LIBDNS_EXTERNAL_DATA const char dns_mapapi[] = MAPAPI;
 
 LIBDNS_EXTERNAL_DATA const unsigned int dns_libinterface = LIBINTERFACE;
 LIBDNS_EXTERNAL_DATA const unsigned int dns_librevision = LIBREVISION;
diff --git a/lib/isc/app_api.c b/lib/isc/app_api.c
index e8f2b31f18..046a3c72c7 100644
--- a/lib/isc/app_api.c
+++ b/lib/isc/app_api.c
@@ -57,8 +57,10 @@ isc_result_t
 isc_appctx_create(isc_mem_t *mctx, isc_appctx_t **ctxp) {
 	isc_result_t result;
 
+#ifndef WIN32
 	if (isc_bind9)
 		return (isc__appctx_create(mctx, ctxp));
+#endif
 
 	LOCK(&createlock);
 
@@ -74,9 +76,11 @@ void
 isc_appctx_destroy(isc_appctx_t **ctxp) {
 	REQUIRE(ctxp != NULL && ISCAPI_APPCTX_VALID(*ctxp));
 
+#ifndef WIN32
 	if (isc_bind9)
 		isc__appctx_destroy(ctxp);
 	else
+#endif
 		(*ctxp)->methods->ctxdestroy(ctxp);
 
 	ENSURE(*ctxp == NULL);
@@ -86,8 +90,10 @@ isc_result_t
 isc_app_ctxstart(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
+#ifndef WIN32
 	if (isc_bind9)
 		return (isc__app_ctxstart(ctx));
+#endif
 
 	return (ctx->methods->ctxstart(ctx));
 }
@@ -96,8 +102,10 @@ isc_result_t
 isc_app_ctxrun(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
+#ifndef WIN32
 	if (isc_bind9)
 		return (isc__app_ctxrun(ctx));
+#endif
 
 	return (ctx->methods->ctxrun(ctx));
 }
@@ -109,8 +117,10 @@ isc_app_ctxonrun(isc_appctx_t *ctx, isc_mem_t *mctx,
 {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
+#ifndef WIN32
 	if (isc_bind9)
 		return (isc__app_ctxonrun(ctx, mctx, task, action, arg));
+#endif
 
 	return (ctx->methods->ctxonrun(ctx, mctx, task, action, arg));
 }
@@ -119,8 +129,10 @@ isc_result_t
 isc_app_ctxsuspend(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
+#ifndef WIN32
 	if (isc_bind9)
 		return (isc__app_ctxsuspend(ctx));
+#endif
 
 	return (ctx->methods->ctxsuspend(ctx));
 }
@@ -129,8 +141,10 @@ isc_result_t
 isc_app_ctxshutdown(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
+#ifndef WIN32
 	if (isc_bind9)
 		return (isc__app_ctxshutdown(ctx));
+#endif
 
 	return (ctx->methods->ctxshutdown(ctx));
 }
@@ -139,8 +153,10 @@ void
 isc_app_ctxfinish(isc_appctx_t *ctx) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 
+#ifndef WIN32
 	if (isc_bind9)
 		isc__app_ctxfinish(ctx);
+#endif
 
 	ctx->methods->ctxfinish(ctx);
 }
@@ -150,8 +166,10 @@ isc_appctx_settaskmgr(isc_appctx_t *ctx, isc_taskmgr_t *taskmgr) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 	REQUIRE(taskmgr != NULL);
 
+#ifndef WIN32
 	if (isc_bind9)
 		isc__appctx_settaskmgr(ctx, taskmgr);
+#endif
 
 	ctx->methods->settaskmgr(ctx, taskmgr);
 }
@@ -161,8 +179,10 @@ isc_appctx_setsocketmgr(isc_appctx_t *ctx, isc_socketmgr_t *socketmgr) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 	REQUIRE(socketmgr != NULL);
 
+#ifndef WIN32
 	if (isc_bind9)
 		isc__appctx_setsocketmgr(ctx, socketmgr);
+#endif
 
 	ctx->methods->setsocketmgr(ctx, socketmgr);
 }
@@ -172,12 +192,16 @@ isc_appctx_settimermgr(isc_appctx_t *ctx, isc_timermgr_t *timermgr) {
 	REQUIRE(ISCAPI_APPCTX_VALID(ctx));
 	REQUIRE(timermgr != NULL);
 
+#ifndef WIN32
 	if (isc_bind9)
 		isc__appctx_settimermgr(ctx, timermgr);
+#endif
 
 	ctx->methods->settimermgr(ctx, timermgr);
 }
 
+#ifndef WIN32
+
 isc_result_t
 isc_app_start() {
 	if (isc_bind9)
@@ -243,3 +267,5 @@ isc_app_unblock() {
 
 	isc__app_unblock();
 }
+
+#endif
diff --git a/lib/isc/include/isc/app.h b/lib/isc/include/isc/app.h
index a30326e599..e1d74d6f9f 100644
--- a/lib/isc/include/isc/app.h
+++ b/lib/isc/include/isc/app.h
@@ -89,6 +89,18 @@
 #include <isc/magic.h>
 #include <isc/result.h>
 
+#ifdef WIN32
+#define isc_app_start isc__app_start
+#define isc_app_onrun isc__app_onrun
+#define isc_app_run isc__app_run
+#define isc_app_shutdown isc__app_shutdown
+#define isc_app_reload isc__app_reload
+#define isc_app_finish isc__app_finish
+#define isc_app_block isc__app_block
+#define isc_app_unblock isc__app_unblock
+
+#endif
+
 /***
  *** Types
  ***/
diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index cd0c43b13e..2be8a0629c 100644
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -147,20 +147,10 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_debugging;
 /*%<
  * We use either isc___mem (three underscores) or isc__mem (two) depending on
  * whether it's for BIND9's internal purpose (with -DBIND9) or generic export
- * library.  This condition is generally handled in isc/namespace.h, but for
- * Windows it doesn't work if it involves multiple times of macro expansion
- * (such as isc_mem to isc__mem then to isc___mem).  The following definitions
- * are used to work around this portability issue.  Right now, we don't support
- * the export library for Windows, so we always use the three-underscore
- * version.
+ * library.
  */
-#ifdef WIN32
-#define ISCMEMFUNC(sfx) isc___mem_ ## sfx
-#define ISCMEMPOOLFUNC(sfx) isc___mempool_ ## sfx
-#else
 #define ISCMEMFUNC(sfx) isc__mem_ ## sfx
 #define ISCMEMPOOLFUNC(sfx) isc__mempool_ ## sfx
-#endif
 
 #define isc_mem_get(c, s)	ISCMEMFUNC(get)((c), (s) _ISC_MEM_FILELINE)
 #define isc_mem_allocate(c, s)	ISCMEMFUNC(allocate)((c), (s) _ISC_MEM_FILELINE)
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index d2406f8752..4f4bb91e41 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -67,6 +67,54 @@
 #include <isc/types.h>
 #include <isc/xml.h>
 
+#ifdef WIN32
+
+/* from the old namespace.h */
+
+#define isc_socket_create isc__socket_create
+#define isc_socket_dup isc__socket_dup
+#define isc_socket_attach isc__socket_attach
+#define isc_socket_detach isc__socket_detach
+#define isc_socketmgr_create isc__socketmgr_create
+#define isc_socketmgr_create2 isc__socketmgr_create2
+#define isc_socketmgr_destroy isc__socketmgr_destroy
+#define isc_socket_open isc__socket_open
+#define isc_socket_close isc__socket_close
+#define isc_socket_recvv isc__socket_recvv
+#define isc_socket_recv isc__socket_recv
+#define isc_socket_recv2 isc__socket_recv2
+#define isc_socket_send isc__socket_send
+#define isc_socket_sendto isc__socket_sendto
+#define isc_socket_sendv isc__socket_sendv
+#define isc_socket_sendtov isc__socket_sendtov
+#define isc_socket_sendto2 isc__socket_sendto2
+#define isc_socket_cleanunix isc__socket_cleanunix
+#define isc_socket_permunix isc__socket_permunix
+#define isc_socket_bind isc__socket_bind
+#define isc_socket_filter isc__socket_filter
+#define isc_socket_listen isc__socket_listen
+#define isc_socket_accept isc__socket_accept
+#define isc_socket_connect isc__socket_connect
+#define isc_socket_getfd isc__socket_getfd
+#define isc_socket_getname isc__socket_getname
+#define isc_socket_gettag isc__socket_gettag
+#define isc_socket_getpeername isc__socket_getpeername
+#define isc_socket_getsockname isc__socket_getsockname
+#define isc_socket_cancel isc__socket_cancel
+#define isc_socket_gettype isc__socket_gettype
+#define isc_socket_isbound isc__socket_isbound
+#define isc_socket_ipv6only isc__socket_ipv6only
+#define isc_socket_setname isc__socket_setname
+#define isc_socketmgr_getmaxsockets isc__socketmgr_getmaxsockets
+#define isc_socketmgr_setstats isc__socketmgr_setstats
+#define isc_socketmgr_setreserved isc__socketmgr_setreserved
+#define isc__socketmgr_maxudp isc___socketmgr_maxudp
+#define isc_socket_fdwatchcreate isc__socket_fdwatchcreate
+#define isc_socket_fdwatchpoke isc__socket_fdwatchpoke
+#define isc_socket_dscp isc__socket_dscp
+
+#endif
+
 ISC_LANG_BEGINDECLS
 
 /***
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index 776388d2a4..cdf930e34c 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -83,6 +83,8 @@ isc_lib_initmsgcat(void) {
 	}
 }
 
+#ifndef WIN32
+
 static isc_once_t		register_once = ISC_ONCE_INIT;
 
 static void
@@ -101,3 +103,5 @@ isc_lib_register() {
 	RUNTIME_CHECK(isc_once_do(&register_once, do_register)
 		      == ISC_R_SUCCESS);
 }
+
+#endif
diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c
index 1f72784338..acd73cf231 100644
--- a/lib/isc/socket_api.c
+++ b/lib/isc/socket_api.c
@@ -69,6 +69,8 @@ isc_socketmgr_createinctx(isc_mem_t *mctx, isc_appctx_t *actx,
 	return (result);
 }
 
+#ifndef WIN32
+
 isc_result_t
 isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
 	isc_result_t result;
@@ -392,3 +394,4 @@ isc_socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp) {
 	return (isc__socket_getpeername(sock, addressp));
 }
 
+#endif
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index fb34353182..02dd93d941 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -5,15 +5,6 @@ EXPORTS
 
 NTReportError
 closelog
-isc___mem_allocate
-isc___mem_free
-isc___mem_get
-isc___mem_put
-isc___mem_putanddetach
-isc___mem_reallocate
-isc___mem_strdup
-isc___mempool_get
-isc___mempool_put
 isc___socketmgr_maxudp
 isc__app_block
 isc__app_finish
@@ -46,41 +37,15 @@ isc__buffer_remainingregion
 isc__buffer_setactive
 isc__buffer_subtract
 isc__buffer_usedregion
-isc__mem_attach
-isc__mem_checkdestroyed
-isc__mem_create
-isc__mem_create2
-isc__mem_createx
-isc__mem_createx2
-isc__mem_destroy
-isc__mem_detach
-isc__mem_getname
-isc__mem_getquota
-isc__mem_gettag
-isc__mem_inuse
-isc__mem_isovermem
-isc__mem_maxinuse
-isc__mem_ondestroy
-isc__mem_references
-isc__mem_setdestroycheck
-isc__mem_setname
-isc__mem_setquota
-isc__mem_setwater
-isc__mem_stats
-isc__mem_total
-isc__mem_waterack
-isc__mempool_associatelock
-isc__mempool_create
-isc__mempool_destroy
-isc__mempool_getallocated
-isc__mempool_getfillcount
-isc__mempool_getfreecount
-isc__mempool_getfreemax
-isc__mempool_getmaxalloc
-isc__mempool_setfillcount
-isc__mempool_setfreemax
-isc__mempool_setmaxalloc
-isc__mempool_setname
+isc__mem_allocate
+isc__mem_free
+isc__mem_get
+isc__mem_put
+isc__mem_putanddetach
+isc__mem_reallocate
+isc__mem_strdup
+isc__mempool_get
+isc__mempool_put
 isc__socket_accept
 isc__socket_attach
 isc__socket_bind
@@ -120,41 +85,10 @@ isc__socketmgr_getmaxsockets
 isc__socketmgr_setreserved
 isc__socketmgr_setstats
 isc__strerror
-isc__task_attach
-isc__task_beginexclusive
-isc__task_create
-isc__task_destroy
-isc__task_detach
-isc__task_endexclusive
-isc__task_getcurrenttime
 isc__task_getname
 isc__task_gettag
-isc__task_onshutdown
-isc__task_privilege
-isc__task_purge
-isc__task_purgeevent
-isc__task_purgerange
-isc__task_send
-isc__task_sendanddetach
-isc__task_setname
-isc__task_setprivilege
-isc__task_shutdown
-isc__task_unsend
 isc__task_unsendrange
-isc__taskmgr_create
-isc__taskmgr_destroy
-isc__taskmgr_excltask
 isc__taskmgr_mode
-isc__taskmgr_setexcltask
-isc__taskmgr_setmode
-isc__timer_attach
-isc__timer_create
-isc__timer_detach
-isc__timer_reset
-isc__timer_touch
-isc__timermgr_create
-isc__timermgr_destroy
-isc__timermgr_poke
 isc_assertion_failed
 isc_assertion_setcallback
 isc_assertion_typetotext
@@ -383,7 +317,42 @@ isc_md5_final
 isc_md5_init
 isc_md5_invalidate
 isc_md5_update
+isc_mem_attach
+isc_mem_checkdestroyed
+isc_mem_create
+isc_mem_create2
+isc_mem_createx
+isc_mem_createx2
+isc_mem_destroy
+isc_mem_detach
+isc_mem_getname
+isc_mem_getquota
+isc_mem_gettag
+isc_mem_inuse
+isc_mem_isovermem
+isc_mem_maxinuse
+isc_mem_ondestroy
+isc_mem_references
 isc_mem_renderxml
+isc_mem_setdestroycheck
+isc_mem_setname
+isc_mem_setquota
+isc_mem_setwater
+isc_mem_stats
+isc_mem_total
+isc_mem_waterack
+isc_mempool_associatelock
+isc_mempool_create
+isc_mempool_destroy
+isc_mempool_getallocated
+isc_mempool_getfillcount
+isc_mempool_getfreecount
+isc_mempool_getfreemax
+isc_mempool_getmaxalloc
+isc_mempool_setfillcount
+isc_mempool_setfreemax
+isc_mempool_setmaxalloc
+isc_mempool_setname
 isc_msgcat_close
 isc_msgcat_get
 isc_msgcat_open
@@ -562,7 +531,30 @@ isc_symtab_destroy
 isc_symtab_lookup
 isc_symtab_undefine
 isc_syslog_facilityfromstring
+isc_task_attach
+isc_task_beginexclusive
+isc_task_create
+isc_task_destroy
+isc_task_detach
+isc_task_endexclusive
+isc_task_getcurrenttime
+isc_task_onshutdown
+isc_task_privilege
+isc_task_purge
+isc_task_purgeevent
+isc_task_purgerange
+isc_task_send
+isc_task_sendanddetach
+isc_task_setname
+isc_task_setprivilege
+isc_task_shutdown
+isc_task_unsend
+isc_taskmgr_create
+isc_taskmgr_destroy
+isc_taskmgr_excltask
 isc_taskmgr_renderxml
+isc_taskmgr_setexcltask
+isc_taskmgr_setmode
 isc_taskpool_create
 isc_taskpool_destroy
 isc_taskpool_expand
@@ -590,6 +582,14 @@ isc_time_seconds
 isc_time_set
 isc_time_settoepoch
 isc_time_subtract
+isc_timer_attach
+isc_timer_create
+isc_timer_detach
+isc_timer_reset
+isc_timer_touch
+isc_timermgr_create
+isc_timermgr_destroy
+isc_timermgr_poke
 isc_win32os_majorversion
 isc_win32os_minorversion
 isc_win32os_servicepackmajor
@@ -602,6 +602,7 @@ syslog
 
 EXPORTS
 
+isc_bind9			DATA
 isc_commandline_argument	DATA
 isc_commandline_errprint	DATA
 isc_commandline_index		DATA
diff --git a/lib/isc/win32/libisc.dsp b/lib/isc/win32/libisc.dsp
index 33519ae4d8..9ba26e49cb 100644
--- a/lib/isc/win32/libisc.dsp
+++ b/lib/isc/win32/libisc.dsp
@@ -103,10 +103,6 @@ SOURCE=.\condition.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\crc64.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\dir.c
 # End Source File
 # Begin Source File
@@ -227,6 +223,10 @@ SOURCE=..\include\isc\base64.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\isc\bind9.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\isc\bind_registry.h
 # End Source File
 # Begin Source File
@@ -615,6 +615,10 @@ SOURCE=..\base64.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\bind9.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\bitstring.c
 # End Source File
 # Begin Source File
@@ -631,6 +635,10 @@ SOURCE=..\commandline.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\crc64.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\error.c
 # End Source File
 # Begin Source File
diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak
index 714723699d..3ff26ef6b5 100644
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -120,6 +120,7 @@ CLEAN :
 	-@erase "$(INTDIR)\backtrace-emptytbl.obj"
 	-@erase "$(INTDIR)\base32.obj"
 	-@erase "$(INTDIR)\base64.obj"
+	-@erase "$(INTDIR)\bind9.obj"
 	-@erase "$(INTDIR)\bitstring.obj"
 	-@erase "$(INTDIR)\buffer.obj"
 	-@erase "$(INTDIR)\bufferlist.obj"
@@ -216,7 +217,6 @@ DEF_FILE= \
 LINK32_OBJS= \
 	"$(INTDIR)\app.obj" \
 	"$(INTDIR)\condition.obj" \
-	"$(INTDIR)\crc64.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\DLLMain.obj" \
 	"$(INTDIR)\entropy.obj" \
@@ -246,10 +246,12 @@ LINK32_OBJS= \
 	"$(INTDIR)\backtrace-emptytbl.obj" \
 	"$(INTDIR)\base32.obj" \
 	"$(INTDIR)\base64.obj" \
+	"$(INTDIR)\bind9.obj" \
 	"$(INTDIR)\bitstring.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\bufferlist.obj" \
 	"$(INTDIR)\commandline.obj" \
+	"$(INTDIR)\crc64.obj" \
 	"$(INTDIR)\error.obj" \
 	"$(INTDIR)\event.obj" \
 	"$(INTDIR)\hash.obj" \
@@ -325,6 +327,8 @@ CLEAN :
 	-@erase "$(INTDIR)\base32.sbr"
 	-@erase "$(INTDIR)\base64.obj"
 	-@erase "$(INTDIR)\base64.sbr"
+	-@erase "$(INTDIR)\bind9.obj"
+	-@erase "$(INTDIR)\bind9.sbr"
 	-@erase "$(INTDIR)\bitstring.obj"
 	-@erase "$(INTDIR)\bitstring.sbr"
 	-@erase "$(INTDIR)\buffer.obj"
@@ -494,7 +498,6 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisc.bsc"
 BSC32_SBRS= \
 	"$(INTDIR)\app.sbr" \
 	"$(INTDIR)\condition.sbr" \
-	"$(INTDIR)\crc64.sbr" \
 	"$(INTDIR)\dir.sbr" \
 	"$(INTDIR)\DLLMain.sbr" \
 	"$(INTDIR)\entropy.sbr" \
@@ -524,10 +527,12 @@ BSC32_SBRS= \
 	"$(INTDIR)\backtrace-emptytbl.sbr" \
 	"$(INTDIR)\base32.sbr" \
 	"$(INTDIR)\base64.sbr" \
+	"$(INTDIR)\bind9.sbr" \
 	"$(INTDIR)\bitstring.sbr" \
 	"$(INTDIR)\buffer.sbr" \
 	"$(INTDIR)\bufferlist.sbr" \
 	"$(INTDIR)\commandline.sbr" \
+	"$(INTDIR)\crc64.sbr" \
 	"$(INTDIR)\error.sbr" \
 	"$(INTDIR)\event.sbr" \
 	"$(INTDIR)\hash.sbr" \
@@ -585,7 +590,6 @@ DEF_FILE= \
 LINK32_OBJS= \
 	"$(INTDIR)\app.obj" \
 	"$(INTDIR)\condition.obj" \
-	"$(INTDIR)\crc64.obj" \
 	"$(INTDIR)\dir.obj" \
 	"$(INTDIR)\DLLMain.obj" \
 	"$(INTDIR)\entropy.obj" \
@@ -615,10 +619,12 @@ LINK32_OBJS= \
 	"$(INTDIR)\backtrace-emptytbl.obj" \
 	"$(INTDIR)\base32.obj" \
 	"$(INTDIR)\base64.obj" \
+	"$(INTDIR)\bind9.obj" \
 	"$(INTDIR)\bitstring.obj" \
 	"$(INTDIR)\buffer.obj" \
 	"$(INTDIR)\bufferlist.obj" \
 	"$(INTDIR)\commandline.obj" \
+	"$(INTDIR)\crc64.obj" \
 	"$(INTDIR)\error.obj" \
 	"$(INTDIR)\event.obj" \
 	"$(INTDIR)\hash.obj" \
@@ -743,22 +749,6 @@ SOURCE=.\condition.c
 "$(INTDIR)\condition.obj"	"$(INTDIR)\condition.sbr" : $(SOURCE) "$(INTDIR)"
 
 
-!ENDIF 
-
-SOURCE=.\crc64.c
-
-!IF  "$(CFG)" == "libisc - Win32 Release"
-
-
-"$(INTDIR)\crc64.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
-
-
-"$(INTDIR)\crc64.obj"	"$(INTDIR)\crc64.sbr" : $(SOURCE) "$(INTDIR)"
-
-
 !ENDIF 
 
 SOURCE=.\dir.c
@@ -1218,6 +1208,24 @@ SOURCE=..\base64.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\bind9.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\bind9.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\bind9.obj"	"$(INTDIR)\bind9.sbr" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 !ENDIF 
 
 SOURCE=..\bitstring.c
@@ -1290,6 +1298,22 @@ SOURCE=..\commandline.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
+SOURCE=..\crc64.c
+
+!IF  "$(CFG)" == "libisc - Win32 Release"
+
+
+"$(INTDIR)\crc64.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
+
+
+"$(INTDIR)\crc64.obj"	"$(INTDIR)\crc64.sbr" : $(SOURCE) "$(INTDIR)"
+
+
 !ENDIF 
 
 SOURCE=..\error.c
diff --git a/win32utils/makeversion.pl b/win32utils/makeversion.pl
index 17ffb8c714..90743c2322 100644
--- a/win32utils/makeversion.pl
+++ b/win32utils/makeversion.pl
@@ -58,6 +58,26 @@ while (<VERSIONFILE>) {
 }
 close(VERSIONFILE);
 
+# And the mapapi one
+
+open (MAPAPIFILE, "../lib/dns/mapapi");
+while (<MAPAPIFILE>) {
+	chomp;
+	($data) = split(/\#/);
+	if($data) {
+		($name, $value) = split(/=/,$data);
+		($name) = split(/\s+/, $name);
+                if ($name eq 'MAPAPI') {
+                        ($value) =~ s/^["\s]+//;
+                        ($value) =~ s/["\s]+$//;
+                } else {
+                        ($value) = split(/\s+/, $value);
+                }
+		$Mapapi = $value;
+	}
+}
+close(MAPAPIFILE);
+
 # Now set up the output version file
 
 $ThisDate = scalar localtime();
@@ -109,6 +129,9 @@ print OUTVERSIONFILE "#define VERSION \"$Version\"\n";
 print OUTVERSIONFILE "#define PRODUCT \"$Versions{'PRODUCT'}\"\n\n";
 print OUTVERSIONFILE "#define DESCRIPTION \"$Versions{'DESCRIPTION'}\"\n\n";
 
+print OUTVERSIONFILE "#define MAJOR \"$Versions{'MAJORVER'}.$Versions{'MINORVER'}\"\n\n";
+print OUTVERSIONFILE "#define MAPAPI \"$Mapapi\"\n\n";
+
 foreach $dir (@dirlist) {
 	$apifile = "../lib/$dir/api";
 	open (APIVERSION, $apifile);