diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index 394a76dbfb..1b458addce 100644
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -3,767 +3,757 @@ LIBRARY libdns
 ; Exported Functions
 EXPORTS
 
-dns_acl_create
-dns_acl_appendelement
+dns_acache_attach
+dns_acache_attachentry
+dns_acache_cancelentry
+dns_acache_create
+dns_acache_createentry
+dns_acache_detach
+dns_acache_detachentry
+dns_acache_getentry
+dns_acache_putdb
+dns_acache_setcachesize
+dns_acache_setcleaninginterval
+dns_acache_setdb
+dns_acache_setentry
+dns_acache_shutdown
 dns_acl_any
-dns_acl_none
+dns_acl_appendelement
 dns_acl_attach
+dns_acl_create
 dns_acl_detach
-dns_aclelement_equal
+dns_acl_elementmatch
 dns_acl_equal
 dns_acl_isinsecure
-dns_aclenv_init
+dns_acl_match
+dns_acl_none
+dns_aclelement_equal
+dns_aclelement_match
 dns_aclenv_copy
 dns_aclenv_destroy
-dns_acl_match
-dns_aclelement_match
-dns_adb_create
+dns_aclenv_init
+dns_adb_adjustsrtt
 dns_adb_attach
-dns_adb_detach
-dns_adb_whenshutdown
-dns_adb_shutdown
-dns_adb_createfind
 dns_adb_cancelfind
+dns_adb_changeflags
+dns_adb_create
+dns_adb_createfind
 dns_adb_destroyfind
+dns_adb_detach
 dns_adb_dump
 dns_adb_dumpfind
-dns_adb_marklame
-dns_adb_adjustsrtt
-dns_adb_changeflags
 dns_adb_findaddrinfo
-dns_adb_freeaddrinfo
 dns_adb_flush
+dns_adb_freeaddrinfo
+dns_adb_marklame
 dns_adb_setadbsize
-dns_byaddr_create
+dns_adb_shutdown
+dns_adb_whenshutdown
 dns_byaddr_cancel
-dns_byaddr_destroy
+dns_byaddr_create
 dns_byaddr_createptrname
-dns_cache_create
+dns_byaddr_createptrname2
+dns_byaddr_destroy
 dns_cache_attach
-dns_cache_detach
 dns_cache_attachdb
-dns_cache_setfilename
-dns_cache_load
-dns_cache_dump
 dns_cache_clean
-dns_cache_setcleaninginterval
-dns_cache_setcachesize
+dns_cache_create
+dns_cache_detach
+dns_cache_dump
 dns_cache_flush
-dns_rdatacallbacks_init
-dns_rdatacallbacks_init_stdio
+dns_cache_load
+dns_cache_setcachesize
+dns_cache_setcleaninginterval
+dns_cache_setfilename
 dns_cert_fromtext
 dns_cert_totext
+dns_compress_add
+dns_compress_findglobal
+dns_compress_getedns
+dns_compress_getmethods
 dns_compress_init
 dns_compress_invalidate
-dns_compress_setmethods
-dns_compress_getmethods
-dns_compress_getedns
-dns_compress_findglobal
-dns_compress_add
 dns_compress_rollback
-dns_decompress_init
-dns_decompress_invalidate
-dns_decompress_setmethods
-dns_decompress_getmethods
-dns_decompress_edns
-dns_decompress_type
-dns_db_create
-dns_db_attach
-dns_db_detach
-dns_db_ondestroy
-dns_db_iscache
-dns_db_iszone
-dns_db_isstub
-dns_db_issecure
-dns_db_origin
-dns_db_class
-dns_db_beginload
-dns_db_endload
-dns_db_load
-dns_db_dump
-dns_db_currentversion
-dns_db_newversion
-dns_db_attachversion
-dns_db_closeversion
-dns_db_findnode
-dns_db_find
-dns_db_findzonecut
-dns_db_attachnode
-dns_db_detachnode
-dns_db_expirenode
-dns_db_printnode
-dns_db_createiterator
-dns_db_findrdataset
-dns_db_allrdatasets
+dns_compress_setmethods
+dns_counter_fromtext
 dns_db_addrdataset
-dns_db_subtractrdataset
+dns_db_allrdatasets
+dns_db_attach
+dns_db_attachnode
+dns_db_attachversion
+dns_db_beginload
+dns_db_class
+dns_db_closeversion
+dns_db_create
+dns_db_createiterator
+dns_db_createsoatuple
+dns_db_currentversion
 dns_db_deleterdataset
+dns_db_detach
+dns_db_detachnode
+dns_db_diff
+dns_db_dump
+dns_db_endload
+dns_db_expirenode
+dns_db_find
+dns_db_findnode
+dns_db_findrdataset
+dns_db_findzonecut
+dns_db_getnsnode
+dns_db_getsoanode
 dns_db_getsoaserial
-dns_db_overmem
-dns_db_nodecount
+dns_db_iscache
 dns_db_ispersistent
+dns_db_issecure
+dns_db_isstub
+dns_db_iszone
+dns_db_load
+dns_db_newversion
+dns_db_nodecount
+dns_db_ondestroy
+dns_db_origin
+dns_db_overmem
+dns_db_printnode
 dns_db_register
+dns_db_setnsnode
+dns_db_setsoanode
+dns_db_subtractrdataset
 dns_db_unregister
+dns_dbiterator_current
 dns_dbiterator_destroy
 dns_dbiterator_first
 dns_dbiterator_last
-dns_dbiterator_seek
-dns_dbiterator_prev
 dns_dbiterator_next
-dns_dbiterator_current
-dns_dbiterator_pause
 dns_dbiterator_origin
+dns_dbiterator_pause
+dns_dbiterator_prev
+dns_dbiterator_seek
 dns_dbiterator_setcleanmode
-dns_dbtable_create
-dns_dbtable_attach
-dns_dbtable_detach
 dns_dbtable_add
-dns_dbtable_remove
 dns_dbtable_adddefault
-dns_dbtable_getdefault
-dns_dbtable_removedefault
+dns_dbtable_attach
+dns_dbtable_create
+dns_dbtable_detach
 dns_dbtable_find
-
-dns_difftuple_create
-dns_difftuple_free
-dns_difftuple_copy
-dns_diff_init
-dns_diff_clear
+dns_dbtable_getdefault
+dns_dbtable_remove
+dns_dbtable_removedefault
+dns_decompress_edns
+dns_decompress_getmethods
+dns_decompress_init
+dns_decompress_invalidate
+dns_decompress_setmethods
+dns_decompress_type
 dns_diff_append
 dns_diff_appendminimal
-dns_diff_sort
 dns_diff_apply
+dns_diff_applysilently
+dns_diff_clear
+dns_diff_init
 dns_diff_load
 dns_diff_print
-dns_dispatchmgr_create
-dns_dispatchmgr_destroy
-dns_dispatchmgr_setblackhole
-dns_dispatchmgr_getblackhole
-dns_dispatch_getudp
-dns_dispatch_createtcp
-dns_dispatch_attach
-dns_dispatch_detach
-dns_dispatch_starttcp
+dns_diff_sort
+dns_difftuple_copy
+dns_difftuple_create
+dns_difftuple_free
 dns_dispatch_addresponse
-dns_dispatch_removeresponse
-dns_dispatch_getsocket
-dns_dispatch_getlocaladdress
+dns_dispatch_attach
 dns_dispatch_cancel
 dns_dispatch_changeattributes
+dns_dispatch_createtcp
+dns_dispatch_detach
+dns_dispatch_getlocaladdress
+dns_dispatch_getsocket
+dns_dispatch_getudp
 dns_dispatch_importrecv
+dns_dispatch_removeresponse
+dns_dispatch_starttcp
+dns_dispatchmgr_create
+dns_dispatchmgr_destroy
+dns_dispatchmgr_getblackhole
+dns_dispatchmgr_setblackhole
+dns_dispatchmgr_setblackportlist
+dns_dnssec_findzonekeys
+dns_dnssec_findzonekeys2
 dns_dnssec_keyfromrdata
 dns_dnssec_sign
-dns_dnssec_verify
-dns_dnssec_findzonekeys
 dns_dnssec_signmessage
+dns_dnssec_verify
 dns_dnssec_verifymessage
-dns_fwdtable_create
+dns_ds_buildrdata
+dns_dumpctx_detach
 dns_fwdtable_add
-dns_fwdtable_find
+dns_fwdtable_create
 dns_fwdtable_destroy
-dns_db_createsoatuple
-dns_journal_open
-dns_journal_destroy
+dns_fwdtable_find
 dns_journal_begin_transaction
-dns_journal_writediff
 dns_journal_commit
-dns_journal_writediff
-dns_journal_write_transaction
-dns_diff_sort
-dns_journal_writediff
-dns_journal_first_serial
-dns_journal_last_serial
-dns_journal_iter_init
-dns_journal_first_rr
-dns_journal_next_rr
-dns_journal_iter_init
 dns_journal_current_rr
-dns_journal_rollforward
+dns_journal_destroy
+dns_journal_first_rr
+dns_journal_first_serial
+dns_journal_iter_init
+dns_journal_last_serial
+dns_journal_next_rr
+dns_journal_open
 dns_journal_print
-dns_db_diff
+dns_journal_rollforward
+dns_journal_write_transaction
+dns_journal_writediff
 dns_keyflags_fromtext
-dns_keytable_create
-dns_keytable_attach
-dns_keytable_detach
+dns_keynode_key
 dns_keytable_add
+dns_keytable_attach
+dns_keytable_create
+dns_keytable_detach
+dns_keytable_detachkeynode
+dns_keytable_finddeepestmatch
 dns_keytable_findkeynode
 dns_keytable_findnextkeynode
-dns_keytable_finddeepestmatch
-dns_keytable_detachkeynode
 dns_keytable_issecuredomain
-dns_keynode_key
 dns_lib_initmsgcat
-dns_log_init
-dns_log_setcontext
-dns_lookup_create
-dns_lookup_cancel
-dns_lookup_destroy
-dns_master_loadfile
-dns_master_loadstream
-dns_master_loadbuffer
-dns_master_loadfileinc
-dns_master_loadstreaminc
-dns_master_loadbufferinc
-dns_loadctx_detach
 dns_loadctx_attach
 dns_loadctx_cancel
-dns_master_dumptostream
+dns_loadctx_detach
+dns_log_init
+dns_log_setcontext
+dns_lookup_cancel
+dns_lookup_create
+dns_lookup_destroy
 dns_master_dump
-dns_master_rdatasettotext
-dns_master_questiontotext
-dns_rdataset_towire
-dns_master_dumpnodetostream
 dns_master_dumpnode
-dns_message_gettempname
+dns_master_dumpnodetostream
+dns_master_dumptostream
+dns_master_dumptostreaminc
+dns_master_loadbuffer
+dns_master_loadbufferinc
+dns_master_loadfile
+dns_master_loadfileinc
+dns_master_loadstream
+dns_master_loadstreaminc
+dns_master_questiontotext
+dns_master_rdatasettotext
+dns_master_stylecreate
+dns_master_styledestroy
+dns_message_addname
+dns_message_checksig
 dns_message_create
-dns_message_reset
-dns_message_destroy
-dns_message_sectiontotext
-dns_message_pseudosectiontotext
-dns_message_totext
-dns_message_parse
-dns_message_firstname
-dns_message_renderbegin
-dns_message_renderend
-dns_message_renderchangebuffer
-dns_message_renderend
-dns_message_renderreserve
-dns_message_renderrelease
-dns_message_rendersection
-dns_message_renderheader
-dns_message_renderend
-dns_message_renderend
-dns_message_renderreset
-dns_message_firstname
-dns_message_nextname
 dns_message_currentname
+dns_message_destroy
 dns_message_findname
 dns_message_findtype
-dns_message_movename
-dns_message_addname
+dns_message_firstname
+dns_message_getopt
+dns_message_getquerytsig
+dns_message_getrawmessage
+dns_message_getsig0
+dns_message_getsig0key
 dns_message_gettempname
 dns_message_gettempoffsets
 dns_message_gettemprdata
-dns_message_gettemprdataset
 dns_message_gettemprdatalist
+dns_message_gettemprdataset
+dns_message_gettimeadjust
+dns_message_gettsig
+dns_message_gettsigkey
+dns_message_movename
+dns_message_nextname
+dns_message_parse
+dns_message_peekheader
+dns_message_pseudosectiontotext
 dns_message_puttempname
 dns_message_puttemprdata
-dns_message_puttemprdataset
 dns_message_puttemprdatalist
-dns_message_peekheader
-dns_message_reply
-dns_message_getopt
-dns_message_setopt
-dns_message_gettsig
-dns_message_settsigkey
-dns_message_gettsigkey
-dns_message_setquerytsig
-dns_message_getquerytsig
-dns_message_getsig0
-dns_message_setsig0key
-dns_message_getsig0key
-dns_message_takebuffer
-dns_message_signer
-dns_message_checksig
-dns_message_getrawmessage
-dns_message_setsortorder
+dns_message_puttemprdataset
+dns_message_rechecksig
+dns_message_renderbegin
+dns_message_renderchangebuffer
+dns_message_renderend
+dns_message_renderheader
+dns_message_renderrelease
+dns_message_renderreserve
+dns_message_renderreset
 dns_message_rendersection
+dns_message_reply
+dns_message_reset
+dns_message_resetsig
+dns_message_sectiontotext
+dns_message_setopt
+dns_message_setquerytsig
+dns_message_setsig0key
+dns_message_setsortorder
 dns_message_settimeadjust
-dns_message_gettimeadjust
-dns_name_init
-dns_name_reset
-dns_name_invalidate
-dns_name_setbuffer
-dns_name_hasbuffer
-dns_name_isabsolute
-dns_name_iswildcard
-dns_name_hash
-dns_name_fullcompare
-dns_name_compare
-dns_name_equal
-dns_name_rdatacompare
-dns_name_issubdomain
-dns_name_matcheswildcard
-dns_name_countlabels
-dns_name_getlabel
-dns_name_getlabelsequence
+dns_message_settsigkey
+dns_message_signer
+dns_message_takebuffer
+dns_message_totext
 dns_name_clone
-dns_name_fromregion
-dns_name_toregion
-dns_name_fromwire
-dns_name_towire
-dns_name_fromtext
-dns_name_totext
-dns_name_tofilenametext
-dns_name_downcase
+dns_name_compare
 dns_name_concatenate
-dns_name_split
+dns_name_copy
+dns_name_countlabels
+dns_name_digest
+dns_name_downcase
 dns_name_dup
 dns_name_dupwithoffsets
-dns_name_free
-dns_name_digest
 dns_name_dynamic
-dns_name_print
+dns_name_equal
 dns_name_format
-dns_name_copy
+dns_name_free
+dns_name_fromregion
+dns_name_fromtext
+dns_name_fromwire
+dns_name_fullcompare
+dns_name_getlabel
+dns_name_getlabelsequence
+dns_name_hasbuffer
+dns_name_hash
+dns_name_init
+dns_name_internalwildcard
+dns_name_invalidate
+dns_name_isabsolute
+dns_name_issubdomain
+dns_name_iswildcard
+dns_name_matcheswildcard
+dns_name_print
+dns_name_rdatacompare
+dns_name_reset
+dns_name_setbuffer
+dns_name_split
+dns_name_tofilenametext
+dns_name_toregion
+dns_name_totext
+dns_name_towire
 dns_ncache_add
 dns_ncache_towire
-dns_nsec_buildrdata
 dns_nsec_build
+dns_nsec_buildrdata
 dns_nsec_typepresent
-dns_soa_getserial
-dns_soa_setserial
-dns_soa_getminimum
-dns_peerlist_new
-dns_peerlist_attach
-dns_peerlist_detach
-dns_peerlist_addpeer
-dns_peerlist_peerbyaddr
-dns_peerlist_currpeer
-dns_peer_new
+dns_order_add
+dns_order_attach
+dns_order_create
+dns_order_detach
+dns_order_find
 dns_peer_attach
 dns_peer_detach
-dns_peer_setbogus
 dns_peer_getbogus
-
-
-dns_peer_setrequestixfr
-dns_peer_getrequestixfr
-dns_peer_setprovideixfr
-dns_peer_getprovideixfr
-dns_peer_setsupportedns
-dns_peer_getsupportedns
-dns_peer_settransfers
-dns_peer_gettransfers
-dns_peer_settransferformat
-dns_peer_gettransferformat
-dns_peer_setkeybycharp
 dns_peer_getkey
+dns_peer_getprovideixfr
+dns_peer_getrequestixfr
+dns_peer_getsupportedns
+dns_peer_gettransferformat
+dns_peer_gettransfers
+dns_peer_new
+dns_peer_setbogus
 dns_peer_setkey
-dns_name_concatenate
-dns_name_totext
-dns_rbt_create
+dns_peer_setkeybycharp
+dns_peer_setprovideixfr
+dns_peer_setrequestixfr
+dns_peer_setsupportedns
+dns_peer_settransferformat
+dns_peer_settransfers
+dns_peer_settransfersource
+dns_peerlist_addpeer
+dns_peerlist_attach
+dns_peerlist_currpeer
+dns_peerlist_detach
+dns_peerlist_new
+dns_peerlist_peerbyaddr
+dns_portlist_add
+dns_portlist_create
+dns_portlist_detach
 dns_rbt_addname
 dns_rbt_addnode
-dns_rbt_findname
-dns_rbt_findnode
+dns_rbt_create
 dns_rbt_deletename
 dns_rbt_deletenode
-dns_rbt_namefromnode
-dns_rbt_fullnamefromnode
-dns_rbt_formatnodename
-dns_rbt_nodecount
 dns_rbt_destroy
+dns_rbt_findname
+dns_rbt_findnode
+dns_rbt_formatnodename
+dns_rbt_fullnamefromnode
+dns_rbt_namefromnode
+dns_rbt_nodecount
 dns_rbt_printall
-dns_rbtnodechain_init
-dns_rbtnodechain_reset
-dns_rbtnodechain_invalidate
 dns_rbtnodechain_current
 dns_rbtnodechain_first
+dns_rbtnodechain_init
+dns_rbtnodechain_invalidate
 dns_rbtnodechain_last
-dns_rbtnodechain_prev
 dns_rbtnodechain_next
+dns_rbtnodechain_prev
+dns_rbtnodechain_reset
 dns_rcode_fromtext
 dns_rcode_totext
-dns_tsigrcode_fromtext
-dns_tsigrcode_totext
-dns_rdata_init
-dns_rdata_reset
+dns_rdata_additionaldata
+dns_rdata_checkowner
 dns_rdata_clone
 dns_rdata_compare
-dns_rdata_fromregion
-dns_rdata_toregion
-dns_rdata_fromwire
-dns_rdata_towire
-dns_rdata_fromtext
-
-dns_rdata_totext
-dns_rdata_tofmttext
-dns_rdata_fromstruct
-dns_rdata_tostruct
-dns_rdata_freestruct
-dns_rdatatype_ismeta
-dns_rdatatype_issingleton
-dns_rdataclass_ismeta
-dns_rdatatype_isdnssec
-dns_rdatatype_iszonecutauth
-dns_rdatatype_isknown
-dns_rdata_additionaldata
-dns_rdata_digest
-dns_rdatatype_questiononly
-dns_rdatatype_notquestion
-dns_rdatatype_attributes
 dns_rdata_covers
-dns_rdataclass_fromtext
-dns_rdataclass_totext
+dns_rdata_digest
+dns_rdata_freestruct
+dns_rdata_fromregion
+dns_rdata_fromstruct
+dns_rdata_fromtext
+dns_rdata_fromwire
+dns_rdata_init
+dns_rdata_reset
+dns_rdata_tofmttext
+dns_rdata_toregion
+dns_rdata_tostruct
+dns_rdata_totext
+dns_rdata_towire
+dns_rdatacallbacks_init
+dns_rdatacallbacks_init_stdio
 dns_rdataclass_format
+dns_rdataclass_fromtext
+dns_rdataclass_ismeta
+dns_rdataclass_totext
 dns_rdatalist_init
 dns_rdatalist_tordataset
-dns_rdataset_init
-dns_rdataset_invalidate
-dns_rdataset_disassociate
-dns_rdataset_isassociated
-dns_rdataset_makequestion
+dns_rdataset_additionaldata
 dns_rdataset_clone
 dns_rdataset_count
-dns_rdataset_first
-dns_rdataset_next
 dns_rdataset_current
+dns_rdataset_disassociate
+dns_rdataset_first
+dns_rdataset_getadditional
+dns_rdataset_getnoqname
+dns_rdataset_init
+dns_rdataset_invalidate
+dns_rdataset_isassociated
+dns_rdataset_makequestion
+dns_rdataset_next
+dns_rdataset_putadditional
+dns_rdataset_setadditional
 dns_rdataset_totext
 dns_rdataset_towire
 dns_rdataset_towiresorted
-dns_rdataset_additionaldata
+dns_rdatasetiter_current
 dns_rdatasetiter_destroy
 dns_rdatasetiter_first
 dns_rdatasetiter_next
-dns_rdatasetiter_current
-dns_rdataslab_fromrdataset
-dns_rdataslab_size
-dns_rdataslab_merge
-dns_rdataslab_subtract
 dns_rdataslab_equal
-dns_rdatatype_fromtext
-dns_rdatatype_totext
+dns_rdataslab_fromrdataset
+dns_rdataslab_merge
+dns_rdataslab_size
+dns_rdataslab_subtract
+dns_rdatatype_atparent
+dns_rdatatype_attributes
 dns_rdatatype_format
-dns_requestmgr_create
-dns_requestmgr_whenshutdown
-dns_requestmgr_shutdown
-dns_requestmgr_attach
-dns_requestmgr_detach
-dns_request_create
-dns_request_createvia
-dns_request_createraw
+dns_rdatatype_fromtext
+dns_rdatatype_isdnssec
+dns_rdatatype_isknown
+dns_rdatatype_ismeta
+dns_rdatatype_issingleton
+dns_rdatatype_iszonecutauth
+dns_rdatatype_notquestion
+dns_rdatatype_questiononly
+dns_rdatatype_totext
 dns_request_cancel
+dns_request_create
+dns_request_createraw
+dns_request_createvia
+dns_request_createvia3
+dns_request_destroy
 dns_request_getresponse
 dns_request_usedtcp
-dns_request_destroy
-dns_resolver_createfetch
-dns_resolver_create
-dns_resolver_freeze
-dns_resolver_prime
-dns_resolver_whenshutdown
-dns_resolver_shutdown
+dns_requestmgr_attach
+dns_requestmgr_create
+dns_requestmgr_detach
+dns_requestmgr_shutdown
+dns_requestmgr_whenshutdown
+dns_resolver_addalternate
 dns_resolver_attach
-dns_resolver_detach
-dns_resolver_createfetch
 dns_resolver_cancelfetch
+dns_resolver_create
+dns_resolver_createfetch
 dns_resolver_destroyfetch
+dns_resolver_detach
+dns_resolver_disable_algorithm
 dns_resolver_dispatchmgr
 dns_resolver_dispatchv4
 dns_resolver_dispatchv6
+dns_resolver_freeze
+dns_resolver_getlamettl
+dns_resolver_getudpsize
+dns_resolver_nrunning
+dns_resolver_prime
+dns_resolver_reset_algorithms
+dns_resolver_resetmustbesecure
+dns_resolver_setlamettl
+dns_resolver_setmustbesecure
+dns_resolver_setudpsize
+dns_resolver_shutdown
 dns_resolver_socketmgr
 dns_resolver_taskmgr
-dns_resolver_getlamettl
-dns_resolver_setlamettl
-dns_resolver_nrunning
-dns_result_totext
+dns_resolver_whenshutdown
 dns_result_register
 dns_result_torcode
+dns_result_totext
 dns_rootns_create
+dns_sdb_putnamedrr
+dns_sdb_putrdata
+dns_sdb_putrr
+dns_sdb_putsoa
 dns_sdb_register
 dns_sdb_unregister
-dns_sdb_putrr
-dns_sdb_putnamedrr
-dns_sdb_putsoa
-dns_sdb_putrdata
 dns_secalg_fromtext
 dns_secalg_totext
 dns_secproto_fromtext
 dns_secproto_totext
-dns_ssutable_create
-dns_ssutable_attach
-dns_ssutable_detach
+dns_soa_getminimum
+dns_soa_getserial
+dns_soa_setserial
 dns_ssutable_addrule
+dns_ssutable_attach
 dns_ssutable_checkrules
+dns_ssutable_create
+dns_ssutable_detach
 dns_stats_alloccounters
 dns_stats_freecounters
-dns_tcpmsg_init
-dns_tcpmsg_setmaxsize
-dns_tcpmsg_readmessage
 dns_tcpmsg_cancelread
-dns_tcpmsg_keepbuffer
+dns_tcpmsg_init
 dns_tcpmsg_invalidate
-dns_time64_fromtext
+dns_tcpmsg_keepbuffer
+dns_tcpmsg_readmessage
+dns_tcpmsg_setmaxsize
 dns_time32_fromtext
-dns_time64_totext
 dns_time32_totext
+dns_time64_fromtext
+dns_time64_totext
 dns_timer_setidle
-dns_tkeyctx_create
-dns_tkeyctx_destroy
-dns_tkey_processquery
+dns_tkey_builddeletequery
 dns_tkey_builddhquery
 dns_tkey_buildgssquery
-dns_tkey_builddeletequery
+dns_tkey_processdeleteresponse
 dns_tkey_processdhresponse
 dns_tkey_processgssresponse
-dns_tkey_processdeleteresponse
-dns_tsigkey_create
-dns_tsigkey_createfromkey
-dns_tsigkey_attach
-dns_tsigkey_detach
-dns_tsigkey_setdeleted
+dns_tkey_processquery
+dns_tkeyctx_create
+dns_tkeyctx_destroy
 dns_tsig_sign
 dns_tsig_verify
+dns_tsigkey_attach
+dns_tsigkey_create
+dns_tsigkey_createfromkey
+dns_tsigkey_detach
 dns_tsigkey_find
+dns_tsigkey_setdeleted
 dns_tsigkeyring_create
 dns_tsigkeyring_destroy
-dns_ttl_totext
-dns_counter_fromtext
+dns_tsigrcode_fromtext
+dns_tsigrcode_totext
 dns_ttl_fromtext
-dns_validator_create
+dns_ttl_totext
 dns_validator_cancel
+dns_validator_create
 dns_validator_destroy
-dns_view_create
-dns_view_attach
-dns_view_detach
-dns_view_flushanddetach
-dns_view_weakattach
-dns_view_weakdetach
-dns_view_createresolver
-dns_view_setcache
-dns_view_sethints
-dns_view_setkeyring
-dns_view_setdstport
+dns_view_adddelegationonly
 dns_view_addzone
-dns_view_freeze
-dns_view_find
-dns_view_simplefind
-dns_view_findzonecut
-dns_viewlist_find
-dns_view_findzone
-dns_view_load
-dns_view_loadnew
-dns_view_gettsig
-dns_view_getpeertsig
+dns_view_attach
 dns_view_checksig
+dns_view_create
+dns_view_createresolver
+dns_view_detach
 dns_view_dialup
 dns_view_dumpdbtostream
+dns_view_excludedelegationonly
+dns_view_find
+dns_view_findzone
+dns_view_findzonecut
+dns_view_flushanddetach
 dns_view_flushcache
-dns_xfrin_create
-dns_xfrin_shutdown
-dns_xfrin_detach
+dns_view_flushname
+dns_view_freeze
+dns_view_freezezones
+dns_view_getpeertsig
+dns_view_gettsig
+dns_view_load
+dns_view_loadnew
+dns_view_setcache
+dns_view_setdstport
+dns_view_sethints
+dns_view_setkeyring
+dns_view_setrootdelonly
+dns_view_simplefind
+dns_view_weakattach
+dns_view_weakdetach
+dns_viewlist_find
 dns_xfrin_attach
-dns_zone_create
-dns_zone_setclass
-dns_zone_getclass
-dns_zone_settype
-dns_zone_setview
-dns_zone_getview
-dns_zone_setorigin
-dns_zone_getorigin
-dns_zone_setfile
-dns_zone_getfile
-dns_zone_load
+dns_xfrin_create
+dns_xfrin_detach
+dns_xfrin_shutdown
 dns_zone_attach
-dns_zone_detach
-dns_zone_iattach
-dns_zone_idetach
-dns_zone_setflag
-dns_zone_getdb
-dns_zone_setdbtype
-dns_zone_markdirty
-dns_zone_expire
-dns_zone_refresh
-dns_zone_flush
-dns_zone_dump
-dns_zone_dumptostream
-dns_zone_maintenance
-dns_zone_setmasters
-dns_zone_setmasterswithkeys
-dns_zone_setmasters
-dns_zone_setalsonotify
-dns_zone_unload
-dns_zone_setoption
-
-dns_zone_getoptions
-dns_zone_setminrefreshtime
-dns_zone_setmaxrefreshtime
-dns_zone_setminretrytime
-dns_zone_setmaxretrytime
-dns_zone_setxfrsource4
-dns_zone_getxfrsource4
-dns_zone_setxfrsource6
-dns_zone_getxfrsource6
-dns_zone_setnotifysrc4
-dns_zone_getnotifysrc4
-dns_zone_setnotifysrc6
-dns_zone_getnotifysrc6
-dns_zone_setnotifyacl
-dns_zone_setqueryacl
-dns_zone_setupdateacl
-dns_zone_setforwardacl
-dns_zone_setxfracl
-dns_zone_getnotifyacl
-dns_zone_getqueryacl
-dns_zone_getupdateacl
-dns_zone_getforwardacl
-dns_zone_getxfracl
-dns_zone_clearupdateacl
+dns_zone_checknames
 dns_zone_clearforwardacl
 dns_zone_clearnotifyacl
 dns_zone_clearqueryacl
+dns_zone_clearupdateacl
 dns_zone_clearxfracl
-dns_zone_setchecknames
+dns_zone_create
+dns_zone_detach
+dns_zone_dialup
+dns_zone_dump
+dns_zone_dumptostream
+dns_zone_expire
+dns_zone_first
+dns_zone_flush
+dns_zone_forcereload
+dns_zone_forwardupdate
+dns_zone_fulldumptostream
 dns_zone_getchecknames
-dns_zone_setjournalsize
-dns_zone_getjournalsize
-dns_zone_notifyreceive
-dns_zone_setmaxxfrin
-dns_zone_getmaxxfrin
-dns_zone_setmaxxfrout
-dns_zone_getmaxxfrout
-dns_zone_setjournal
-dns_zone_getjournal
-dns_zone_gettype
-dns_zone_settask
-dns_zone_gettask
-dns_zone_notify
-dns_zone_replacedb
+dns_zone_getclass
+dns_zone_getdb
+dns_zone_getfile
+dns_zone_getforwardacl
 dns_zone_getidlein
-dns_zone_setidlein
 dns_zone_getidleout
-dns_zone_setidleout
-dns_zone_getssutable
-dns_zone_setssutable
+dns_zone_getjournal
+dns_zone_getjournalsize
+dns_zone_getkeydirectory
+dns_zone_getmaxxfrin
+dns_zone_getmaxxfrout
 dns_zone_getmctx
 dns_zone_getmgr
-dns_zone_setsigvalidityinterval
+dns_zone_getnotifyacl
+dns_zone_getnotifysrc4
+dns_zone_getnotifysrc6
+dns_zone_getoptions
+dns_zone_getorigin
+dns_zone_getqueryacl
 dns_zone_getsigvalidityinterval
-dns_zone_setnotifytype
-dns_zone_forwardupdate
-dns_zone_next
-dns_zone_first
-dns_zonemgr_create
-dns_zonemgr_managezone
-dns_zonemgr_forcemaint
-dns_zonemgr_shutdown
-dns_zonemgr_attach
-dns_zonemgr_detach
-dns_zonemgr_releasezone
-dns_zonemgr_settransfersin
-dns_zonemgr_getttransfersin
-dns_zonemgr_settransfersperns
-dns_zonemgr_getttransfersperns
-dns_zonemgr_setiolimit
-dns_zonemgr_getiolimit
-dns_zonemgr_setserialqueryrate
-dns_zonemgr_getserialqueryrate
-dns_zonemgr_getcount
-dns_zone_forcereload
-dns_zone_isforced
-dns_zone_setstatistics
+dns_zone_getssutable
 dns_zone_getstatscounters
-dns_zone_dialup
-dns_zone_setdialup
-dns_zone_log
-dns_zonekey_iszonekey
-dns_zt_create
-dns_zt_mount
-dns_zt_unmount
-dns_zt_find
-dns_zt_detach
-dns_zt_flushanddetach
-dns_zt_attach
-dns_zt_load
-dns_zt_apply
-dst_lib_init
-dst_lib_destroy
-dst_algorithm_supported
-dst_context_create
-dst_context_destroy
-dst_context_adddata
-dst_context_sign
-dst_context_verify
-dst_key_computesecret
-dst_key_fromfile
-dst_key_fromnamedfile
-dst_key_tofile
-dst_key_fromdns
-dst_key_todns
-dst_key_frombuffer
-dst_key_tobuffer
-dst_key_fromgssapi
-dst_key_generate
-dst_key_compare
-dst_key_paramcompare
-dst_key_free
-dst_key_name
-dst_key_size
-dst_key_proto
-dst_key_alg
-dst_key_flags
-dst_key_id
-dst_key_class
-dst_key_isprivate
-dst_key_iszonekey
-dst_key_isnullkey
-dst_key_buildfilename
-dst_key_sigsize
-dst_key_secretsize
-dst_region_computeid
-dst_gssapi_acquirecred
-dst_gssapi_initctx
-dst_gssapi_acceptctx
-dst_lib_initmsgcat
-dst_result_totext
-dst_result_register
-dns_ds_buildrdata
-dns_order_create
-dns_order_add
-dns_order_find
-dns_order_attach
-dns_order_detach
-dns_byaddr_createptrname2
-dns_diff_applysilently
-dns_master_stylecreate
-dns_master_styledestroy
-dns_message_resetsig
-dns_message_rechecksig
-dns_rdatatype_atparent
-dns_zone_name
-dns_view_flushname
-dns_zone_setupdatedisabled
+dns_zone_gettask
+dns_zone_gettype
+dns_zone_getupdateacl
 dns_zone_getupdatedisabled
-dns_zone_getkeydirectory
-dns_zone_setkeydirectory
-dns_dnssec_findzonekeys2
-dns_zone_fulldumptostream
-dns_request_createvia3
+dns_zone_getview
+dns_zone_getxfracl
+dns_zone_getxfrsource4
+dns_zone_getxfrsource6
+dns_zone_iattach
+dns_zone_idetach
+dns_zone_isforced
+dns_zone_load
+dns_zone_log
+dns_zone_maintenance
+dns_zone_markdirty
+dns_zone_name
+dns_zone_next
+dns_zone_notify
+dns_zone_notifyreceive
+dns_zone_refresh
+dns_zone_replacedb
+dns_zone_setalsonotify
 dns_zone_setaltxfrsource4
 dns_zone_setaltxfrsource6
-dns_zone_checknames
+dns_zone_setchecknames
+dns_zone_setclass
+dns_zone_setdbtype
+dns_zone_setdialup
+dns_zone_setfile
+dns_zone_setflag
+dns_zone_setforwardacl
+dns_zone_setidlein
+dns_zone_setidleout
+dns_zone_setjournal
+dns_zone_setjournalsize
+dns_zone_setkeydirectory
+dns_zone_setmasters
+dns_zone_setmasterswithkeys
+dns_zone_setmaxrefreshtime
+dns_zone_setmaxretrytime
+dns_zone_setmaxxfrin
+dns_zone_setmaxxfrout
+dns_zone_setminrefreshtime
+dns_zone_setminretrytime
+dns_zone_setnotifyacl
+dns_zone_setnotifydelay
+dns_zone_setnotifysrc4
+dns_zone_setnotifysrc6
+dns_zone_setnotifytype
+dns_zone_setoption
+dns_zone_setorigin
+dns_zone_setqueryacl
+dns_zone_setsigvalidityinterval
+dns_zone_setssutable
+dns_zone_setstatistics
+dns_zone_settask
+dns_zone_settype
+dns_zone_setupdateacl
+dns_zone_setupdatedisabled
+dns_zone_setview
+dns_zone_setxfracl
+dns_zone_setxfrsource4
+dns_zone_setxfrsource6
+dns_zone_unload
+dns_zonekey_iszonekey
+dns_zonemgr_attach
+dns_zonemgr_create
+dns_zonemgr_detach
+dns_zonemgr_forcemaint
+dns_zonemgr_getcount
+dns_zonemgr_getiolimit
+dns_zonemgr_getserialqueryrate
+dns_zonemgr_getttransfersin
+dns_zonemgr_getttransfersperns
+dns_zonemgr_managezone
+dns_zonemgr_releasezone
 dns_zonemgr_resumexfrs
-dns_portlist_add
-dns_resolver_getudpsize
-dns_acl_elementmatch
-dns_rdata_checkowner
-dns_rdataset_getnoqname
-dns_portlist_detach
-dns_dispatchmgr_setblackportlist
-dns_portlist_create
-dns_view_excludedelegationonly
-dns_view_setrootdelonly
-dns_resolver_reset_algorithms
-dns_resolver_setudpsize
-dns_peer_settransfersource
-dns_resolver_disable_algorithm
-dns_resolver_addalternate
-dns_view_adddelegationonly
-dns_resolver_resetmustbesecure
-dns_resolver_setmustbesecure
-dns_dumpctx_detach
-dns_master_dumptostreaminc
-dns_acache_setdb
-dns_acache_attach
-dns_acache_detach
-dns_acache_putdb
-dns_acache_shutdown
-dns_acache_cancelentry
-dns_acache_createentry
-dns_acache_setdb
-dns_acache_setentry
-dns_acache_getentry
-dns_acache_attachentry
-dns_acache_detachentry
-
-
+dns_zonemgr_setiolimit
+dns_zonemgr_setserialqueryrate
+dns_zonemgr_settransfersin
+dns_zonemgr_settransfersperns
+dns_zonemgr_shutdown
+dns_zt_apply
+dns_zt_attach
+dns_zt_create
+dns_zt_detach
+dns_zt_find
+dns_zt_flushanddetach
+dns_zt_load
+dns_zt_mount
+dns_zt_unmount
+dst_algorithm_supported
+dst_context_adddata
+dst_context_create
+dst_context_destroy
+dst_context_sign
+dst_context_verify
+dst_gssapi_acceptctx
+dst_gssapi_acquirecred
+dst_gssapi_initctx
+dst_key_alg
+dst_key_buildfilename
+dst_key_class
+dst_key_compare
+dst_key_computesecret
+dst_key_flags
+dst_key_free
+dst_key_frombuffer
+dst_key_fromdns
+dst_key_fromfile
+dst_key_fromgssapi
+dst_key_fromnamedfile
+dst_key_generate
+dst_key_id
+dst_key_isnullkey
+dst_key_isprivate
+dst_key_iszonekey
+dst_key_name
+dst_key_paramcompare
+dst_key_proto
+dst_key_secretsize
+dst_key_sigsize
+dst_key_size
+dst_key_tobuffer
+dst_key_todns
+dst_key_tofile
+dst_lib_destroy
+dst_lib_init
+dst_lib_initmsgcat
+dst_region_computeid
+dst_result_register
+dst_result_totext
diff --git a/lib/isccfg/win32/libisccfg.def b/lib/isccfg/win32/libisccfg.def
index 1423a7e2e9..22383b1030 100644
--- a/lib/isccfg/win32/libisccfg.def
+++ b/lib/isccfg/win32/libisccfg.def
@@ -3,41 +3,42 @@ LIBRARY libisccfg
 ; Exported Functions
 EXPORTS
 
-cfg_parser_create
-cfg_parser_setcallback
-cfg_parse_file
-cfg_parse_buffer
-cfg_parser_destroy
-cfg_obj_isvoid
-cfg_obj_ismap
-cfg_map_get
-cfg_map_getname
-cfg_obj_istuple
-cfg_tuple_get
-cfg_obj_isuint32
-cfg_obj_asuint32
-cfg_obj_isuint64
-cfg_obj_asuint64
-cfg_obj_isstring
-cfg_obj_asstring
-cfg_obj_isboolean
-cfg_obj_asboolean
-cfg_obj_issockaddr
-cfg_obj_assockaddr
-cfg_obj_isnetprefix
-cfg_obj_asnetprefix
-cfg_obj_islist
+cfg_acl_fromconfig
+cfg_aclconfctx_destroy
+cfg_aclconfctx_init
 cfg_list_first
 cfg_list_next
 cfg_listelt_value
-cfg_obj_istype
-cfg_obj_destroy
-cfg_obj_log
 cfg_log_init
-cfg_obj_line
+cfg_map_get
+cfg_map_getname
+cfg_obj_asboolean
+cfg_obj_asnetprefix
+cfg_obj_assockaddr
+cfg_obj_asstring
+cfg_obj_asuint32
+cfg_obj_asuint64
+cfg_obj_destroy
 cfg_obj_file
-cfg_acl_fromconfig
-cfg_aclconfctx_init
+cfg_obj_isboolean
+cfg_obj_islist
+cfg_obj_ismap
+cfg_obj_isnetprefix
+cfg_obj_issockaddr
+cfg_obj_isstring
+cfg_obj_istuple
+cfg_obj_istype
+cfg_obj_isuint32
+cfg_obj_isuint64
+cfg_obj_isvoid
+cfg_obj_line
+cfg_obj_log
+cfg_parse_buffer
+cfg_parse_file
+cfg_parser_create
+cfg_parser_destroy
+cfg_parser_setcallback
+cfg_tuple_get
 
 ; Exported Data